ChangeLogTag:Thu Aug 31 16:31:04 2000 Carlos O'Ryan <coryan@uci.edu>

125 files changed, 14835 insertions, 12645 deletions

diff --git a/TAO/tao/Acceptor_Filter.cpp b/TAO/tao/Acceptor_Filter.cpp
new file mode 100644
index 00000000000..8ba9afd45ee
--- /dev/null
+++ b/TAO/tao/Acceptor_Filter.cpp
@@ -0,0 +1,19 @@
+// $Id$
+
+#include "tao/Acceptor_Filter.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Acceptor_Filter.i"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(tao, Acceptor_Filter, "$Id$")
+
+TAO_Acceptor_Filter::~TAO_Acceptor_Filter (void)
+{
+}
+
+#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/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h
new file mode 100644
index 00000000000..0353f89494e
--- /dev/null
+++ b/TAO/tao/Acceptor_Filter.h
@@ -0,0 +1,55 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO
+//
+// = FILENAME
+//    Acceptor_Filter.h
+//
+// = AUTHOR
+//    Carlos O'Ryan (coryan@uci.edu)
+//
+// ============================================================================
+
+#ifndef TAO_ACCEPTOR_FILTER_H
+#define TAO_ACCEPTOR_FILTER_H
+#include "ace/pre.h"
+
+#include "tao/corbafwd.h"
+#include "ace/Service_Object.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+class TAO_Acceptor;
+
+class TAO_Export TAO_Acceptor_Filter
+{
+public:
+  virtual ~TAO_Acceptor_Filter (void);
+
+  virtual int evaluate (TAO_Acceptor *acceptor) = 0;
+  // Return 0 if <acceptor> should not be included in the profile.
+};
+
+#if defined (__ACE_INLINE__)
+# include "Acceptor_Filter.i"
+#endif /* __ACE_INLINE__ */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* TAO_OBJECT_ADAPTER_H */
diff --git a/TAO/tao/Key_Adapters.i b/TAO/tao/Acceptor_Filter.i
index cfa1da318d3..cfa1da318d3 100644
--- a/TAO/tao/Key_Adapters.i
+++ b/TAO/tao/Acceptor_Filter.i
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 04deb6a9bee..b2dce09b497 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -9,7 +9,7 @@
 #include "tao/MProfile.h"
 #include "tao/debug.h"
 #include "tao/RT_Policy_i.h"
-#include "tao/POA.h"
+#include "tao/Acceptor_Filter.h"
 
 #include "ace/Auto_Ptr.h"
 
@@ -51,7 +51,7 @@ TAO_Acceptor_Registry::endpoint_count (void)
 int
 TAO_Acceptor_Registry::make_mprofile (const TAO_ObjectKey &object_key,
                                       TAO_MProfile &mprofile,
-                                      TAO_POA *poa)
+                                      TAO_Acceptor_Filter *filter)
 {
   // Allocate space for storing the profiles.  There can never be more
   // profiles than there are endpoints.  In some cases, there can be
@@ -61,43 +61,14 @@ TAO_Acceptor_Registry::make_mprofile (const TAO_ObjectKey &object_key,
     return -1;
 
   TAO_AcceptorSetIterator end = this->end ();
-
-  // @@ We may want to strategize the code below, i.e., mprofile
-  // creation: have different strategies for deciding
-  // which profiles get included.  Currently, there are two
-  // cases: regular - all profiles are included, and rt -
-  // RTCORBA::ServerProtocolPolicy determines what's included.
-
-#if (TAO_HAS_RT_CORBA == 1)
-
-  // RTCORBA 1.0, Section 4.15.1: ServerProtocolPolicy determines
-  // which protocols get included into IOR and in what order.
-  TAO_ServerProtocolPolicy *policy =
-    poa->policies ().server_protocol ();
-  RTCORBA::ProtocolList & protocols = policy->protocols_rep ();
-
-  for (CORBA::ULong j = 0; j < protocols.length (); ++j)
+  for (TAO_AcceptorSetIterator i = this->begin (); i != end; ++i)
     {
-      CORBA::ULong protocol_type = protocols[j].protocol_type;
-
-      for (TAO_AcceptorSetIterator i = this->begin (); i != end; ++i)
-        if ((*i)->tag () == protocol_type
-            && (*i)->create_mprofile (object_key,
-                                      mprofile) == -1)
-          return -1;
+      if (filter == 0 || filter->evaluate (*i))
+        {
+          if ((*i)->create_mprofile (object_key, mprofile) == -1)
+            return -1;
+        }
     }
-  // @@ May want to optimize later rather than doing the double loop above.
-
-#else /* TAO_HAS_RT_CORBA == 1 */
-
-  ACE_UNUSED_ARG (poa);
-
-  for (TAO_AcceptorSetIterator i = this->begin (); i != end; ++i)
-    if ((*i)->create_mprofile (object_key,
-                               mprofile) == -1)
-      return -1;
-
-#endif /* TAO_HAS_RT_CORBA == 1 */
 
   return 0;
 }
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index 3f5937de903..1d05a43fdc1 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -36,7 +36,7 @@
 class ACE_Addr;
 class ACE_Reactor;
 class TAO_ORB_Core;
-class TAO_POA;
+class TAO_Acceptor_Filter;
 
 class TAO_Stub;
 class TAO_Profile;
@@ -78,7 +78,7 @@ public:
 
   int make_mprofile (const TAO_ObjectKey& object_key,
                      TAO_MProfile &mprofile,
-                     TAO_POA *poa);
+                     TAO_Acceptor_Filter *filter = 0);
   // Add profiles to the <mprofile> object for all open endpoints.
   // <poa> parameter is passed because the POA may contain some
   // information affecting how/which profiles get created.
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
new file mode 100644
index 00000000000..caffa545f3b
--- /dev/null
+++ b/TAO/tao/Adapter.cpp
@@ -0,0 +1,188 @@
+// $Id$
+
+#include "tao/Adapter.h"
+#include "tao/Exception.h"
+#include "tao/Object.h"
+#include "tao/Object_KeyC.h"
+#include "tao/ORB_Core.h"
+#include "tao/ORB.h"
+#include "ace/Dynamic_Service.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Adapter.i"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(tao, Adapter, "$Id$")
+
+TAO_Adapter::~TAO_Adapter (void)
+{
+}
+
+// ****************************************************************
+
+TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *oc)
+  : orb_core_ (oc)
+  , adapters_capacity_ (16) // @@ Make it configurable
+  , adapters_count_ (0)
+  , adapters_ (0)
+{
+  ACE_NEW (this->adapters_,
+           TAO_Adapter*[this->adapters_capacity_]);
+}
+
+TAO_Adapter_Registry::~TAO_Adapter_Registry (void)
+{
+}
+
+void
+TAO_Adapter_Registry::close (int wait_for_completion,
+                             CORBA::Environment &ACE_TRY_ENV)
+{
+  for (size_t i = 0; i != this->adapters_count_; ++i)
+    {
+      this->adapters_[i]->close (wait_for_completion, ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+  delete[] this->adapters_;
+  this->adapters_ = 0;
+  this->adapters_capacity_ = 0;
+  this->adapters_count_ = 0;
+}
+
+void
+TAO_Adapter_Registry::check_close (int wait_for_completion,
+                                   CORBA::Environment &ACE_TRY_ENV)
+{
+  for (size_t i = 0; i != this->adapters_count_; ++i)
+    {
+      this->adapters_[i]->check_close (wait_for_completion, ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+}
+
+void
+TAO_Adapter_Registry::insert (TAO_Adapter *adapter,
+                              CORBA::Environment &ACE_TRY_ENV)
+{
+  if (this->adapters_capacity_ == this->adapters_count_)
+    {
+      this->adapters_capacity_ *= 2;
+      TAO_Adapter **tmp;
+      ACE_NEW_THROW_EX (tmp,
+                        TAO_Adapter*[this->adapters_capacity_],
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK;
+
+      for (size_t i = 0; i != this->adapters_count_; ++i)
+        tmp[i] = this->adapters_[i];
+      delete[] this->adapters_;
+      this->adapters_ = tmp;
+    }
+
+  int priority = adapter->priority ();
+  for (size_t i = 0; i != this->adapters_count_; ++i)
+    {
+      if (this->adapters_[i]->priority () >= priority)
+        {
+          for (size_t j = this->adapters_count_ + 1;
+               j > i;
+               --j)
+            {
+              this->adapters_[j] = this->adapters_[j - 1];
+            }
+          this->adapters_[i] = adapter;
+          this->adapters_count_++;
+          return;
+        }
+    }
+  this->adapters_[this->adapters_count_++] = adapter;
+}
+
+void
+TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key,
+                                CORBA::ServerRequest &request,
+                                void *context, /* unused? */
+                                CORBA::Object_out forward_to,
+                                CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  for (size_t i = 0; i != this->adapters_count_; ++i)
+    {
+      int r = this->adapters_[i]->dispatch (key,
+                                            request,
+                                            context,
+                                            forward_to,
+                                            ACE_TRY_ENV);
+      ACE_CHECK;
+
+      if (r != TAO_Adapter::DS_MISMATCHED_KEY)
+        return;
+    }
+
+#if (TAO_NO_IOR_TABLE == 0)
+  // @@ This should go into its own Adapter, making the IOR table
+  //    completely pluggable too!
+
+  ACE_CString object_id (ACE_reinterpret_cast (const char *,
+                                               key.get_buffer ()),
+                         key.length (),
+                         0,
+                         0);
+
+  // Do the Table Lookup.
+  int status =
+    this->orb_core_->orb ()->_tao_find_in_IOR_table (object_id,
+                                                     forward_to);
+
+  // If ObjectID not in table or reference is nil raise
+  // OBJECT_NOT_EXIST.
+
+  if (status == -1 || CORBA::is_nil (forward_to))
+    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+#endif /* TAO_NO_IOR_TABLE */
+}
+
+CORBA::Object_ptr
+TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub,
+                                                const TAO_MProfile &mprofile)
+{
+  for (size_t i = 0; i != this->adapters_count_; ++i)
+    {
+      CORBA::Object_ptr x =
+        this->adapters_[i]->create_collocated_object (stub,
+                                                      mprofile);
+      if (x != 0)
+        return x;
+    }
+  return 0;
+}
+
+TAO_Adapter *
+TAO_Adapter_Registry::find_adapter (const char *name) const
+{
+  for (TAO_Adapter **i = this->adapters_;
+       i != this->adapters_ + this->adapters_count_;
+       ++i)
+    {
+      if (ACE_OS::strcmp ((*i)->name (), name) == 0)
+        return *i;
+    }
+  return 0;
+
+}
+
+// ****************************************************************
+
+TAO_Adapter_Factory::~TAO_Adapter_Factory (void)
+{
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Dynamic_Service<TAO_Adapter_Factory>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Dynamic_Service<TAO_Adapter_Factory>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
new file mode 100644
index 00000000000..8fb52674622
--- /dev/null
+++ b/TAO/tao/Adapter.h
@@ -0,0 +1,174 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO
+//
+// = FILENAME
+//    Adapter.h
+//
+// = AUTHOR
+//    Carlos O'Ryan (coryan@uci.edu)
+//
+// ============================================================================
+
+#ifndef TAO_ADAPTER_H
+#define TAO_ADAPTER_H
+#include "ace/pre.h"
+
+#include "tao/corbafwd.h"
+#include "ace/Service_Object.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+class TAO_ORB_Core;
+class TAO_Stub;
+class TAO_MProfile;
+
+class TAO_Export TAO_Adapter
+{
+public:
+  virtual ~TAO_Adapter (void);
+
+  virtual void open (CORBA::Environment &) = 0;
+  // Initialize the Adapter
+
+  virtual void close (int wait_for_completion,
+                      CORBA::Environment &) = 0;
+  // The ORB is shutting down, destroy any resources attached to this
+  // adapter.
+
+  virtual void check_close (int wait_for_completion,
+                            CORBA::Environment &) = 0;
+  // Check if the adapter can be closed in the current context, raise
+  // an exception if not.
+
+  virtual int priority (void) const = 0;
+  // Return the priority assigned to this adapter.
+  // Adapters at higher priority are used first, the first adapter
+  // that matches a key is used to dispatch a request.
+
+  virtual int dispatch (TAO_ObjectKey &key,
+                        CORBA::ServerRequest &request,
+                        void *context, /* unused? */
+                        CORBA::Object_out forward_to,
+                        CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+  // Return the status....
+  enum {
+    DS_OK,
+    // The operation was successfully dispatched, an exception may
+    // have been raised, but that is a correct execution too.
+
+    DS_MISMATCHED_KEY,
+    // The key is not in the right format for this Adapter, try the
+    // next one.
+
+    DS_FORWARD,
+    // Forward the request to another object reference, this decouples
+    // the ORB from the PortableServer::ForwardRequest exception
+  };
+
+  virtual const char *name (void) const = 0;
+  // Return the name, i.e. the object id used to resolve it in the
+  // ORB.
+
+  virtual CORBA::Object_ptr root (void) = 0;
+  // Rerturn the root of the Object Adapter.
+  // Each adapter defines its own IDL interface accessed through the
+  // method above.
+
+  virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
+                                                      const TAO_MProfile &) = 0;
+  // Create a collocated object using the given profile and stub.
+};
+
+// ****************************************************************
+
+// @@ Move to its own file
+
+class TAO_Export TAO_Adapter_Registry
+{
+public:
+  TAO_Adapter_Registry (TAO_ORB_Core *orb_core);
+
+  ~TAO_Adapter_Registry (void);
+  // Close the
+
+  void close (int wait_for_completion,
+              CORBA::Environment &ACE_TRY_ENV);
+  // Close each of of the Adapters and then cleanup the Registry.
+  // It is possible that an Adapter will reject a close() call if it
+  // is invoked in an innapropriate context (think shutting down the
+  // POA while performing an upcall).
+
+  void check_close (int wait_for_completion,
+                    CORBA::Environment &ACE_TRY_ENV);
+  // Verify if the close() call can be invoked in the current
+  // context for *all* adapters.
+  // Raise the right exception if not.
+
+  void insert (TAO_Adapter *adapter,
+               CORBA::Environment &ACE_TRY_ENV);
+  // Insert a new adapter into the registry.
+
+  void dispatch (TAO_ObjectKey &key,
+                 CORBA::ServerRequest &request,
+                 void *context, /* unused? */
+                 CORBA::Object_out forward_to,
+                 CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Dispatch the request to all the adapters.
+  // It tries the adapters ordered by priority, stopping when the
+  // adapter returns a status different from DS_MISMATCHED_KEY
+
+  CORBA::Object_ptr create_collocated_object (TAO_Stub *,
+                                              const TAO_MProfile &);
+  // Create a collocated object using the given profile and stub.
+
+  TAO_Adapter *find_adapter (const char *name) const;
+  // Fetch the adapter named <name>
+
+private:
+  TAO_ORB_Core *orb_core_;
+  // The ORB Core
+
+  size_t adapters_capacity_;
+  size_t adapters_count_;
+  TAO_Adapter **adapters_;
+  // A simple array of adapters.
+};
+
+// ****************************************************************
+
+class TAO_Export TAO_Adapter_Factory : public ACE_Service_Object
+{
+public:
+  virtual ~TAO_Adapter_Factory (void);
+  // Destructor
+
+  virtual TAO_Adapter *create (TAO_ORB_Core *orb_core) = 0;
+  // Create a new adapter
+};
+
+#if defined (__ACE_INLINE__)
+# include "Adapter.i"
+#endif /* __ACE_INLINE__ */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* TAO_OBJECT_ADAPTER_H */
diff --git a/TAO/tao/Adapter.i b/TAO/tao/Adapter.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/Adapter.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
index 1e413c6bed1..2464c68f280 100644
--- a/TAO/tao/Domain.pidl
+++ b/TAO/tao/Domain.pidl
@@ -10,21 +10,37 @@
 //
 // = DESCRIPTION
 //   This file was used to generate the code in Domain{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
+//
+//   The command used to generate code from this file is:
+//
+//     tao_idl.exe -o orig -Gp -Gd -Ge 1 -Gv \
+//          -Wb,export_macro=TAO_Export \
+//          -Wb,export_include=corbafwd.h \
+//          -Wb,pre_include="ace/pre.h" \
+//          -Wb,post_include="ace/post.h" \
+//          Messaging.pidl
+//
+//   after the file is generated a patch must be applied.  The patch
+//   disables the code under certain configurations, and eliminates
+//   cycles in the include dependencies.  Those changes are required
+//   because the generated code is part of the TAO library, it hardly
+//   makes any sense to  change the IDL compiler to support changes
+//   that are very occasional.
 //
 // ================================================================
 
-#if !defined POLICY_DOMAIN_IDL
+#ifndef POLICY_DOMAIN_IDL
 #define POLICY_DOMAIN_IDL
 
 #pragma prefix "omg.org"
 
 #include "Policy.pidl"
 
+
 module CORBA
 {
+  interface InterfaceDef;
+
   interface DomainManager
   {
     Policy get_domain_policy (
@@ -43,4 +59,6 @@ module CORBA
   typedef sequence <DomainManager> DomainManagerList;
 };
 
+#pragma prefix ""
+
 #endif /* !defined POLICY_DOMAIN_IDL */
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 73dfcf1b466..4cc740b17b5 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -1,39 +1,35 @@
-/* -*- C++ -*- */
-// $Id$
-
+/* -*- C++ -*- $Id$ */
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-//
-// And later modified by Jeff Parsons
-//
 // TAO and the TAO IDL Compiler have been developed by the Center for
 // Distributed Object Computing at Washington University, St. Louis.
 //
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//
 
-#include "tao/DomainC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/POA_CORBA.h"
-#include "tao/ORB.h"
-
-#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
-#include "tao/InterfaceC.h"
-#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
+#include "DomainC.h"
+#include "Stub.h"
+#include "Invocation.h"
+#include "Exception.h"
+#include "InterfaceC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "DomainC.i"
 #endif /* !defined INLINE */
 
-const CORBA::PolicyType CORBA::SecConstruction = 11;
 
-CORBA::DomainManager_ptr
-CORBA_DomainManager::_nil (void)
+// default constructor
+CORBA_DomainManager::CORBA_DomainManager (void)
+{}
+
+// destructor
+CORBA_DomainManager::~CORBA_DomainManager (void)
+{}
+
+void CORBA_DomainManager::_tao_any_destructor (void *x)
 {
-  return (CORBA::DomainManager_ptr)0;
+  CORBA_DomainManager *tmp = ACE_static_cast (CORBA_DomainManager*,x);
+  CORBA::release (tmp);
 }
 
 CORBA_DomainManager_ptr CORBA_DomainManager::_narrow (
@@ -43,49 +39,56 @@ CORBA_DomainManager_ptr CORBA_DomainManager::_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_DomainManager::_nil ();
-  CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA_DomainManager::_nil ());
-  if (is_a == 0)
-    return CORBA_DomainManager::_nil ();
+  if (! obj->_is_local ())
+    {
+      CORBA::Boolean is_a = obj->_is_a ("IDL:CORBA/DomainManager:1.0", ACE_TRY_ENV);
+      ACE_CHECK_RETURN (CORBA_DomainManager::_nil ());
+      if (is_a == 0)
+        return CORBA_DomainManager::_nil ();
+    }
   return CORBA_DomainManager::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
 CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &
   )
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   if (CORBA::is_nil (obj))
     return CORBA_DomainManager::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/DomainManager:1.0");
-
-  CORBA_DomainManager_ptr retval = CORBA_DomainManager::_nil ();
-
-  if (servant == 0)
+  if (! obj->_is_local ())
     {
-      ACE_NEW_RETURN (retval,
-                      CORBA_DomainManager (stub),
-                      CORBA_DomainManager::_nil ());
+      TAO_Stub* stub = obj->_stubobj ();
+      if (stub)
+        stub->_incr_refcnt ();
+      CORBA_DomainManager_ptr default_proxy = CORBA_DomainManager::_nil ();
+
+      if (obj->_is_collocated () && _TAO_collocation_CORBA_DomainManager_Stub_Factory_function_pointer != 0)
+        {
+          default_proxy = _TAO_collocation_CORBA_DomainManager_Stub_Factory_function_pointer (obj);
+        }
+      if (CORBA::is_nil (default_proxy))
+        ACE_NEW_RETURN (default_proxy, ::CORBA_DomainManager (stub), CORBA_DomainManager::_nil ());
+      #if (TAO_HAS_SMART_PROXIES == 1)
+        return TAO_CORBA_DomainManager_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
+      #else
+        return default_proxy;
+      #endif /*TAO_HAS_SMART_PROXIES == 1*/
     }
   else
-    {
-      ACE_NEW_RETURN (
-          retval,
-          POA_CORBA::_tao_collocated_DomainManager (
-              ACE_reinterpret_cast (POA_CORBA::DomainManager_ptr,
-                                    servant),
-              stub
-            ),
-          CORBA_DomainManager::_nil ()
+    return
+      ACE_reinterpret_cast
+        (
+          CORBA_DomainManager_ptr,
+            obj->_tao_QueryInterface
+              (
+                ACE_reinterpret_cast
+                  (
+                    ptr_arith_t,
+                    &CORBA_DomainManager::_narrow
+                  )
+              )
         );
-    }
-
-  return retval;
 }
 
 CORBA_DomainManager_ptr
@@ -100,12 +103,18 @@ CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
     CORBA::PolicyType policy_type,
     CORBA::Environment &ACE_TRY_ENV
   )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
 {
-    CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil ();
+
+  CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil ();
+  CORBA::Policy_var _tao_safe_retval (_tao_retval);
+
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -115,64 +124,192 @@ CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
       istub->orb_core ()
     );
 
+#if (TAO_HAS_INTERCEPTORS == 1)
+    TAO_ClientRequestInterceptor_Adapter
+      _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV));
+    ACE_CHECK_RETURN (0);
+        CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy  ri ("get_domain_policy",
+_tao_call.service_info (),
+    this        ,    policy_type        ,
+        ACE_TRY_ENV);
+    ACE_CHECK_RETURN (0);
+  ACE_TRY
+    {
+#endif /* TAO_HAS_INTERCEPTORS */
 
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
-
-    _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag),
-                              ACE_TRY_ENV);
-    ACE_CHECK_RETURN (_tao_retval);
-
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-    if (!(
-          (_tao_out << policy_type)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
+    for (;;)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+      _tao_call.start (ACE_TRY_ENV);
+      TAO_INTERCEPTOR_CHECK_RETURN (0);
+
+      TAO_INTERCEPTOR (
+          ri.request_id (_tao_call.request_id ());
+           _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+        );
+      TAO_INTERCEPTOR_CHECK_RETURN (0);
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
 
-    }
+      _tao_call.prepare_header (
+          ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
+        );
+      TAO_INTERCEPTOR_CHECK_RETURN (0);
+
+      TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+      if (!(
+            (_tao_out << policy_type)
+        ))
+      TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (), 0);
+
+      int _invoke_status =
+        _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            TAO_INTERCEPTOR_CHECK_RETURN (0);
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        continue;
+      if (_invoke_status != TAO_INVOKE_OK)
+      {
+        TAO_INTERCEPTOR_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
+
+      }
+      TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+      if (!(
+            (_tao_in >> _tao_safe_retval.inout ())
+        ))
+      TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
+CORBA::Policy_ptr  _tao_retval_info = _tao_safe_retval._retn ();
+    TAO_INTERCEPTOR (
+
+         ri.result (_tao_retval_info);
+        _tao_safe_retval = _tao_retval_info;
+
+    );
+
+    TAO_INTERCEPTOR (
+        _tao_vfr.receive_reply (
+          &ri,
+          ACE_TRY_ENV
+        )
+    );
+    TAO_INTERCEPTOR_CHECK_RETURN (0);
     break;
 
   }
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-  return _tao_retval;
+#if (TAO_HAS_INTERCEPTORS == 1)
+
+}
+ACE_CATCHANY
+  {
+    ri.exception (&ACE_ANY_EXCEPTION);
+    _tao_vfr.receive_exception (
+        &ri,
+        ACE_TRY_ENV
+      );
+    ACE_RE_THROW;
+  }
+ACE_ENDTRY;
+ACE_CHECK_RETURN (0);
+#endif /* TAO_HAS_INTERCEPTORS */
+return _tao_safe_retval._retn ();
 }
 
 CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/DomainManager:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
+void *CORBA_DomainManager::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &CORBA_DomainManager::_narrow))
+    retv = ACE_reinterpret_cast (void*, this);
+  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+    retv = ACE_reinterpret_cast (void *,
+      ACE_static_cast (CORBA::Object_ptr, this));
+
+  if (retv)
+    this->_add_ref ();
+  return retv;
+}
+
 const char* CORBA_DomainManager::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/DomainManager:1.0";
+  return "IDL:CORBA/DomainManager:1.0";
+}
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy (const char *_tao_operation,
+IOP::ServiceContextList &_tao_service_context_list,
+CORBA::Object *_tao_target,CORBA::PolicyType policy_type,
+CORBA::Environment &)
+  : TAO_ClientRequest_Info (_tao_operation, _tao_service_context_list, _tao_target),policy_type_ (policy_type)
+{}
+
+Dynamic::ParameterList *
+CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::arguments (CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+   // Generate the arg list on demand
+  CORBA::ULong length = 0;
+        length = this->parameter_list_.length ();
+      this->parameter_list_.length (length + 1);
+      this->parameter_list_[length].argument <<=  this->policy_type_;
+
+    this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+
+    return &this->parameter_list_;
 }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
+  Dynamic::ExceptionList *
+  CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::exceptions (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    // Generate the exception list on demand
+    return 0;
+}
+
+
+      CORBA::Any *
+  CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::result (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+ // Generate the result on demand :
+    this->result_val_ <<= this->result_;
+  return &this->result_val_;
+  }
+
+void
+CORBA_DomainManager::TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy::result (CORBA::Policy_ptr  result)
+  {
+  // update the result
+   this->result_ = result;
+  }
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+// default constructor
+CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (void)
+{}
+
+// destructor
+CORBA_ConstructionPolicy::~CORBA_ConstructionPolicy (void)
+{}
+
+void CORBA_ConstructionPolicy::_tao_any_destructor (void *x)
+{
+  CORBA_ConstructionPolicy *tmp = ACE_static_cast (CORBA_ConstructionPolicy*,x);
+  CORBA::release (tmp);
+}
 
 CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_narrow (
     CORBA::Object_ptr obj,
@@ -183,7 +320,7 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_narrow (
     return CORBA_ConstructionPolicy::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:CORBA_ConstructionPolicy:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:CORBA/ConstructionPolicy:1.0", ACE_TRY_ENV);
       ACE_CHECK_RETURN (CORBA_ConstructionPolicy::_nil ());
       if (is_a == 0)
         return CORBA_ConstructionPolicy::_nil ();
@@ -210,12 +347,14 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow (
           default_proxy = _TAO_collocation_CORBA_ConstructionPolicy_Stub_Factory_function_pointer (obj);
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, CORBA_ConstructionPolicy (stub), CORBA_ConstructionPolicy::_nil ());
-
-      return default_proxy;
-
+        ACE_NEW_RETURN (default_proxy, ::CORBA_ConstructionPolicy (stub), CORBA_ConstructionPolicy::_nil ());
+      #if (TAO_HAS_SMART_PROXIES == 1)
+        return TAO_CORBA_ConstructionPolicy_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
+      #else
+        return default_proxy;
+      #endif /*TAO_HAS_SMART_PROXIES == 1*/
     }
-  else 
+  else
     return
       ACE_reinterpret_cast
         (
@@ -231,23 +370,26 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow (
         );
 }
 
-CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy::_duplicate (CORBA::ConstructionPolicy_ptr obj)
+CORBA_ConstructionPolicy_ptr
+CORBA_ConstructionPolicy::_duplicate (CORBA_ConstructionPolicy_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-void CORBA::ConstructionPolicy::make_domain_manager (
-    IR_InterfaceDef *object_type,
+void CORBA_ConstructionPolicy::make_domain_manager (
+    IR_InterfaceDef* object_type,
     CORBA::Boolean constr_policy,
     CORBA::Environment &ACE_TRY_ENV
   )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
 {
-  // @@ TODO this method will require some modifications once the
-  // interface repository is implemented. The modifications are
-  // documented with @@ comments.
+
+
+
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
@@ -261,245 +403,436 @@ void CORBA::ConstructionPolicy::make_domain_manager (
       istub->orb_core ()
     );
 
-
-  for (;;)
-  {
-    _tao_call.start (ACE_TRY_ENV);
+#if (TAO_HAS_INTERCEPTORS == 1)
+    TAO_ClientRequestInterceptor_Adapter
+      _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV));
     ACE_CHECK;
-
-    CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
-
-    _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag),
-                              ACE_TRY_ENV);
+        CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager  ri ("make_domain_manager",
+_tao_call.service_info (),
+    this        ,    object_type        ,    constr_policy        ,
+        ACE_TRY_ENV);
     ACE_CHECK;
+  ACE_TRY
+    {
+#endif /* TAO_HAS_INTERCEPTORS */
 
-#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-  // @@ The insertion operation (<<) for InterfaceDef will be
-  // defined, and thus this code will work.
-    if (!(
-          (_tao_out << object_type) &&
-          (_tao_out << CORBA::Any::from_boolean (constr_policy))
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-#else /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
-    ACE_UNUSED_ARG (object_type);
-    ACE_UNUSED_ARG (constr_policy);
-#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
-
-    if (_invoke_status == TAO_INVOKE_RESTART)
-      continue;
-    // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot happen
-    if (_invoke_status != TAO_INVOKE_OK)
+    for (;;)
     {
-      ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+      _tao_call.start (ACE_TRY_ENV);
+      TAO_INTERCEPTOR_CHECK;
+
+      TAO_INTERCEPTOR (
+          ri.request_id (_tao_call.request_id ());
+           _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+        );
+      TAO_INTERCEPTOR_CHECK;
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+      _tao_call.prepare_header (
+          ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV
+        );
+      TAO_INTERCEPTOR_CHECK;
+
+      TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+      if (!(
+            (_tao_out << object_type) &&
+            (_tao_out << CORBA::Any::from_boolean (constr_policy))
+        ))
+      TAO_INTERCEPTOR_THROW (CORBA::MARSHAL());
+      int _invoke_status =
+        _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            TAO_INTERCEPTOR_CHECK;
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        continue;
+      if (_invoke_status != TAO_INVOKE_OK)
+      {
+        TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+      }
+
+      TAO_INTERCEPTOR (
+          _tao_vfr.receive_reply (
+            &ri,
+            ACE_TRY_ENV
+          )
+      );
+      TAO_INTERCEPTOR_CHECK;
+      break;
 
     }
-    break;
+#if (TAO_HAS_INTERCEPTORS == 1)
 
   }
+ACE_CATCHANY
+  {
+    ri.exception (&ACE_ANY_EXCEPTION);
+    _tao_vfr.receive_exception (
+        &ri,
+        ACE_TRY_ENV
+      );
+    ACE_RE_THROW;
+  }
+ACE_ENDTRY;
+ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
 
 }
 
-CORBA::Boolean CORBA::ConstructionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/ConstructionPolicy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const
+void *CORBA_ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
-  return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
+  void *retv = 0;
+  if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &CORBA_ConstructionPolicy::_narrow))
+    retv = ACE_reinterpret_cast (void*, this);
+  else if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &::CORBA::Policy::_narrow))
+    retv = ACE_reinterpret_cast
+      (
+        void *,
+        ACE_static_cast
+          (
+            CORBA::Policy_ptr,
+            this
+          )
+      );
+  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+    retv = ACE_reinterpret_cast (void *,
+      ACE_static_cast (CORBA::Object_ptr, this));
+
+  if (retv)
+    this->_add_ref ();
+  return retv;
 }
 
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
+const char* CORBA_ConstructionPolicy::_interface_repository_id (void) const
+{
+  return "IDL:CORBA/ConstructionPolicy:1.0";
+}
 
-// *************************************************************
-// CORBA_DomainManagerList
-// *************************************************************
 
-CORBA_DomainManagerList::CORBA_DomainManagerList (void)
+#if (TAO_HAS_INTERCEPTORS == 1) && (TAO_HAS_INTERFACE_REPOSITORY == 1)
+CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager (const char *_tao_operation,
+IOP::ServiceContextList &_tao_service_context_list,
+CORBA::Object *_tao_target,IR_InterfaceDef* object_type,CORBA::Boolean constr_policy,
+CORBA::Environment &)
+  : TAO_ClientRequest_Info (_tao_operation, _tao_service_context_list, _tao_target),object_type_ (object_type),constr_policy_ (constr_policy)
 {}
 
-CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> (max)
-{}
+Dynamic::ParameterList *
+CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::arguments (CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+   // Generate the arg list on demand
+  CORBA::ULong length = 0;
+        length = this->parameter_list_.length ();
+      this->parameter_list_.length (length + 1);
+      this->parameter_list_[length].argument <<=  this->object_type_;
+
+    this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+                length = this->parameter_list_.length ();
+        this->parameter_list_.length (length + 1);
+        this->parameter_list_[length].argument <<= CORBA::Any::from_boolean (this->constr_policy_ );
+      this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+
+      return &this->parameter_list_;
+}
 
-CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max,
-                                                  CORBA::ULong length,
-                                                  CORBA_DomainManager_ptr *buffer,
-                                                  CORBA::Boolean release)
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> (max,
-                                                        length,
-                                                        buffer,
-                                                        release)
-{}
+    Dynamic::ExceptionList *
+    CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::exceptions (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      // Generate the exception list on demand
+      return 0;
+}
 
-CORBA_DomainManagerList::CORBA_DomainManagerList (const CORBA_DomainManagerList &seq) // copy ctor
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> (seq)
-{}
 
-CORBA_DomainManagerList::~CORBA_DomainManagerList (void) // dtor
-{}
+          CORBA::Any *
+    CORBA_ConstructionPolicy::TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::result (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+ // Generate the result on demand :
+     CORBA::TypeCode tc (CORBA::tk_void);
+    this->result_val_.type (&tc);
 
-void CORBA_DomainManager::_tao_any_destructor (void* x)
-{
-  CORBA_DomainManager_ptr tmp = ACE_static_cast (CORBA_DomainManager_ptr,x);
-  CORBA::release (tmp);
-}
+    return &this->result_val_;
+    }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::DomainManager_ptr _tao_elem)
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
+#endif /* TAO_HAS_INTERCEPTORS && TAO_HAS_INTERFACE_REPOSITORY */
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CS_
+
+    // The Base_Sequence functions, please see tao/Sequence.h
+    void
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_allocate_buffer (CORBA::ULong length)
     {
-      _tao_any._tao_replace (
-          CORBA::_tc_DomainManager,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
+      CORBA_DomainManager **tmp = 0;
+      tmp = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (length);
+
+      if (this->buffer_ != 0)
+      {
+        CORBA_DomainManager **old = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
+        for (CORBA::ULong i = 0; i < this->length_; ++i)
+          if (!this->release_)
+            tmp[i] = CORBA_DomainManager::_duplicate (old[i]);
+          else
+            tmp[i] = old[i];
+
+        if (this->release_)
+          delete[] old;
+
+      }
+      this->buffer_ = tmp;
     }
-}
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DomainManager_ptr &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::DomainManager::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (CORBA::_tc_DomainManager, ACE_TRY_ENV)) // not equal
+    void
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_deallocate_buffer (void)
+    {
+      if (this->buffer_ == 0 || this->release_ == 0)
+        return;
+      CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        return 0;
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_DomainManager::_nil ();
       }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
+      _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
+      this->buffer_ = 0;
+    }
+
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void)
     {
-      _tao_elem = (CORBA::DomainManager_ptr)_tao_any.value ();
-      return 1;
+      this->_deallocate_buffer ();
     }
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    if (stream >> _tao_elem)
+
+    void
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
     {
-      ((CORBA::Any *)&_tao_any)->_tao_replace (
-          CORBA::_tc_DomainManager,
-          1,
-          _tao_elem,
-          CORBA::DomainManager::_tao_any_destructor
-        );
-      return 1;
+      CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
+
+      for (CORBA::ULong i = nl; i < ol; ++i)
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_DomainManager::_nil ();
+      }
     }
-  }
-  ACE_CATCHANY
+    void
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV
+      )
+    {
+      CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, target);
+      *tmp = CORBA_DomainManager::_narrow (src, ACE_TRY_ENV);
+    }
+
+    CORBA_Object*
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_upcast (void *src) const
+    {
+      CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, src);
+      return *tmp;
+    }
+
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
+#define _CORBA_DOMAINMANAGERLIST_CS_
+
+  // *************************************************************
+  // CORBA_DomainManagerList
+  // *************************************************************
+
+  CORBA_DomainManagerList::CORBA_DomainManagerList (void)
+  {}
+  CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max) // uses max size
+    :
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+    TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+   (max)
+  {}
+  CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max, CORBA::ULong length, CORBA_DomainManager_ptr *buffer, CORBA::Boolean release)
+    :
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+    TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+   (max, length, buffer, release)
+  {}
+  CORBA_DomainManagerList::CORBA_DomainManagerList (const CORBA_DomainManagerList &seq) // copy ctor
+    :
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+    TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+   (seq)
+  {}
+  CORBA_DomainManagerList::~CORBA_DomainManagerList (void) // dtor
+  {}
+  void CORBA_DomainManagerList::_tao_any_destructor (void *x)
   {
+    CORBA_DomainManagerList *tmp = ACE_static_cast (CORBA_DomainManagerList*,x);
+    delete tmp;
   }
-  ACE_ENDTRY;
-  return 0;
-}
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>;
-  template class TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
-# pragma instantiate TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
+#endif /* end #if !defined */
 
-CORBA_ConstructionPolicy_ptr (*_TAO_collocation_CORBA_ConstructionPolicy_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-void
-CORBA_ConstructionPolicy::_tao_any_destructor (void *x)
-{
-  CORBA_ConstructionPolicy_ptr tmp = ACE_static_cast(CORBA_ConstructionPolicy_ptr,x);
-  CORBA::release (tmp);
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ConstructionPolicy_ptr _tao_elem)
-{
+    CORBA_DomainManager_ptr (*_TAO_collocation_CORBA_DomainManager_Stub_Factory_function_pointer) (
+      CORBA::Object_ptr obj
+    ) = 0;
+    void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManager_ptr _tao_elem)
+  {
     TAO_OutputCDR stream;
     if (stream << _tao_elem)
     {
       _tao_any._tao_replace (
-          CORBA::_tc_ConstructionPolicy,
+          CORBA::_tc_DomainManager,
           TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
+          stream.begin (),
+          1,
+          CORBA_DomainManager::_duplicate (_tao_elem),
+          CORBA_DomainManager::_tao_any_destructor
         );
     }
-}
+  }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ConstructionPolicy_ptr &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
+  CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr &_tao_elem)
   {
-    _tao_elem = CORBA::ConstructionPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (CORBA::_tc_ConstructionPolicy, ACE_TRY_ENV)) // not equal
+    ACE_TRY_NEW_ENV
+    {
+      _tao_elem = CORBA_DomainManager::_nil ();
+      CORBA::TypeCode_var type = _tao_any.type ();
+      if (!type->equivalent (CORBA::_tc_DomainManager, ACE_TRY_ENV)) // not equal
+        {
+          return 0;
+        }
+      ACE_TRY_CHECK;
+      TAO_InputCDR stream (
+          _tao_any._tao_get_cdr (),
+          _tao_any._tao_byte_order ()
+        );
+      if (stream >> _tao_elem)
       {
-        return 0;
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            CORBA::_tc_DomainManager,
+            1,
+            _tao_elem,
+            CORBA_DomainManager::_tao_any_destructor
+          );
+        return 1;
       }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
+    }
+    ACE_CATCHANY
     {
-      _tao_elem = (CORBA::ConstructionPolicy_ptr)_tao_any.value ();
-      return 1;
+      _tao_elem = CORBA_DomainManager::_nil ();
+      return 0;
     }
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    if (stream >> _tao_elem)
+    ACE_ENDTRY;
+    _tao_elem = CORBA_DomainManager::_nil ();
+    return 0;
+  }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+      defined (ACE_HAS_GNU_REPO)
+      template class TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #  pragma instantiate TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
+  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  CORBA_ConstructionPolicy_ptr (*_TAO_collocation_CORBA_ConstructionPolicy_Stub_Factory_function_pointer) (
+      CORBA::Object_ptr obj
+    ) = 0;
+    void operator<<= (CORBA::Any &_tao_any, CORBA_ConstructionPolicy_ptr _tao_elem)
+  {
+    TAO_OutputCDR stream;
+    if (stream << _tao_elem)
     {
-      ((CORBA::Any *)&_tao_any)->_tao_replace (
+      _tao_any._tao_replace (
           CORBA::_tc_ConstructionPolicy,
+          TAO_ENCAP_BYTE_ORDER,
+          stream.begin (),
           1,
-          _tao_elem,
-          CORBA::ConstructionPolicy::_tao_any_destructor
+          CORBA_ConstructionPolicy::_duplicate (_tao_elem),
+          CORBA_ConstructionPolicy::_tao_any_destructor
         );
-      return 1;
     }
   }
-  ACE_CATCHANY
+
+  CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy_ptr &_tao_elem)
   {
+    ACE_TRY_NEW_ENV
+    {
+      _tao_elem = CORBA_ConstructionPolicy::_nil ();
+      CORBA::TypeCode_var type = _tao_any.type ();
+      if (!type->equivalent (CORBA::_tc_ConstructionPolicy, ACE_TRY_ENV)) // not equal
+        {
+          return 0;
+        }
+      ACE_TRY_CHECK;
+      TAO_InputCDR stream (
+          _tao_any._tao_get_cdr (),
+          _tao_any._tao_byte_order ()
+        );
+      if (stream >> _tao_elem)
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            CORBA::_tc_ConstructionPolicy,
+            1,
+            _tao_elem,
+            CORBA_ConstructionPolicy::_tao_any_destructor
+          );
+        return 1;
+      }
+    }
+    ACE_CATCHANY
+    {
+      _tao_elem = CORBA_ConstructionPolicy::_nil ();
+      return 0;
+    }
+    ACE_ENDTRY;
+    _tao_elem = CORBA_ConstructionPolicy::_nil ();
+    return 0;
   }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-void
-CORBA_DomainManagerList::_tao_any_destructor (void *x)
-{
-  CORBA_DomainManagerList* tmp = ACE_static_cast (CORBA_DomainManagerList*,x);
-  delete tmp;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::DomainManagerList &_tao_elem
-  ) // copying
-{
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+      defined (ACE_HAS_GNU_REPO)
+      template class TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #  pragma instantiate TAO_Object_Manager<CORBA_ConstructionPolicy,CORBA_ConstructionPolicy_var>
+  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+    void operator<<= (
+      CORBA::Any &_tao_any,
+      const CORBA_DomainManagerList &_tao_elem
+    ) // copying
+  {
     TAO_OutputCDR stream;
     if (stream << _tao_elem)
     {
@@ -509,73 +842,119 @@ void operator<<= (
           stream.begin ()
         );
     }
-}
+  }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::DomainManagerList *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_DomainManagerList,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::DomainManagerList::_tao_any_destructor
-    );
-}
+  void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManagerList *_tao_elem) // non copying
+  {
+    TAO_OutputCDR stream;
+    stream << *_tao_elem;
+    _tao_any._tao_replace (
+        CORBA::_tc_DomainManagerList,
+        TAO_ENCAP_BYTE_ORDER,
+        stream.begin (),
+        1,
+        _tao_elem,
+        CORBA_DomainManagerList::_tao_any_destructor
+      );
+  }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DomainManagerList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
+  CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManagerList *&_tao_elem)
   {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (CORBA::_tc_DomainManagerList, ACE_TRY_ENV)) // not equal
-      {
-        _tao_elem = 0;
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::DomainManagerList *)_tao_any.value ();
-      return 1;
-    }
-    else
+    return _tao_any >>= ACE_const_cast(
+        const CORBA_DomainManagerList*&,
+        _tao_elem
+      );
+  }
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManagerList *&_tao_elem)
+  {
+    _tao_elem = 0;
+    ACE_TRY_NEW_ENV
     {
-      ACE_NEW_RETURN (_tao_elem, CORBA::DomainManagerList, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *_tao_elem)
+      CORBA::TypeCode_var type = _tao_any.type ();
+      if (!type->equivalent (CORBA::_tc_DomainManagerList, ACE_TRY_ENV)) // not equal
+        {
+          return 0;
+        }
+      ACE_TRY_CHECK;
+      if (_tao_any.any_owns_data ())
       {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_DomainManagerList,
-            1,
-            ACE_reinterpret_cast (void *, _tao_elem),
-            CORBA::DomainManagerList::_tao_any_destructor
+        _tao_elem = ACE_static_cast(
+            const CORBA_DomainManagerList*,
+            _tao_any.value ()
           );
         return 1;
       }
       else
       {
-        delete _tao_elem;
-        _tao_elem = 0;
+        CORBA_DomainManagerList *tmp;
+        ACE_NEW_RETURN (tmp, CORBA_DomainManagerList, 0);
+        TAO_InputCDR stream (
+            _tao_any._tao_get_cdr (),
+            _tao_any._tao_byte_order ()
+          );
+        if (stream >> *tmp)
+        {
+          ((CORBA::Any *)&_tao_any)->_tao_replace (
+              CORBA::_tc_DomainManagerList,
+              1,
+              ACE_static_cast (void *, tmp),
+              CORBA_DomainManagerList::_tao_any_destructor
+            );
+          _tao_elem = tmp;
+          return 1;
+        }
+        else
+        {
+          delete tmp;
+        }
       }
     }
+    ACE_CATCHANY
+    {
+    }
+    ACE_ENDTRY;
+    return 0;
   }
-  ACE_CATCHANY
+
+  CORBA::Boolean operator<< (
+      TAO_OutputCDR &strm,
+      const CORBA_DomainManagerList &_tao_sequence
+    )
   {
-    delete _tao_elem;
-    _tao_elem = 0;
-    return 0;
+    if (strm << _tao_sequence.length ())
+    {
+      // encode all elements
+      CORBA::Boolean _tao_marshal_flag = 1;
+      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+      {
+        _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      }
+      return _tao_marshal_flag;
+    }
+    return 0; // error
   }
-  ACE_ENDTRY;
-  return 0;
-}
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::DomainManagerList *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(CORBA::DomainManagerList*&,_tao_elem);
-}
+  CORBA::Boolean operator>> (
+      TAO_InputCDR &strm,
+      CORBA_DomainManagerList &_tao_sequence
+    )
+  {
+    CORBA::ULong _tao_seq_len;
+    if (strm >> _tao_seq_len)
+    {
+      // 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_sequence.length () && _tao_marshal_flag; i++)
+      {
+        _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      }
+      return _tao_marshal_flag;
+    }
+    return 0; // error
+  }
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 707aa7569fb..98f58ec8a54 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -1,6 +1,4 @@
-/* -*- C++ -*- */
-// $Id$
-
+/* -*- C++ -*- $Id$ */
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
@@ -9,25 +7,33 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_DOMAINC_H
-#define TAO_IDL_DOMAINC_H
-#include "ace/pre.h"
-
-#include "tao/corbafwd.h"
-#include "tao/PolicyC.h"
-#include "tao/Environment.h"
-#include "tao/Any.h"
+#ifndef _TAO_IDL_ORIG_DOMAINC_H_
+#define _TAO_IDL_ORIG_DOMAINC_H_
 
-class IR_InterfaceDef;
+#include "ace/pre.h"
+#include "corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "PolicyC.h"
+#include "Request_Info.h"
+
+class IR_InterfaceDef;
+
 #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)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -35,184 +41,204 @@ class IR_InterfaceDef;
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_Export CORBA_DomainManager_var : public TAO_Base_var
-{
-public:
-  CORBA_DomainManager_var (void); // default constructor
-  CORBA_DomainManager_var (CORBA_DomainManager_ptr p) : ptr_ (p) {}
-  CORBA_DomainManager_var (const CORBA_DomainManager_var &); // copy constructor
-  ~CORBA_DomainManager_var (void); // destructor
 
-  CORBA_DomainManager_var &operator= (CORBA_DomainManager_ptr);
-  CORBA_DomainManager_var &operator= (const CORBA_DomainManager_var &);
-  CORBA_DomainManager_ptr operator-> (void) const;
 
-  operator const CORBA_DomainManager_ptr &() const;
-  operator CORBA_DomainManager_ptr &();
-  // in, inout, out, _retn
-  CORBA_DomainManager_ptr in (void) const;
-  CORBA_DomainManager_ptr &inout (void);
-  CORBA_DomainManager_ptr &out (void);
-  CORBA_DomainManager_ptr _retn (void);
-  CORBA_DomainManager_ptr ptr (void) const;
+#if !defined (_CORBA_DOMAINMANAGER___PTR_CH_)
+#define _CORBA_DOMAINMANAGER___PTR_CH_
 
-private:
-  CORBA_DomainManager_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_DomainManager_var (const TAO_Base_var &rhs);
-  CORBA_DomainManager_var &operator= (const TAO_Base_var &rhs);
-};
+  class CORBA_DomainManager;
+  typedef CORBA_DomainManager *CORBA_DomainManager_ptr;
 
-class TAO_Export CORBA_DomainManager_out
-{
-public:
-  CORBA_DomainManager_out (CORBA_DomainManager_ptr &);
-  CORBA_DomainManager_out (CORBA_DomainManager_var &);
-  CORBA_DomainManager_out (const CORBA_DomainManager_out &);
-  CORBA_DomainManager_out &operator= (const CORBA_DomainManager_out &);
-  CORBA_DomainManager_out &operator= (const CORBA_DomainManager_var &);
-  CORBA_DomainManager_out &operator= (CORBA_DomainManager_ptr);
-  operator CORBA_DomainManager_ptr &();
-  CORBA_DomainManager_ptr &ptr (void);
-  CORBA_DomainManager_ptr operator-> (void);
+#endif /* end #if !defined */
 
-private:
-  CORBA_DomainManager_ptr &ptr_;
-};
 
-class TAO_Export CORBA_DomainManager : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_DomainManager_ptr _ptr_type;
-  typedef CORBA_DomainManager_var _var_type;
-#endif /* __GNUC__ */
+#if !defined (_CORBA_DOMAINMANAGER___VAR_CH_)
+#define _CORBA_DOMAINMANAGER___VAR_CH_
 
-  // the static operations
-  static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj);
-  static CORBA_DomainManager_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_DomainManager_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static CORBA_DomainManager_ptr _nil (void);
-  static void _tao_any_destructor (void*);
+  class TAO_Export CORBA_DomainManager_var : public TAO_Base_var
+  {
+  public:
+    CORBA_DomainManager_var (void); // default constructor
+    CORBA_DomainManager_var (CORBA_DomainManager_ptr p) : ptr_ (p) {}
+    CORBA_DomainManager_var (const CORBA_DomainManager_var &); // copy constructor
+    ~CORBA_DomainManager_var (void); // destructor
 
-  virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV =
+    CORBA_DomainManager_var &operator= (CORBA_DomainManager_ptr);
+    CORBA_DomainManager_var &operator= (const CORBA_DomainManager_var &);
+    CORBA_DomainManager_ptr operator-> (void) const;
+
+    operator const CORBA_DomainManager_ptr &() const;
+    operator CORBA_DomainManager_ptr &();
+    // in, inout, out, _retn
+    CORBA_DomainManager_ptr in (void) const;
+    CORBA_DomainManager_ptr &inout (void);
+    CORBA_DomainManager_ptr &out (void);
+    CORBA_DomainManager_ptr _retn (void);
+    CORBA_DomainManager_ptr ptr (void) const;
+
+  private:
+    CORBA_DomainManager_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    CORBA_DomainManager_var (const TAO_Base_var &rhs);
+    CORBA_DomainManager_var &operator= (const TAO_Base_var &rhs);
+  };
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DOMAINMANAGER___OUT_CH_)
+#define _CORBA_DOMAINMANAGER___OUT_CH_
+
+  class TAO_Export CORBA_DomainManager_out
+  {
+  public:
+    CORBA_DomainManager_out (CORBA_DomainManager_ptr &);
+    CORBA_DomainManager_out (CORBA_DomainManager_var &);
+    CORBA_DomainManager_out (const CORBA_DomainManager_out &);
+    CORBA_DomainManager_out &operator= (const CORBA_DomainManager_out &);
+    CORBA_DomainManager_out &operator= (const CORBA_DomainManager_var &);
+    CORBA_DomainManager_out &operator= (CORBA_DomainManager_ptr);
+    operator CORBA_DomainManager_ptr &();
+    CORBA_DomainManager_ptr &ptr (void);
+    CORBA_DomainManager_ptr operator-> (void);
+
+  private:
+    CORBA_DomainManager_ptr &ptr_;
+  };
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DOMAINMANAGER_CH_)
+#define _CORBA_DOMAINMANAGER_CH_
+
+class TAO_Export CORBA_DomainManager : public virtual CORBA_Object
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef CORBA_DomainManager_ptr _ptr_type;
+    typedef CORBA_DomainManager_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj);
+    static CORBA_DomainManager_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    static CORBA_DomainManager_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    static CORBA_DomainManager_ptr _nil (void)
+      {
+        return (CORBA_DomainManager_ptr)0;
+      }
+
+    static void _tao_any_destructor (void*);
+
+    virtual CORBA_Policy_ptr get_domain_policy (
+        CORBA::PolicyType policy_type,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    virtual CORBA::Boolean _is_a (
+        const CORBA::Char *type_id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    CORBA_DomainManager (void);
+    CORBA_DomainManager (TAO_Stub *objref,
+        CORBA::Boolean _tao_collocated = 0
+      );
+    virtual ~CORBA_DomainManager (void);
+  private:
+    CORBA_DomainManager (const CORBA_DomainManager &);
+    void operator= (const CORBA_DomainManager &);
+#if (TAO_HAS_INTERCEPTORS == 1)
+        // Generation of interceptors related RequestInfo classes per operation.
+    // This needed to be able to store the arguments, exceptiosn, constexts
+    // and build the lists dynamically on demand so that unnecessary time overhead
+    // of building these lists when they arent used is avoided.
+            class TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy : public TAO_ClientRequest_Info
+    {
+    public:
+      friend class CORBA_DomainManager;
+      TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy (
+        const char *_tao_operation,
+        IOP::ServiceContextList &_tao_service_context_list,
+        CORBA::Object *_tao_target            ,      CORBA::PolicyType policy_type      ,
+            CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
-    );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
+      );
+
+       virtual Dynamic::ParameterList * arguments (
+        CORBA::Environment &ACE_TRY_ENV =
+           TAO_default_environment ())
+       ACE_THROW_SPEC ((CORBA::SystemException));
+
+        virtual Dynamic::ExceptionList * exceptions (
       CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
+         TAO_default_environment ())
+     ACE_THROW_SPEC ((CORBA::SystemException));
 
-protected:
-  CORBA_DomainManager (void);
-  CORBA_DomainManager (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DomainManager (void);
-private:
-  CORBA_DomainManager (const CORBA_DomainManager &);
-  void operator= (const CORBA_DomainManager &);
-};
+    virtual CORBA::Any * result (
+    CORBA::Environment &ACE_TRY_ENV =
+       TAO_default_environment ())
+   ACE_THROW_SPEC ((CORBA::SystemException));
 
-// *************************************************************
-// DomainManagerList
-// *************************************************************
 
-class TAO_Export CORBA_DomainManagerList : public TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
-{
-public:
-  CORBA_DomainManagerList (void); // default ctor
-  CORBA_DomainManagerList (CORBA::ULong max); // uses max size
-  CORBA_DomainManagerList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA_DomainManager_ptr *buffer,
-    CORBA::Boolean release=0
-  );
-  CORBA_DomainManagerList (const CORBA_DomainManagerList &); // copy ctor
-  ~CORBA_DomainManagerList (void); // dtor
-  static void _tao_any_destructor (void*);
+private:
+TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy (const TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy &);
+void operator= (const TAO_ClientRequest_Info_CORBA_DomainManager_get_domain_policy &);
+CORBA::PolicyType & policy_type_;
+void result (CORBA_Policy_ptr  result);
+ // update the result
+CORBA_Policy_ptr  result_;
 };
 
-typedef CORBA_DomainManagerList *CORBA_DomainManagerList_ptr;
+#endif /* TAO_HAS_INTERCEPTORS */
 
-// *************************************************************
-// class CORBA::DomainManagerList_var
-// *************************************************************
+};
 
-class TAO_Export CORBA_DomainManagerList_var
-{
-public:
-  CORBA_DomainManagerList_var (void); // default constructor
-  CORBA_DomainManagerList_var (CORBA_DomainManagerList *);
-  CORBA_DomainManagerList_var (const CORBA_DomainManagerList_var &); // copy constructor
-  ~CORBA_DomainManagerList_var (void); // destructor
 
-  CORBA_DomainManagerList_var &operator= (CORBA_DomainManagerList *);
-  CORBA_DomainManagerList_var &operator= (const CORBA_DomainManagerList_var &);
-  CORBA_DomainManagerList *operator-> (void);
-  const CORBA_DomainManagerList *operator-> (void) const;
+#endif /* end #if !defined */
 
-  operator const CORBA_DomainManagerList &() const;
-  operator CORBA_DomainManagerList &();
-  operator CORBA_DomainManagerList &() const;
+TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_DomainManager;
 
-  TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> operator[] (CORBA::ULong slot);
-  // in, inout, out, _retn
-  const CORBA_DomainManagerList &in (void) const;
-  CORBA_DomainManagerList &inout (void);
-  CORBA_DomainManagerList *&out (void);
-  CORBA_DomainManagerList *_retn (void);
-  CORBA_DomainManagerList *ptr (void) const;
+TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SecConstruction;
 
-private:
-  CORBA_DomainManagerList *ptr_;
-};
 
-class TAO_Export CORBA_DomainManagerList_out
-{
-public:
-  CORBA_DomainManagerList_out (CORBA_DomainManagerList *&);
-  CORBA_DomainManagerList_out (CORBA_DomainManagerList_var &);
-  CORBA_DomainManagerList_out (const CORBA_DomainManagerList_out &);
-  CORBA_DomainManagerList_out &operator= (const CORBA_DomainManagerList_out &);
-  CORBA_DomainManagerList_out &operator= (CORBA_DomainManagerList *);
-  operator CORBA_DomainManagerList *&();
-  CORBA_DomainManagerList *&ptr (void);
-  CORBA_DomainManagerList *operator-> (void);
+#if !defined (_CORBA_CONSTRUCTIONPOLICY___PTR_CH_)
+#define _CORBA_CONSTRUCTIONPOLICY___PTR_CH_
 
-  TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> operator[] (CORBA::ULong slot);
+class CORBA_ConstructionPolicy;
+typedef CORBA_ConstructionPolicy *CORBA_ConstructionPolicy_ptr;
 
-private:
-  CORBA_DomainManagerList *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_DomainManagerList_var &);
-};
+#endif /* end #if !defined */
 
-// *************************************************************
-// ConstructionPolicy
-// *************************************************************
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
+#if !defined (_CORBA_CONSTRUCTIONPOLICY___VAR_CH_)
+#define _CORBA_CONSTRUCTIONPOLICY___VAR_CH_
 
 class TAO_Export CORBA_ConstructionPolicy_var : public TAO_Base_var
 {
 public:
   CORBA_ConstructionPolicy_var (void); // default constructor
-  CORBA_ConstructionPolicy_var (CORBA_ConstructionPolicy_ptr);
+  CORBA_ConstructionPolicy_var (CORBA_ConstructionPolicy_ptr p) : ptr_ (p) {}
   CORBA_ConstructionPolicy_var (const CORBA_ConstructionPolicy_var &); // copy constructor
   ~CORBA_ConstructionPolicy_var (void); // destructor
 
@@ -236,6 +262,13 @@ private:
   CORBA_ConstructionPolicy_var &operator= (const TAO_Base_var &rhs);
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_CONSTRUCTIONPOLICY___OUT_CH_)
+#define _CORBA_CONSTRUCTIONPOLICY___OUT_CH_
+
 class TAO_Export CORBA_ConstructionPolicy_out
 {
 public:
@@ -253,13 +286,20 @@ private:
   CORBA_ConstructionPolicy_ptr &ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_)
+#define _CORBA_CONSTRUCTIONPOLICY_CH_
+
 class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA_Policy
 {
 public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef CORBA_ConstructionPolicy_ptr _ptr_type;
   typedef CORBA_ConstructionPolicy_var _var_type;
-#endif /* __GNUC__ */
+#endif /* ! __GNUC__ || g++ >= 2.8 */
 
   // the static operations
   static CORBA_ConstructionPolicy_ptr _duplicate (CORBA_ConstructionPolicy_ptr obj);
@@ -273,88 +313,286 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
-  static CORBA_ConstructionPolicy_ptr _nil (void);
+  static CORBA_ConstructionPolicy_ptr _nil (void)
+    {
+      return (CORBA_ConstructionPolicy_ptr)0;
+    }
+
   static void _tao_any_destructor (void*);
 
   virtual void make_domain_manager (
-      IR_InterfaceDef *object_type,
+      IR_InterfaceDef* object_type,
       CORBA::Boolean constr_policy,
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
-    );
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
 
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+  virtual void *_tao_QueryInterface (ptr_arith_t type);
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   CORBA_ConstructionPolicy (void);
   CORBA_ConstructionPolicy (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~CORBA_ConstructionPolicy (void);
 private:
   CORBA_ConstructionPolicy (const CORBA_ConstructionPolicy &);
   void operator= (const CORBA_ConstructionPolicy &);
+#if (TAO_HAS_INTERCEPTORS == 1)
+    // Generation of interceptors related RequestInfo classes per operation.
+  // This needed to be able to store the arguments, exceptiosn, constexts
+  // and build the lists dynamically on demand so that unnecessary time overhead
+  // of building these lists when they arent used is avoided.
+      class TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager : public TAO_ClientRequest_Info
+  {
+  public:
+    friend class CORBA_ConstructionPolicy;
+    TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager (
+      const char *_tao_operation,
+      IOP::ServiceContextList &_tao_service_context_list,
+      CORBA::Object *_tao_target        ,    IR_InterfaceDef* object_type        ,    CORBA::Boolean constr_policy    ,
+        CORBA::Environment &ACE_TRY_ENV =
+      TAO_default_environment ()
+    );
+
+     virtual Dynamic::ParameterList * arguments (
+      CORBA::Environment &ACE_TRY_ENV =
+         TAO_default_environment ())
+     ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual Dynamic::ExceptionList * exceptions (
+    CORBA::Environment &ACE_TRY_ENV =
+       TAO_default_environment ())
+   ACE_THROW_SPEC ((CORBA::SystemException));
+
+virtual CORBA::Any * result (
+  CORBA::Environment &ACE_TRY_ENV =
+     TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
+
+
+private:
+TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager &);
+void operator= (const TAO_ClientRequest_Info_CORBA_ConstructionPolicy_make_domain_manager &);
+IR_InterfaceDef* & object_type_;
+CORBA::Boolean & constr_policy_;
 };
 
-extern  CORBA_ConstructionPolicy_ptr (*_TAO_collocation_CORBA_ConstructionPolicy_Stub_Factory_function_pointer) (
-    CORBA::Object_ptr obj
+#endif /* TAO_HAS_INTERCEPTORS */
+
+};
+
+
+#endif /* end #if !defined */
+
+TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy;
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CH_
+
+  class _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum,
+      CORBA::ULong length,
+      CORBA_DomainManager* *value,
+      CORBA::Boolean release = 0);
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList(const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs);
+    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs);
+    TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> operator[] (CORBA::ULong index) const;
+    static CORBA_DomainManager **allocbuf (CORBA::ULong nelems);
+    static void freebuf (CORBA_DomainManager **buffer);
+    // The Base_Sequence functions, please see tao/Sequence.h
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    CORBA_DomainManager* *get_buffer (CORBA::Boolean orphan = 0);
+    const CORBA_DomainManager* *get_buffer (void) const;
+    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+
+  };
+
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#if !defined (_CORBA_DOMAINMANAGERLIST_CH_)
+#define _CORBA_DOMAINMANAGERLIST_CH_
+
+class CORBA_DomainManagerList;
+class CORBA_DomainManagerList_var;
+
+// *************************************************************
+// CORBA_DomainManagerList
+// *************************************************************
+
+class TAO_Export CORBA_DomainManagerList : public
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+{
+public:
+  CORBA_DomainManagerList (void); // default ctor
+  CORBA_DomainManagerList (CORBA::ULong max); // uses max size
+  CORBA_DomainManagerList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA_DomainManager_ptr *buffer,
+    CORBA::Boolean release=0
   );
-// Any operators for interface CORBA_ConstructionPolicy
-TAO_Export void operator<<= (CORBA::Any &,
-                             CORBA_ConstructionPolicy_ptr);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA_ConstructionPolicy *&);
+  CORBA_DomainManagerList (const CORBA_DomainManagerList &); // copy ctor
+  ~CORBA_DomainManagerList (void);
+  static void _tao_any_destructor (void*);
 
-#ifndef __ACE_INLINE__
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+  typedef CORBA_DomainManagerList_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &,
-                                      const CORBA_ConstructionPolicy_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &,
-                                      CORBA_ConstructionPolicy_ptr &);
+};
 
-#endif /* __ACE_INLINE__ */
+#endif /* end #if !defined */
 
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
 
+#if !defined (_CORBA_DOMAINMANAGERLIST___VAR_CH_)
+#define _CORBA_DOMAINMANAGERLIST___VAR_CH_
 
+// *************************************************************
+// class CORBA_DomainManagerList_var
+// *************************************************************
 
+class TAO_Export CORBA_DomainManagerList_var
+{
+public:
+  CORBA_DomainManagerList_var (void); // default constructor
+  CORBA_DomainManagerList_var (CORBA_DomainManagerList *);
+  CORBA_DomainManagerList_var (const CORBA_DomainManagerList_var &); // copy constructor
+  ~CORBA_DomainManagerList_var (void); // destructor
+
+  CORBA_DomainManagerList_var &operator= (CORBA_DomainManagerList *);
+  CORBA_DomainManagerList_var &operator= (const CORBA_DomainManagerList_var &);
+  CORBA_DomainManagerList *operator-> (void);
+  const CORBA_DomainManagerList *operator-> (void) const;
+
+  operator const CORBA_DomainManagerList &() const;
+  operator CORBA_DomainManagerList &();
+  operator CORBA_DomainManagerList &() const;
+  operator CORBA_DomainManagerList *&(); // variable-size base types only
+
+  TAO_Object_Manager<CORBA_DomainManager, CORBA_DomainManager_var> operator[] (CORBA::ULong index);
+  // in, inout, out, _retn
+  const CORBA_DomainManagerList &in (void) const;
+  CORBA_DomainManagerList &inout (void);
+  CORBA_DomainManagerList *&out (void);
+  CORBA_DomainManagerList *_retn (void);
+  CORBA_DomainManagerList *ptr (void) const;
+
+private:
+  CORBA_DomainManagerList *ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DOMAINMANAGERLIST___OUT_CH_)
+#define _CORBA_DOMAINMANAGERLIST___OUT_CH_
+
+class TAO_Export CORBA_DomainManagerList_out
+{
+public:
+  CORBA_DomainManagerList_out (CORBA_DomainManagerList *&);
+  CORBA_DomainManagerList_out (CORBA_DomainManagerList_var &);
+  CORBA_DomainManagerList_out (const CORBA_DomainManagerList_out &);
+  CORBA_DomainManagerList_out &operator= (const CORBA_DomainManagerList_out &);
+  CORBA_DomainManagerList_out &operator= (CORBA_DomainManagerList *);
+  operator CORBA_DomainManagerList *&();
+  CORBA_DomainManagerList *&ptr (void);
+  CORBA_DomainManagerList *operator-> (void);
+  TAO_Object_Manager<CORBA_DomainManager, CORBA_DomainManager_var> operator[] (CORBA::ULong index);
+
+private:
+  CORBA_DomainManagerList *&ptr_;
+  // assignment from T_var not allowed
+  void operator= (const CORBA_DomainManagerList_var &);
+};
+
+
+#endif /* end #if !defined */
 
+TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CORBA_DomainManagerList;
+
+
+extern TAO_Export CORBA_DomainManager_ptr (*_TAO_collocation_CORBA_DomainManager_Stub_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface CORBA_DomainManager
-TAO_Export void operator<<= (CORBA::Any &,
-                             CORBA_DomainManager_ptr);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA_DomainManager *&);
-
-// Any operators for interface CORBA_DomainManagerList
-TAO_Export void operator<<= (CORBA::Any &,
-                             const CORBA_DomainManagerList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &,
-                             CORBA_DomainManagerList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::DomainManagerList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CORBA::DomainManagerList *&);
+TAO_Export void operator<<= (CORBA::Any &, CORBA_DomainManager_ptr);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_DomainManager *&);
+extern TAO_Export CORBA_ConstructionPolicy_ptr (*_TAO_collocation_CORBA_ConstructionPolicy_Stub_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
+// Any operators for interface CORBA_ConstructionPolicy
+TAO_Export void operator<<= (CORBA::Any &, CORBA_ConstructionPolicy_ptr);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstructionPolicy *&);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA_DomainManagerList &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA_DomainManagerList*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_DomainManagerList *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_DomainManagerList *&);
 
 #ifndef __ACE_INLINE__
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &,
-                                      const CORBA_DomainManager_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &,
-                                      CORBA_DomainManager_ptr &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &,
-                                      const CORBA_DomainManagerList &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &,
-                                      CORBA_DomainManagerList &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_DomainManager_ptr );
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_DomainManager_ptr &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstructionPolicy_ptr );
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstructionPolicy_ptr &);
+
+#if !defined _TAO_CDR_OP_CORBA_DomainManagerList_H_
+#define _TAO_CDR_OP_CORBA_DomainManagerList_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_DomainManagerList &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_DomainManagerList &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_DomainManagerList_H_ */
+
+
 #endif /* __ACE_INLINE__ */
 
+
 #if defined (__ACE_INLINE__)
-#include "tao/DomainC.i"
+#include "DomainC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -362,4 +600,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &,
 #endif /* _MSC_VER */
 
 #include "ace/post.h"
-#endif /* TAO_IDL_DOMAINC_H */
+#endif /* ifndef */
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index 2b3834f6035..551275895ef 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-// $Id$
+/* -*- C++ -*- $Id$ */
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
@@ -8,41 +7,40 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-ACE_INLINE
-CORBA_DomainManager::CORBA_DomainManager (void) // default constructor
-{}
 
-ACE_INLINE
-CORBA_DomainManager::CORBA_DomainManager (TAO_Stub *objref,
-                                     TAO_ServantBase *_tao_servant,
-                                     CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
+#if !defined (_CORBA_DOMAINMANAGER___CI_)
+#define _CORBA_DOMAINMANAGER___CI_
 
 ACE_INLINE
-CORBA_DomainManager::~CORBA_DomainManager (void) // destructor
+CORBA_DomainManager::CORBA_DomainManager (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DOMAINMANAGER___VAR_CI_)
+#define _CORBA_DOMAINMANAGER___VAR_CI_
 
 // *************************************************************
-// Inline operations for class CORBA::DomainManager_var
+// Inline operations for class CORBA_DomainManager_var
 // *************************************************************
 
 ACE_INLINE
 CORBA_DomainManager_var::CORBA_DomainManager_var (void) // default constructor
-  : ptr_ (CORBA::DomainManager::_nil ())
+  : ptr_ (CORBA_DomainManager::_nil ())
 {}
 
-ACE_INLINE CORBA::DomainManager_ptr
+ACE_INLINE ::CORBA_DomainManager_ptr
 CORBA_DomainManager_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA_DomainManager_var::CORBA_DomainManager_var (const CORBA::DomainManager_var &p) // copy constructor
+CORBA_DomainManager_var::CORBA_DomainManager_var (const ::CORBA_DomainManager_var &p) // copy constructor
   : TAO_Base_var (),
-    ptr_ (CORBA::DomainManager::_duplicate (p.ptr ()))
+    ptr_ (CORBA_DomainManager::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
@@ -51,81 +49,88 @@ CORBA_DomainManager_var::~CORBA_DomainManager_var (void) // destructor
   CORBA::release (this->ptr_);
 }
 
-ACE_INLINE CORBA::DomainManager_var &
-CORBA_DomainManager_var::operator= (CORBA::DomainManager_ptr p)
+ACE_INLINE CORBA_DomainManager_var &
+CORBA_DomainManager_var::operator= (CORBA_DomainManager_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE CORBA::DomainManager_var &
-CORBA_DomainManager_var::operator= (const CORBA::DomainManager_var &p)
+ACE_INLINE CORBA_DomainManager_var &
+CORBA_DomainManager_var::operator= (const ::CORBA_DomainManager_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::DomainManager::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA_DomainManager::_duplicate (p.ptr ());
   }
   return *this;
 }
 
 ACE_INLINE
-CORBA_DomainManager_var::operator const CORBA::DomainManager_ptr &() const // cast
+CORBA_DomainManager_var::operator const ::CORBA_DomainManager_ptr &() const // cast
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA_DomainManager_var::operator CORBA::DomainManager_ptr &() // cast
+CORBA_DomainManager_var::operator ::CORBA_DomainManager_ptr &() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::DomainManager_ptr
+ACE_INLINE ::CORBA_DomainManager_ptr
 CORBA_DomainManager_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::DomainManager_ptr
+ACE_INLINE ::CORBA_DomainManager_ptr
 CORBA_DomainManager_var::in (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::DomainManager_ptr &
+ACE_INLINE ::CORBA_DomainManager_ptr &
 CORBA_DomainManager_var::inout (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::DomainManager_ptr &
+ACE_INLINE ::CORBA_DomainManager_ptr &
 CORBA_DomainManager_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DomainManager::_nil ();
+  this->ptr_ = ::CORBA_DomainManager::_nil ();
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::DomainManager_ptr
+ACE_INLINE ::CORBA_DomainManager_ptr
 CORBA_DomainManager_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  CORBA_DomainManager_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DomainManager::_nil ();
+  ::CORBA_DomainManager_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_DomainManager::_nil ();
   return val;
 }
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DOMAINMANAGER___OUT_CI_)
+#define _CORBA_DOMAINMANAGER___OUT_CI_
+
 // *************************************************************
-// Inline operations for class CORBA::DomainManager_out
+// Inline operations for class CORBA_DomainManager_out
 // *************************************************************
 
 ACE_INLINE
 CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = CORBA::DomainManager::_nil ();
+  this->ptr_ = ::CORBA_DomainManager::_nil ();
 }
 
 ACE_INLINE
@@ -133,25 +138,25 @@ CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_var &p) //
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DomainManager::_nil ();
+  this->ptr_ = ::CORBA_DomainManager::_nil ();
 }
 
 ACE_INLINE
-CORBA_DomainManager_out::CORBA_DomainManager_out (const CORBA_DomainManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DomainManager_out&,p).ptr_)
+CORBA_DomainManager_out::CORBA_DomainManager_out (const ::CORBA_DomainManager_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_DomainManager_out &, p).ptr_)
 {}
 
-ACE_INLINE CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (const CORBA_DomainManager_out &p)
+ACE_INLINE ::CORBA_DomainManager_out &
+CORBA_DomainManager_out::operator= (const ::CORBA_DomainManager_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA::DomainManager_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (CORBA_DomainManager_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (const CORBA_DomainManager_var &p)
+CORBA_DomainManager_out::operator= (const ::CORBA_DomainManager_var &p)
 {
-  this->ptr_ = CORBA::DomainManager::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA_DomainManager::_duplicate (p.ptr ());
   return *this;
 }
 
@@ -163,46 +168,43 @@ CORBA_DomainManager_out::operator= (CORBA_DomainManager_ptr p)
 }
 
 ACE_INLINE
-CORBA_DomainManager_out::operator CORBA_DomainManager_ptr &() // cast
+CORBA_DomainManager_out::operator ::CORBA_DomainManager_ptr &() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_DomainManager_ptr &
+ACE_INLINE ::CORBA_DomainManager_ptr &
 CORBA_DomainManager_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_DomainManager_ptr
+ACE_INLINE ::CORBA_DomainManager_ptr
 CORBA_DomainManager_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
 
-ACE_INLINE
-CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (void) // default constructor
-{}
+#endif /* end #if !defined */
 
-ACE_INLINE
-CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
+
+#if !defined (_CORBA_CONSTRUCTIONPOLICY___CI_)
+#define _CORBA_CONSTRUCTIONPOLICY___CI_
 
 ACE_INLINE
-CORBA_ConstructionPolicy::~CORBA_ConstructionPolicy (void) // destructor
+CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
-ACE_INLINE CORBA::ConstructionPolicy_ptr
-CORBA_ConstructionPolicy::_nil (void)
-{
-  return (CORBA_ConstructionPolicy_ptr)0;
-}
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_CONSTRUCTIONPOLICY___VAR_CI_)
+#define _CORBA_CONSTRUCTIONPOLICY___VAR_CI_
 
 // *************************************************************
-// Inline operations for class CORBA::ConstructionPolicy_var
+// Inline operations for class CORBA_ConstructionPolicy_var
 // *************************************************************
 
 ACE_INLINE
@@ -210,19 +212,14 @@ CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (void) // default con
   : ptr_ (CORBA_ConstructionPolicy::_nil ())
 {}
 
-ACE_INLINE
-CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (CORBA_ConstructionPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr
+ACE_INLINE ::CORBA_ConstructionPolicy_ptr
 CORBA_ConstructionPolicy_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (const CORBA_ConstructionPolicy_var &p) // copy constructor
+CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (const ::CORBA_ConstructionPolicy_var &p) // copy constructor
   : TAO_Base_var (),
     ptr_ (CORBA_ConstructionPolicy::_duplicate (p.ptr ()))
 {}
@@ -242,72 +239,79 @@ CORBA_ConstructionPolicy_var::operator= (CORBA_ConstructionPolicy_ptr p)
 }
 
 ACE_INLINE CORBA_ConstructionPolicy_var &
-CORBA_ConstructionPolicy_var::operator= (const CORBA_ConstructionPolicy_var &p)
+CORBA_ConstructionPolicy_var::operator= (const ::CORBA_ConstructionPolicy_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_ConstructionPolicy::_duplicate (p.ptr ());
+    this->ptr_ = ::CORBA_ConstructionPolicy::_duplicate (p.ptr ());
   }
   return *this;
 }
 
 ACE_INLINE
-CORBA_ConstructionPolicy_var::operator const CORBA_ConstructionPolicy_ptr &() const // cast
+CORBA_ConstructionPolicy_var::operator const ::CORBA_ConstructionPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA_ConstructionPolicy_var::operator CORBA_ConstructionPolicy_ptr &() // cast
+CORBA_ConstructionPolicy_var::operator ::CORBA_ConstructionPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ConstructionPolicy_ptr
+ACE_INLINE ::CORBA_ConstructionPolicy_ptr
 CORBA_ConstructionPolicy_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ConstructionPolicy_ptr
+ACE_INLINE ::CORBA_ConstructionPolicy_ptr
 CORBA_ConstructionPolicy_var::in (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ConstructionPolicy_ptr &
+ACE_INLINE ::CORBA_ConstructionPolicy_ptr &
 CORBA_ConstructionPolicy_var::inout (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ConstructionPolicy_ptr &
+ACE_INLINE ::CORBA_ConstructionPolicy_ptr &
 CORBA_ConstructionPolicy_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
+  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ConstructionPolicy_ptr
+ACE_INLINE ::CORBA_ConstructionPolicy_ptr
 CORBA_ConstructionPolicy_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  CORBA_ConstructionPolicy_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
+  ::CORBA_ConstructionPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
   return val;
 }
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_CONSTRUCTIONPOLICY___OUT_CI_)
+#define _CORBA_CONSTRUCTIONPOLICY___OUT_CI_
+
 // *************************************************************
-// Inline operations for class CORBA::ConstructionPolicy_out
+// Inline operations for class CORBA_ConstructionPolicy_out
 // *************************************************************
 
 ACE_INLINE
 CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
+  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
 }
 
 ACE_INLINE
@@ -315,25 +319,25 @@ CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPo
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
+  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
 }
 
 ACE_INLINE
-CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (const CORBA_ConstructionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ConstructionPolicy_out&,p).ptr_)
+CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (const ::CORBA_ConstructionPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ConstructionPolicy_out &, p).ptr_)
 {}
 
-ACE_INLINE CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (const CORBA_ConstructionPolicy_out &p)
+ACE_INLINE ::CORBA_ConstructionPolicy_out &
+CORBA_ConstructionPolicy_out::operator= (const ::CORBA_ConstructionPolicy_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_ConstructionPolicy_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (CORBA_ConstructionPolicy_out&, p).ptr_;
   return *this;
 }
 
 ACE_INLINE CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (const CORBA_ConstructionPolicy_var &p)
+CORBA_ConstructionPolicy_out::operator= (const ::CORBA_ConstructionPolicy_var &p)
 {
-  this->ptr_ = CORBA::ConstructionPolicy::_duplicate (p.ptr ());
+  this->ptr_ = ::CORBA_ConstructionPolicy::_duplicate (p.ptr ());
   return *this;
 }
 
@@ -345,28 +349,188 @@ CORBA_ConstructionPolicy_out::operator= (CORBA_ConstructionPolicy_ptr p)
 }
 
 ACE_INLINE
-CORBA_ConstructionPolicy_out::operator CORBA_ConstructionPolicy_ptr &() // cast
+CORBA_ConstructionPolicy_out::operator ::CORBA_ConstructionPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ConstructionPolicy_ptr &
+ACE_INLINE ::CORBA_ConstructionPolicy_ptr &
 CORBA_ConstructionPolicy_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_ConstructionPolicy_ptr
+ACE_INLINE ::CORBA_ConstructionPolicy_ptr
 CORBA_ConstructionPolicy_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
+#endif /* end #if !defined */
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_DOMAINMANAGERLIST_CI_
+
+  ACE_INLINE CORBA_DomainManager **
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (CORBA::ULong nelems)
+  {
+    CORBA_DomainManager **buf = 0;
+
+    ACE_NEW_RETURN (buf, CORBA_DomainManager*[nelems], 0);
+
+    for (CORBA::ULong i = 0; i < nelems; i++)
+      buf[i] = CORBA_DomainManager::_nil ();
+
+    return buf;
+  }
+
+  ACE_INLINE void
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (CORBA_DomainManager **buffer)
+  {
+    if (buffer == 0)
+      return;
+    delete[] buffer;
+  }
+
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void)
+  {
+  }
+
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum)
+    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (maximum))
+  {
+  }
+
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA_DomainManager* *value,
+    CORBA::Boolean release)
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  {
+  }
+
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList(const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs)
+    : TAO_Unbounded_Base_Sequence (rhs)
+  {
+    if (rhs.buffer_ != 0)
+    {
+      CORBA_DomainManager **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_);
+      CORBA_DomainManager ** const tmp2 = ACE_reinterpret_cast (CORBA_DomainManager ** ACE_CAST_CONST, rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        tmp1[i] = CORBA_DomainManager::_duplicate (tmp2[i]);
+
+      this->buffer_ = tmp1;
+    }
+    else
+    {
+      this->buffer_ = 0;
+    }
+  }
+
+  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs)
+  {
+    if (this == &rhs)
+      return *this;
+
+    if (this->release_)
+    {
+      CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager **, this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_DomainManager::_nil ();
+      }
+      if (this->maximum_ < rhs.maximum_)
+      {
+        _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
+        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
+      }
+    }
+    else
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (rhs.maximum_);
+
+    TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+    CORBA_DomainManager **tmp1 = ACE_reinterpret_cast (CORBA_DomainManager **, this->buffer_);
+    CORBA_DomainManager ** const tmp2 = ACE_reinterpret_cast (CORBA_DomainManager ** ACE_CAST_CONST, rhs.buffer_);
+
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+      tmp1[i] = CORBA_DomainManager::_duplicate (tmp2[i]);
+
+    return *this;
+  }
+
+  ACE_INLINE TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::operator[] (CORBA::ULong index) const
+  // read-write accessor
+  {
+    ACE_ASSERT (index < this->maximum_);
+    CORBA_DomainManager ** const tmp = ACE_reinterpret_cast (CORBA_DomainManager ** ACE_CAST_CONST, this->buffer_);
+    return TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> (tmp + index, this->release_);
+  }
+
+  ACE_INLINE CORBA_DomainManager* *
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (CORBA::Boolean orphan)
+  {
+    CORBA_DomainManager **result = 0;
+    if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+      {
+        result = _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::allocbuf (this->maximum_);
+        this->buffer_ = result;
+        this->release_ = 1;
+      }
+      else
+      {
+        result = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
+      }
+    }
+    else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+      {
+        // We set the state back to default and relinquish
+        // ownership.
+        result = ACE_reinterpret_cast(CORBA_DomainManager**,this->buffer_);
+        this->maximum_ = 0;
+        this->length_ = 0;
+        this->buffer_ = 0;
+        this->release_ = 0;
+      }
+    }
+    return result;
+  }
+
+  ACE_INLINE const CORBA_DomainManager* *
+  _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::get_buffer (void) const
+  {
+    return ACE_reinterpret_cast(const CORBA_DomainManager ** ACE_CAST_CONST, this->buffer_);
+  }
+
+
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+#if !defined (_CORBA_DOMAINMANAGERLIST_CI_)
+#define _CORBA_DOMAINMANAGERLIST_CI_
 
 // *************************************************************
-// Inline operations for class CORBA::DomainManagerList_var
+// Inline operations for class CORBA_DomainManagerList_var
 // *************************************************************
 
 ACE_INLINE
@@ -380,10 +544,10 @@ CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (CORBA_DomainManagerLis
 {}
 
 ACE_INLINE
-CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (const CORBA_DomainManagerList_var &p) // copy constructor
+CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (const ::CORBA_DomainManagerList_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, CORBA_DomainManagerList(*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_DomainManagerList (*p.ptr_));
   else
     this->ptr_ = 0;
 }
@@ -403,68 +567,73 @@ CORBA_DomainManagerList_var::operator= (CORBA_DomainManagerList *p)
 }
 
 ACE_INLINE CORBA_DomainManagerList_var &
-CORBA_DomainManagerList_var::operator= (const CORBA_DomainManagerList_var &p) // deep copy
+CORBA_DomainManagerList_var::operator= (const ::CORBA_DomainManagerList_var &p) // deep copy
 {
   if (this != &p)
   {
     delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, 
-                    CORBA_DomainManagerList (*p.ptr_), 
-		    *this);
+    ACE_NEW_RETURN (this->ptr_, ::CORBA_DomainManagerList (*p.ptr_), *this);
   }
   return *this;
 }
 
-ACE_INLINE const CORBA_DomainManagerList *
+ACE_INLINE const ::CORBA_DomainManagerList *
 CORBA_DomainManagerList_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_DomainManagerList *
+ACE_INLINE ::CORBA_DomainManagerList *
 CORBA_DomainManagerList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA_DomainManagerList_var::operator const CORBA_DomainManagerList &() const // cast
+CORBA_DomainManagerList_var::operator const ::CORBA_DomainManagerList &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA_DomainManagerList_var::operator CORBA_DomainManagerList &() // cast
+CORBA_DomainManagerList_var::operator ::CORBA_DomainManagerList &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA_DomainManagerList_var::operator CORBA_DomainManagerList &() const// cast
+CORBA_DomainManagerList_var::operator ::CORBA_DomainManagerList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
-CORBA_DomainManagerList_var::operator[] (CORBA::ULong slot)
+// variable-size types only
+ACE_INLINE
+CORBA_DomainManagerList_var::operator ::CORBA_DomainManagerList *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE TAO_Object_Manager<CORBA_DomainManager, CORBA_DomainManager_var>
+CORBA_DomainManagerList_var::operator[] (CORBA::ULong index)
 {
-  return this->ptr_->operator[] (slot);
+  return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA_DomainManagerList &
+ACE_INLINE const ::CORBA_DomainManagerList &
 CORBA_DomainManagerList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA_DomainManagerList &
+ACE_INLINE ::CORBA_DomainManagerList &
 CORBA_DomainManagerList_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size
-ACE_INLINE CORBA_DomainManagerList *&
+ACE_INLINE ::CORBA_DomainManagerList *&
 CORBA_DomainManagerList_var::out (void)
 {
   delete this->ptr_;
@@ -472,22 +641,22 @@ CORBA_DomainManagerList_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_DomainManagerList *
+ACE_INLINE ::CORBA_DomainManagerList *
 CORBA_DomainManagerList_var::_retn (void)
 {
-  CORBA_DomainManagerList *tmp = this->ptr_;
+  ::CORBA_DomainManagerList *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE CORBA_DomainManagerList *
-CORBA::DomainManagerList_var::ptr (void) const
+ACE_INLINE ::CORBA_DomainManagerList *
+CORBA_DomainManagerList_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA::DomainManagerList_out
+// Inline operations for class CORBA_DomainManagerList_out
 // *************************************************************
 
 ACE_INLINE
@@ -506,18 +675,18 @@ CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (CORBA_DomainManagerLis
 }
 
 ACE_INLINE
-CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (const CORBA_DomainManagerList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DomainManagerList_out&,p).ptr_)
+CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (const ::CORBA_DomainManagerList_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_DomainManagerList_out&, p).ptr_)
 {}
 
-ACE_INLINE CORBA_DomainManagerList_out &
-CORBA_DomainManagerList_out::operator= (const CORBA_DomainManagerList_out &p)
+ACE_INLINE ::CORBA_DomainManagerList_out &
+CORBA_DomainManagerList_out::operator= (const ::CORBA_DomainManagerList_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_DomainManagerList_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (CORBA_DomainManagerList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_DomainManagerList_out &
+ACE_INLINE ::CORBA_DomainManagerList_out &
 CORBA_DomainManagerList_out::operator= (CORBA_DomainManagerList *p)
 {
   this->ptr_ = p;
@@ -525,29 +694,42 @@ CORBA_DomainManagerList_out::operator= (CORBA_DomainManagerList *p)
 }
 
 ACE_INLINE
-CORBA_DomainManagerList_out::operator CORBA_DomainManagerList *&() // cast
+CORBA_DomainManagerList_out::operator ::CORBA_DomainManagerList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_DomainManagerList *&
+ACE_INLINE ::CORBA_DomainManagerList *&
 CORBA_DomainManagerList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_DomainManagerList *
+ACE_INLINE ::CORBA_DomainManagerList *
 CORBA_DomainManagerList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>
-CORBA_DomainManagerList_out::operator[] (CORBA::ULong slot)
+ACE_INLINE TAO_Object_Manager<CORBA_DomainManager, CORBA_DomainManager_var>
+CORBA_DomainManagerList_out::operator[] (CORBA::ULong index)
 {
-  return this->ptr_->operator[] (slot);
+  return this->ptr_->operator[] (index);
 }
 
+
+#endif /* end #if !defined */
+
+ACE_INLINE CORBA::Boolean
+operator<< (
+    TAO_OutputCDR &,
+    const IR_InterfaceDef*
+  );
+ACE_INLINE CORBA::Boolean
+operator>> (
+    TAO_InputCDR &,
+    IR_InterfaceDef* &
+  );
 ACE_INLINE CORBA::Boolean
 operator<< (
     TAO_OutputCDR &,
@@ -597,8 +779,6 @@ operator>> (
   return 0;
 }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
 ACE_INLINE CORBA::Boolean
 operator<< (
     TAO_OutputCDR &,
@@ -607,7 +787,7 @@ operator<< (
 ACE_INLINE CORBA::Boolean
 operator>> (
     TAO_InputCDR &,
-    CORBA::ConstructionPolicy_ptr &
+    CORBA_ConstructionPolicy_ptr &
   );
 
 ACE_INLINE CORBA::Boolean
@@ -648,36 +828,17 @@ operator>> (
   return 0;
 }
 
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
 
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_DomainManagerList &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
+#if !defined _TAO_CDR_OP_CORBA_DomainManagerList_I_
+#define _TAO_CDR_OP_CORBA_DomainManagerList_I_
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_DomainManagerList &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
+CORBA::Boolean TAO_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA_DomainManagerList &
+  );
+CORBA::Boolean TAO_Export operator>> (
+    TAO_InputCDR &,
+    CORBA_DomainManagerList &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_DomainManagerList_I_ */
diff --git a/TAO/tao/DomainS.cpp b/TAO/tao/DomainS.cpp
deleted file mode 100644
index b8699c63f0b..00000000000
--- a/TAO/tao/DomainS.cpp
+++ /dev/null
@@ -1,526 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DomainC.h"
-#include "tao/Operation_Table.h"
-#include "tao/Server_Request.h"
-#include "tao/POA_CORBA.h"
-#include "tao/ORB.h"
-#include "tao/Typecode.h"
-
-class TAO_CORBA_DomainManager_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 20:54:02 */
-/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 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)
-{
-  static const unsigned char asso_values[] =
-    {
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18,  0, 18,  0, 18, 18,
-     18, 18, 18,  0, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18,  0, 18, 18, 18,
-     18,  0, 18, 18, 18, 18, 18, 18,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 3,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 17,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 17,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_is_a",  &POA_CORBA::DomainManager::_is_a_skel},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_non_existent",  &POA_CORBA::DomainManager::_non_existent_skel},
-      {"",0}, {"",0}, {"",0},
-      {"get_domain_policy",     &POA_CORBA::DomainManager::get_domain_policy_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 20:54:02 */
-static TAO_CORBA_DomainManager_Perfect_Hash_OpTable tao_CORBA_DomainManager_optable;
-
-// skeleton constructor
-POA_CORBA::DomainManager::DomainManager (void)
-{
-  this->optable_ = &tao_CORBA_DomainManager_optable;
-}
-
-// copy ctor
-POA_CORBA::DomainManager::DomainManager (const DomainManager& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-
-// skeleton destructor
-POA_CORBA::DomainManager::~DomainManager (void)
-{
-}
-
-void POA_CORBA::DomainManager::get_domain_policy_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *)_tao_object_reference;
-  CORBA::Policy_var _tao_retval;
-  CORBA::PolicyType policy_type;
-  if (!(
-    (_tao_in >> policy_type)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_retval = _tao_impl->get_domain_policy (
-    policy_type,
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::DomainManager::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = 0;
-  CORBA::String_var value;
-  if (!((_tao_in >> value.out ())))
-    ACE_THROW (CORBA::MARSHAL ());
-
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-void POA_CORBA::DomainManager::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-CORBA::Boolean POA_CORBA::DomainManager::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::DomainManager::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/DomainManager:1.0") == 0)
-    return ACE_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 0;
-}
-
-void POA_CORBA::DomainManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::DomainManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DomainManager:1.0";
-}
-
-
-CORBA::DomainManager*
-POA_CORBA::DomainManager::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::DomainManager *retval = CORBA_DomainManager::_nil ();
-
-  ACE_NEW_RETURN (retval,
-                  POA_CORBA::_tao_collocated_DomainManager (this,
-                                                            stub),
-                  CORBA_DomainManager::_nil ());
-
-  return retval;
-}
-
-POA_CORBA::_tao_collocated_DomainManager::_tao_collocated_DomainManager (
-    POA_CORBA::DomainManager_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (DomainManager) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DomainManager_ptr POA_CORBA::_tao_collocated_DomainManager::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Policy_ptr POA_CORBA::_tao_collocated_DomainManager::get_domain_policy  (
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->get_domain_policy (
-    policy_type,
-    ACE_TRY_ENV
-  );
-}
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-class TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-public:
- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-/* starting time is 20:54:02 */
-/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 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)
-{
-  static const unsigned char asso_values[] =
-    {
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20,  0, 20,  0, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20,  0,
-     20, 20, 20, 20,  0, 20,  0, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 3,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 19,
-      HASH_VALUE_RANGE = 15,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_is_a",  &POA_CORBA::ConstructionPolicy::_is_a_skel},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"_non_existent",  &POA_CORBA::ConstructionPolicy::_non_existent_skel},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"make_domain_manager",   &POA_CORBA::ConstructionPolicy::make_domain_manager_skel},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-/* ending time is 20:54:02 */
-static TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable tao_CORBA_ConstructionPolicy_optable;
-
-// skeleton constructor
-POA_CORBA::ConstructionPolicy::ConstructionPolicy (void)
-{
-  this->optable_ = &tao_CORBA_ConstructionPolicy_optable;
-}
-
-// copy ctor
-POA_CORBA::ConstructionPolicy::ConstructionPolicy (const ConstructionPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-// skeleton destructor
-POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void)
-{
-}
-
-void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  // @@ TODO this method will require some modifications once the
-  // interface repository is implemented. The modifications are
-  // documented with @@ comments. Right now we raise a
-  // MARSHAL exception....
-
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *)_tao_object_reference;
-
-#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
-  IR::InterfaceDef_var object_type;
-
-  CORBA::Boolean constr_policy;
-  if (!(
-    (_tao_in >> object_type.out ()) &&
-    (_tao_in >> CORBA::Any::to_boolean (constr_policy))
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_impl->make_domain_manager (
-    object_type.in (),
-    constr_policy,
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-#else /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
-  ACE_UNUSED_ARG (_tao_in);
-  ACE_UNUSED_ARG (_tao_impl);
-  ACE_THROW (CORBA::MARSHAL ());
-#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
-}
-
-void POA_CORBA::ConstructionPolicy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = 0;
-  CORBA::String_var value;
-  if (!((_tao_in >> value.out ())))
-    ACE_THROW (CORBA::MARSHAL ());
-
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-void POA_CORBA::ConstructionPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::ConstructionPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstructionPolicy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ConstructionPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::ConstructionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
-}
-
-
-CORBA::ConstructionPolicy*
-POA_CORBA::ConstructionPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::ConstructionPolicy *retval =
-    CORBA_ConstructionPolicy::_nil ();
-
-  ACE_NEW_RETURN (retval,
-                  POA_CORBA::_tao_collocated_ConstructionPolicy (this,
-                                                                 stub),
-                  CORBA_ConstructionPolicy::_nil ());
-
-  return retval;
-}
-
-POA_CORBA::_tao_collocated_ConstructionPolicy::_tao_collocated_ConstructionPolicy (
-    POA_CORBA::ConstructionPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (ConstructionPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_thru_poa_collocated_CORBA_Policy) (stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::ConstructionPolicy_ptr POA_CORBA::_tao_collocated_ConstructionPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-void POA_CORBA::_tao_collocated_ConstructionPolicy::make_domain_manager  (
-    IR_InterfaceDef *object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->make_domain_manager (
-    object_type,
-    constr_policy,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_ConstructionPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index c2a7d9f7a96..618d61207ef 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -59,7 +59,7 @@ TAO_Requires_DynamicAny_Initializer = &TAO_DynamicAny_Loader::Initializer;
 static int
 TAO_Requires_DynamicAny_Initializer = TAO_DynamicAny_Loader::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */ 
+#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
 
 #define TAO_DYNAMICANY_SAFE_INCLUDE
 #include "DynamicAnyC.h"
diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile
index 0892ffff1c2..e5153ec18d4 100644
--- a/TAO/tao/DynamicAny/Makefile
+++ b/TAO/tao/DynamicAny/Makefile
@@ -61,7 +61,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/DynamicAny.o .obj/DynamicAny.o .obj/DynamicAny.o .obj/DynamicAny.o: DynamicAny.cpp DynamicAny.h \
+.obj/DynamicAny.o .obj/DynamicAny.so .shobj/DynamicAny.o .shobj/DynamicAny.so: DynamicAny.cpp DynamicAny.h \
  $(ACE_ROOT)/ace/pre.h \
  dynamicany_export.h \
  $(ACE_ROOT)/ace/post.h \
@@ -89,19 +89,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -221,7 +215,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -237,7 +230,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -252,40 +244,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -298,6 +256,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -323,9 +283,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -334,12 +291,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
@@ -354,6 +316,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -364,24 +328,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
  DynamicAnyC.i DynAnyFactory.h
 
-.obj/DynAnyFactory.o .obj/DynAnyFactory.o .obj/DynAnyFactory.o .obj/DynAnyFactory.o: DynAnyFactory.cpp DynAnyFactory.h \
+.obj/DynAnyFactory.o .obj/DynAnyFactory.so .shobj/DynAnyFactory.o .shobj/DynAnyFactory.so: DynAnyFactory.cpp DynAnyFactory.h \
  $(ACE_ROOT)/ace/pre.h \
  DynamicAny.h dynamicany_export.h \
  $(ACE_ROOT)/ace/post.h \
@@ -409,19 +366,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -541,7 +492,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -557,7 +507,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -572,40 +521,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -618,6 +533,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -643,9 +560,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -654,12 +568,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
@@ -674,6 +593,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -684,28 +605,21 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
  DynamicAnyC.i DynAny_i.h DynStruct_i.h DynSequence_i.h DynEnum_i.h \
  DynArray_i.h DynUnion_i.h DynUnion_i_T.h DynUnion_i_T.cpp \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/DynAny_i.o .obj/DynAny_i.o .obj/DynAny_i.o .obj/DynAny_i.o: DynAny_i.cpp DynAny_i.h \
+.obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp DynAny_i.h \
  $(ACE_ROOT)/ace/pre.h \
  DynamicAny.h dynamicany_export.h \
  $(ACE_ROOT)/ace/post.h \
@@ -733,19 +647,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -865,7 +773,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -881,7 +788,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -896,40 +802,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -942,6 +814,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -967,9 +841,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -978,12 +849,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
@@ -998,6 +874,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -1008,24 +886,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
  DynamicAnyC.i DynAnyFactory.h
 
-.obj/DynStruct_i.o .obj/DynStruct_i.o .obj/DynStruct_i.o .obj/DynStruct_i.o: DynStruct_i.cpp DynStruct_i.h \
+.obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp DynStruct_i.h \
  $(ACE_ROOT)/ace/pre.h \
  DynamicAny.h dynamicany_export.h \
  $(ACE_ROOT)/ace/post.h \
@@ -1053,19 +924,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -1185,7 +1050,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -1201,7 +1065,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -1216,40 +1079,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1262,6 +1091,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -1287,9 +1118,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -1298,12 +1126,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
@@ -1318,6 +1151,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -1328,26 +1163,19 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
  DynamicAnyC.i DynAnyFactory.h \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i
 
-.obj/DynSequence_i.o .obj/DynSequence_i.o .obj/DynSequence_i.o .obj/DynSequence_i.o: DynSequence_i.cpp DynSequence_i.h \
+.obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp DynSequence_i.h \
  $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1370,16 +1198,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  DynamicAny.h dynamicany_export.h \
  $(TAO_ROOT)/tao/Object_Loader.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -1389,6 +1207,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -1507,7 +1329,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -1523,7 +1344,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -1538,40 +1358,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1584,6 +1370,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -1609,9 +1397,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -1620,12 +1405,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
@@ -1640,6 +1430,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -1650,26 +1442,19 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
  DynamicAnyC.i DynAnyFactory.h \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i
 
-.obj/DynEnum_i.o .obj/DynEnum_i.o .obj/DynEnum_i.o .obj/DynEnum_i.o: DynEnum_i.cpp DynEnum_i.h \
+.obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp DynEnum_i.h \
  $(ACE_ROOT)/ace/pre.h \
  DynamicAny.h dynamicany_export.h \
  $(ACE_ROOT)/ace/post.h \
@@ -1697,19 +1482,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -1829,7 +1608,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -1845,7 +1623,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -1860,40 +1637,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -1906,6 +1649,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -1931,9 +1676,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -1942,12 +1684,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
@@ -1962,6 +1709,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -1972,24 +1721,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
  DynamicAnyC.i DynAnyFactory.h
 
-.obj/DynArray_i.o .obj/DynArray_i.o .obj/DynArray_i.o .obj/DynArray_i.o: DynArray_i.cpp DynArray_i.h \
+.obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp DynArray_i.h \
  $(ACE_ROOT)/ace/pre.h \
  DynamicAny.h dynamicany_export.h \
  $(ACE_ROOT)/ace/post.h \
@@ -2017,19 +1759,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -2149,7 +1885,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -2165,7 +1900,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -2180,40 +1914,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2226,6 +1926,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -2251,9 +1953,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -2262,12 +1961,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
@@ -2282,6 +1986,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -2292,26 +1998,19 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
  DynamicAnyC.i DynAnyFactory.h \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i
 
-.obj/DynUnion_i.o .obj/DynUnion_i.o .obj/DynUnion_i.o .obj/DynUnion_i.o: DynUnion_i.cpp DynUnion_i.h \
+.obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp DynUnion_i.h \
  $(ACE_ROOT)/ace/pre.h \
  DynamicAny.h dynamicany_export.h \
  $(ACE_ROOT)/ace/post.h \
@@ -2339,19 +2038,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -2471,7 +2164,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -2487,7 +2179,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -2502,40 +2193,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2548,6 +2205,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -2573,9 +2232,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -2584,12 +2240,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
@@ -2604,6 +2265,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -2614,26 +2277,19 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
  DynamicAnyC.i DynUnion_i_T.h DynUnion_i_T.cpp DynAnyFactory.h \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i
 
-.obj/DynamicAnyC.o .obj/DynamicAnyC.o .obj/DynamicAnyC.o .obj/DynamicAnyC.o: DynamicAnyC.cpp DynamicAny.h \
+.obj/DynamicAnyC.o .obj/DynamicAnyC.so .shobj/DynamicAnyC.o .shobj/DynamicAnyC.so: DynamicAnyC.cpp DynamicAny.h \
  $(ACE_ROOT)/ace/pre.h \
  dynamicany_export.h \
  $(ACE_ROOT)/ace/post.h \
@@ -2661,19 +2317,13 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -2793,7 +2443,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -2809,7 +2458,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -2824,40 +2472,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -2870,6 +2484,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -2895,9 +2511,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -2906,12 +2519,17 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
@@ -2926,6 +2544,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -2936,21 +2556,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/InterfaceC.h \
  $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- $(TAO_ROOT)/tao/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
  DynamicAnyC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 56bddfe5191..bab1e63163a 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -911,7 +911,7 @@ TAO_Exceptions::fini (void)
 {
   delete TAO_Exceptions::system_exceptions;
   TAO_Exceptions::system_exceptions = 0;
-  
+
 #define TAO_SYSTEM_EXCEPTION(name) \
   CORBA::release (CORBA::_tc_ ## name); \
   CORBA::_tc_ ## name = 0;
diff --git a/TAO/tao/FT_CORBAC.h b/TAO/tao/FT_CORBAC.h
index 0c2be468ee0..0cdd802f0e9 100644
--- a/TAO/tao/FT_CORBAC.h
+++ b/TAO/tao/FT_CORBAC.h
@@ -362,7 +362,6 @@ public:
 protected:
   FT_RequestDurationPolicy (void);
   FT_RequestDurationPolicy (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~FT_RequestDurationPolicy (void);
@@ -557,7 +556,6 @@ public:
 protected:
   FT_HeartbeatPolicy (void);
   FT_HeartbeatPolicy (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~FT_HeartbeatPolicy (void);
@@ -661,7 +659,6 @@ public:
 protected:
   FT_HeartbeatEnabledPolicy (void);
   FT_HeartbeatEnabledPolicy (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
     virtual ~FT_HeartbeatEnabledPolicy (void);
diff --git a/TAO/tao/FT_CORBAC.i b/TAO/tao/FT_CORBAC.i
index 921500071fa..4578315bf03 100644
--- a/TAO/tao/FT_CORBAC.i
+++ b/TAO/tao/FT_CORBAC.i
@@ -618,8 +618,8 @@ FT_FTRequestServiceContext_out::operator-> (void)
 
 
 ACE_INLINE
-FT_RequestDurationPolicy::FT_RequestDurationPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+FT_RequestDurationPolicy::FT_RequestDurationPolicy (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 
@@ -1038,8 +1038,8 @@ FT_HeartbeatPolicyValue_var::ptr (void) const
 
 
 ACE_INLINE
-FT_HeartbeatPolicy::FT_HeartbeatPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+FT_HeartbeatPolicy::FT_HeartbeatPolicy (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 
@@ -1202,8 +1202,8 @@ FT_HeartbeatPolicy_out::operator-> (void)
 
 
 ACE_INLINE
-FT_HeartbeatEnabledPolicy::FT_HeartbeatEnabledPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+FT_HeartbeatEnabledPolicy::FT_HeartbeatEnabledPolicy (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 
diff --git a/TAO/tao/GIOP_Message_Acceptors.cpp b/TAO/tao/GIOP_Message_Acceptors.cpp
index c5194879db8..48386fa9f98 100644
--- a/TAO/tao/GIOP_Message_Acceptors.cpp
+++ b/TAO/tao/GIOP_Message_Acceptors.cpp
@@ -2,7 +2,6 @@
 //$Id$
 
 #include "tao/GIOP_Message_Acceptors.h"
-#include "tao/POA.h"
 #include "tao/debug.h"
 #include "tao/GIOP_Utils.h"
 #include "tao/GIOP_Server_Request.h"
@@ -106,63 +105,51 @@ TAO_GIOP_Message_Acceptors::
 
       response_required = request.response_expected ();
 
-      this->find_ior_in_table (request.object_key (),
-                               orb_core,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var forward_to;
 
       // Do this before the reply is sent.
-      orb_core->object_adapter ()->dispatch_servant (
-                                                     request.object_key (),
-                                                     request,
-                                                     0,
-                                                     ACE_TRY_ENV
-                                                     );
+      orb_core->adapter_registry ()->dispatch (request.object_key (),
+                                               request,
+                                               0,
+                                               forward_to,
+                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
-    }
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
-    {
-      TAO_Pluggable_Reply_Params reply_params;
-      reply_params.request_id_ = request_id;
-      reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
-      reply_params.svc_ctx_.length (0);
-      // Sending back the same service context list we received in the
-      // Request.  (Important for RT CORBA).
-      reply_params.service_context_notowned (&request.service_info ());
-      reply_params.params_ = 0;
-
-      // Make the GIOP header and Reply header
-      this->write_reply_header (*this->output_,
-                                reply_params);
-
-      CORBA::Object_ptr object_ptr =
-        forward_request.forward_reference.in();
-
-      *this->output_ << object_ptr;
-
-      int result = this->send_message (transport,
-                                       *this->output_);
-
-      if (result == -1)
-      {
-         if (TAO_debug_level > 0)
-         {
-            // No exception but some kind of error, yet a response
-            // is required.
-            ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: cannot send reply\n"),
-                          ACE_TEXT ("TAO_GIOP::process_server_message")));
-         }
-      }
-      return result;
 
+      if (!CORBA::is_nil (forward_to.in ()))
+        {
+          // We should forward to another object...
+          TAO_Pluggable_Reply_Params reply_params;
+          reply_params.request_id_ = request_id;
+          reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
+          reply_params.svc_ctx_.length (0);
+          // Sending back the same service context list we received in the
+          // Request.  (Important for RT CORBA).
+          reply_params.service_context_notowned (&request.service_info ());
+          reply_params.params_ = 0;
+          // Make the GIOP header and Reply header
+          this->write_reply_header (*this->output_,
+                                    reply_params);
+
+          *this->output_ << forward_to.in ();
+
+          int result = this->send_message (transport,
+                                           *this->output_);
+          if (result == -1)
+            {
+              if (TAO_debug_level > 0)
+                {
+                  // No exception but some kind of error, yet a
+                  // response is required.
+                  ACE_ERROR ((LM_ERROR,
+                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: cannot send reply\n"),
+                              ACE_TEXT ("TAO_GIOP::process_server_message")));
+                }
+            }
+          return result;
+        }
     }
-#else
-  ACE_UNUSED_ARG (request_id);
-#endif /* TAO_HAS_MINIMUM_CORBA */
   // Only CORBA exceptions are caught here.
-   ACE_CATCHANY
+  ACE_CATCHANY
     {
       int result = 0;
       if (response_required)
@@ -249,9 +236,7 @@ TAO_GIOP_Message_Acceptors::
 #endif /* TAO_HAS_EXCEPTIONS */
   ACE_ENDTRY;
 
-  int result = 0;
-
-  return result;
+  return 0;
 }
 
 int
@@ -281,11 +266,6 @@ TAO_GIOP_Message_Acceptors::
         ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                        CORBA::COMPLETED_NO));
 
-      this->find_ior_in_table (locate_request.object_key (),
-                               orb_core,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       // Execute a fake request to find out if the object is there or
       // if the POA can activate it on demand...
       char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
@@ -319,14 +299,23 @@ TAO_GIOP_Message_Acceptors::
         ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                        CORBA::COMPLETED_NO));
 
-      orb_core->object_adapter ()->dispatch_servant
-        (server_request.object_key (),
-         server_request,
-         0,
-         ACE_TRY_ENV);
+      CORBA::Object_var forward_to;
+
+      orb_core->adapter_registry ()->dispatch (server_request.object_key (),
+                                               server_request,
+                                               0,
+                                               forward_to,
+                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
+      if (!CORBA::is_nil (forward_to.in ()))
+        {
+          status_info.status = TAO_GIOP_OBJECT_FORWARD;
+          status_info.forward_location_var = forward_to;
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("handle_locate has been called: forwarding\n")));
+        }
+      else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
         {
           // We got no exception, so the object is here.
           status_info.status = TAO_GIOP_OBJECT_HERE;
@@ -334,7 +323,7 @@ TAO_GIOP_Message_Acceptors::
             ACE_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("TAO: (%P|%t) handle_locate() : found\n")));
         }
-      else if (server_request.exception_type () != TAO_GIOP_NO_EXCEPTION)
+      else
         {
           status_info.forward_location_var = server_request.forward_location ();
           if (!CORBA::is_nil (status_info.forward_location_var.in ()))
@@ -351,18 +340,9 @@ TAO_GIOP_Message_Acceptors::
                           ACE_TEXT ("handle_locate has been called: not here\n")));
             }
         }
-    }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
-    {
-      status_info.status = TAO_GIOP_OBJECT_FORWARD;
-      status_info.forward_location_var =
-        forward_request.forward_reference;
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("handle_locate has been called: forwarding\n")));
     }
-#endif /* TAO_HAS_MINIMUM_CORBA */
+
   ACE_CATCHANY
     {
       // Normal exception, so the object is not here
@@ -390,68 +370,6 @@ TAO_GIOP_Message_Acceptors::
                                        status_info);
 }
 
-void
-TAO_GIOP_Message_Acceptors::
-  find_ior_in_table (TAO_ObjectKey &object_key,
-                     TAO_ORB_Core *orb_core,
-                     CORBA::Environment &ACE_TRY_ENV)
-{
-#if (TAO_NO_IOR_TABLE == 0)
-  const CORBA::Octet *key =
-    object_key.get_buffer ();
-
-  if (ACE_OS::memcmp (key,
-                      &TAO_POA::objectkey_prefix[0],
-                      TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
-    {
-      ACE_CString object_id (ACE_reinterpret_cast (const char *,
-                                                   key),
-                             object_key.length (),
-                             0,
-                             0);
-      // @@ This debugging output should *NOT* be used since the
-      //    object key string is not null terminated, nor can it
-      //    be null terminated without copying.  No copying should
-      //    be done since performance is somewhat important here.
-      //    So, just remove the debugging output entirely.
-      //
-      //           if (TAO_debug_level > 0)
-      //             ACE_DEBUG ((LM_DEBUG,
-      //                         "Simple Object key %s. "
-      //                         "Doing the Table Lookup ...\n",
-      //                         object_id.c_str ()));
-
-      //CORBA::Object_ptr object_reference =
-      CORBA::Object_var object_reference =
-        CORBA::Object::_nil ();
-
-      // Do the Table Lookup.
-      int status =
-        orb_core->orb ()->_tao_find_in_IOR_table (object_id,
-                                                  object_reference.out ());
-
-      // If ObjectID not in table or reference is nil raise
-      // OBJECT_NOT_EXIST.
-
-      if (status == -1 || CORBA::is_nil (object_reference.in ()))
-        ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-
-      // ObjectID present in the table with an associated NON-NULL
-      // reference.  Throw a forward request exception.
-
-      /*CORBA::Object_ptr dup =
-        CORBA::Object::_duplicate (object_reference);*/
-
-      // @@ We could simply write the response at this point...
-      ACE_THROW (PortableServer::ForwardRequest (object_reference.in ()));
-    }
-#else
-  ACE_UNUSED_ARG (object_key);
-  ACE_UNUSED_ARG (orb_core);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-#endif /* TAO_NO_IOR_TABLE */
-}
-
 int
 TAO_GIOP_Message_Acceptors::
   send_reply_exception (TAO_Transport *transport,
diff --git a/TAO/tao/GIOP_Message_Acceptors.h b/TAO/tao/GIOP_Message_Acceptors.h
index 5c0d6e825ba..d579f91966b 100644
--- a/TAO/tao/GIOP_Message_Acceptors.h
+++ b/TAO/tao/GIOP_Message_Acceptors.h
@@ -97,11 +97,6 @@ private:
   // <request_id> and <response_required> are set as part of the
   // message processing.
 
-  void find_ior_in_table (TAO_ObjectKey &object_key,
-                          TAO_ORB_Core *orb_core,
-                          CORBA::Environment &ACE_TRY_ENV);
-  // Check for the Object id in the IOR table if TAO_NO_IOR_TABLE == 0
-
   CORBA::Octet major_version (void);
   CORBA::Octet minor_version (void);
 
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 3f527391add..4c284063bde 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -4,7 +4,6 @@
 #include "tao/debug.h"
 #include "tao/TAOC.h"
 #include "tao/ORB_Core.h"
-#include "tao/POA.h"
 #include "tao/GIOP_Utils.h"
 #include "tao/operation_details.h"
 #include "tao/GIOP_Server_Request.h"
@@ -588,61 +587,51 @@ TAO_GIOP_Message_Lite::
 
       response_required = request.response_expected ();
 
-      this->find_ior_in_table (request.object_key (),
-                               orb_core,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var forward_to;
 
       // Do this before the reply is sent.
-      orb_core->object_adapter ()->dispatch_servant (
-                                                     request.object_key (),
-                                                     request,
-                                                     0,
-                                                     ACE_TRY_ENV
-                                                     );
+      orb_core->adapter_registry ()->dispatch (request.object_key (),
+                                               request,
+                                               0,
+                                               forward_to,
+                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
-    }
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
-    {
-      TAO_Pluggable_Reply_Params reply_params;
-      reply_params.request_id_ = request_id;
-      reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
-      reply_params.svc_ctx_.length (0);
-      // Sending back the same service context list we received in the
-      // Request.  (Important for RT CORBA).
-      reply_params.service_context_notowned (&request.service_info ());
-      reply_params.params_ = 0;
-      // Make the GIOP header and Reply header
-      this->write_reply_header (*this->output_,
-                                reply_params);
 
-      CORBA::Object_ptr object_ptr =
-        forward_request.forward_reference.in();
-
-      *this->output_ << object_ptr;
-
-      int result = this->send_message (transport,
-                                   *this->output_);
-
-      if (result == -1)
+      if (!CORBA::is_nil (forward_to.in ()))
         {
-          if (TAO_debug_level > 0)
+          // We should forward to another object...
+          TAO_Pluggable_Reply_Params reply_params;
+          reply_params.request_id_ = request_id;
+          reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
+          reply_params.svc_ctx_.length (0);
+          // Sending back the same service context list we received in the
+          // Request.  (Important for RT CORBA).
+          reply_params.service_context_notowned (&request.service_info ());
+          reply_params.params_ = 0;
+          // Make the GIOP header and Reply header
+          this->write_reply_header (*this->output_,
+                                    reply_params);
+
+          *this->output_ << forward_to.in ();
+
+          int result = this->send_message (transport,
+                                           *this->output_);
+          if (result == -1)
             {
-              // No exception but some kind of error, yet a response
-              // is required.
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: cannot send reply\n"),
-                          ACE_TEXT ("TAO_GIOP::process_server_message")));
+              if (TAO_debug_level > 0)
+                {
+                  // No exception but some kind of error, yet a
+                  // response is required.
+                  ACE_ERROR ((LM_ERROR,
+                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: cannot send reply\n"),
+                              ACE_TEXT ("TAO_GIOP::process_server_message")));
+                }
             }
+          return result;
         }
-      return result;
     }
-#else
-  ACE_UNUSED_ARG (request_id);
-#endif /* TAO_HAS_MINIMUM_CORBA */
   // Only CORBA exceptions are caught here.
-   ACE_CATCHANY
+  ACE_CATCHANY
     {
       int result = 0;
       if (response_required)
@@ -729,10 +718,7 @@ TAO_GIOP_Message_Lite::
 #endif /* TAO_HAS_EXCEPTIONS */
   ACE_ENDTRY;
 
-  int result = 0;
-
-  return result;
-
+  return 0;
 }
 
 int
@@ -762,11 +748,6 @@ TAO_GIOP_Message_Lite::
         ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                        CORBA::COMPLETED_NO));
 
-      this->find_ior_in_table (locate_request.object_key (),
-                               orb_core,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       // Execute a fake request to find out if the object is there or
       // if the POA can activate it on demand...
       char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
@@ -800,15 +781,24 @@ TAO_GIOP_Message_Lite::
         ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                        CORBA::COMPLETED_NO));
 
-      orb_core->object_adapter ()->dispatch_servant
-        (server_request.object_key (),
-         server_request,
-         0,
-         ACE_TRY_ENV);
+      CORBA::Object_var forward_to;
 
+      orb_core->adapter_registry ()->dispatch (server_request.object_key (),
+                                               server_request,
+                                               0,
+                                               forward_to,
+                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
+
+      if (!CORBA::is_nil (forward_to.in ()))
+        {
+          status_info.status = TAO_GIOP_OBJECT_FORWARD;
+          status_info.forward_location_var = forward_to;
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("handle_locate has been called: forwarding\n")));
+        }
+      else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
         {
           // We got no exception, so the object is here.
           status_info.status = TAO_GIOP_OBJECT_HERE;
@@ -816,7 +806,7 @@ TAO_GIOP_Message_Lite::
             ACE_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("TAO: (%P|%t) handle_locate() : found\n")));
         }
-      else if (server_request.exception_type () != TAO_GIOP_NO_EXCEPTION)
+      else
         {
           status_info.forward_location_var = server_request.forward_location ();
           if (!CORBA::is_nil (status_info.forward_location_var.in ()))
@@ -836,16 +826,6 @@ TAO_GIOP_Message_Lite::
 
     }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
-    {
-      status_info.status = TAO_GIOP_OBJECT_FORWARD;
-      status_info.forward_location_var =
-        forward_request.forward_reference;
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("handle_locate has been called: forwarding\n")));
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
   ACE_CATCHANY
     {
       // Normal exception, so the object is not here
@@ -875,70 +855,6 @@ TAO_GIOP_Message_Lite::
                                   status_info);
 }
 
-
-void
-TAO_GIOP_Message_Lite::
-  find_ior_in_table (TAO_ObjectKey &object_key,
-                     TAO_ORB_Core *orb_core,
-                     CORBA::Environment &ACE_TRY_ENV)
-{
-#if (TAO_NO_IOR_TABLE == 0)
-  const CORBA::Octet *key =
-    object_key.get_buffer ();
-
-  if (ACE_OS::memcmp (key,
-                      &TAO_POA::objectkey_prefix[0],
-                      TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
-    {
-      ACE_CString object_id (ACE_reinterpret_cast (const char *,
-                                                   key),
-                             object_key.length (),
-                             0,
-                             0);
-      // @@ This debugging output should *NOT* be used since the
-      //    object key string is not null terminated, nor can it
-      //    be null terminated without copying.  No copying should
-      //    be done since performance is somewhat important here.
-      //    So, just remove the debugging output entirely.
-      //
-      //           if (TAO_debug_level > 0)
-      //             ACE_DEBUG ((LM_DEBUG,
-      //                         "Simple Object key %s. "
-      //                         "Doing the Table Lookup ...\n",
-      //                         object_id.c_str ()));
-
-      //CORBA::Object_ptr object_reference =
-      CORBA::Object_var object_reference =
-        CORBA::Object::_nil ();
-
-      // Do the Table Lookup.
-      int status =
-        orb_core->orb ()->_tao_find_in_IOR_table (object_id,
-                                                  object_reference.out ());
-
-      // If ObjectID not in table or reference is nil raise
-      // OBJECT_NOT_EXIST.
-
-      if (status == -1 || CORBA::is_nil (object_reference.in ()))
-        ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-
-      // ObjectID present in the table with an associated NON-NULL
-      // reference.  Throw a forward request exception.
-
-      /*CORBA::Object_ptr dup =
-        CORBA::Object::_duplicate (object_reference);*/
-
-      // @@ We could simply write the response at this point...
-      ACE_THROW (PortableServer::ForwardRequest (object_reference.in ()));
-    }
-#else
-  ACE_UNUSED_ARG (object_key);
-  ACE_UNUSED_ARG (orb_core);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-#endif /* TAO_NO_IOR_TABLE */
-}
-
-
 int
 TAO_GIOP_Message_Lite::
   parse_request_header (TAO_GIOP_ServerRequest &request)
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index c92e9606009..1b8ca86c180 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -139,12 +139,7 @@ private:
   // <request_id> and <response_required> are set as part of the
   // message processing.
 
-  void find_ior_in_table (TAO_ObjectKey &object_key,
-                          TAO_ORB_Core *orb_core,
-                          CORBA::Environment &ACE_TRY_ENV);
-  // Find the IOR in table
-
-    int parse_request_header (TAO_GIOP_ServerRequest &request);
+  int parse_request_header (TAO_GIOP_ServerRequest &request);
   // Parse the Request Message header
 
   int parse_locate_header (TAO_GIOP_Locate_Request_Header &request);
diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp
index f020aaf56c8..87913d7c5be 100644
--- a/TAO/tao/GIOP_Server_Request.cpp
+++ b/TAO/tao/GIOP_Server_Request.cpp
@@ -7,7 +7,6 @@
 #include "tao/GIOP_Message_Acceptors.h"
 
 #include "tao/CDR.h"
-#include "tao/PortableServerC.h"
 #include "tao/Environment.h"
 #include "tao/NVList.h"
 #include "tao/Principal.h"
@@ -18,7 +17,6 @@
 #include "tao/Marshal.h"
 #include "tao/debug.h"
 #include "tao/GIOP_Utils.h"
-#include "tao/POA.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/GIOP_Server_Request.i"
@@ -188,43 +186,25 @@ TAO_GIOP_ServerRequest::set_exception (const CORBA::Any &value,
 {
   if (this->retval_ || this->exception_)
     ACE_THROW (CORBA::BAD_INV_ORDER ());
-  else
-  {
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
+  ACE_NEW_THROW_EX (this->exception_,
+                    CORBA::Any (value),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
 
-    const PortableServer::ForwardRequest *forward_request = 0;
+  this->exception_type_ = TAO_GIOP_USER_EXCEPTION;
 
-    // If extraction of exception succeeded
-    if ((value >>= forward_request) != 0)
-      {
-        this->forward_location_ = forward_request->forward_reference;
-        this->exception_type_ = TAO_GIOP_LOCATION_FORWARD;
-      }
-    // Normal exception
-    else
-#endif /* TAO_HAS_MINIMUM_CORBA */
-      {
-        ACE_NEW_THROW_EX (this->exception_,
-                          CORBA::Any (value),
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK;
-
-        this->exception_type_ = TAO_GIOP_USER_EXCEPTION;
-
-        if (value.value ())
-          {
-            // @@ This cast is not safe, but we haven't implemented the >>=
-            // and <<= operators for base exceptions (yet).
-            CORBA_Exception* x = (CORBA_Exception*)value.value ();
-
-            if (CORBA_SystemException::_downcast (x) != 0)
-              {
-                this->exception_type_ = TAO_GIOP_SYSTEM_EXCEPTION;
-              }
-          }
-      }
-   }
+  if (value.value ())
+    {
+      // @@ This cast is not safe, but we haven't implemented the >>=
+      // and <<= operators for base exceptions (yet).
+      CORBA_Exception* x = (CORBA_Exception*)value.value ();
+
+      if (CORBA_SystemException::_downcast (x) != 0)
+        {
+          this->exception_type_ = TAO_GIOP_SYSTEM_EXCEPTION;
+        }
+    }
 }
 
 // this method will be utilized by the DSI servant to marshal outgoing
@@ -485,6 +465,7 @@ TAO_GIOP_ServerRequest::tao_send_reply_exception(CORBA::Exception& ex)
 
 }
 
+#if 0 // PPOA
 CORBA::Object_ptr
 TAO_GIOP_ServerRequest::objref (CORBA_Environment &ACE_TRY_ENV)
 {
@@ -492,3 +473,4 @@ TAO_GIOP_ServerRequest::objref (CORBA_Environment &ACE_TRY_ENV)
 
   return pci->poa ()->id_to_reference (pci->object_id (), ACE_TRY_ENV);
 }
+#endif /* 0 PPOA */
diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h
index ad500c04c8a..52ebb397c55 100644
--- a/TAO/tao/GIOP_Server_Request.h
+++ b/TAO/tao/GIOP_Server_Request.h
@@ -152,8 +152,8 @@ public:
 
   virtual TAO_ObjectKey &object_key (void);
 
-  virtual CORBA::Object_ptr objref (CORBA_Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
+  // @@ PPOA: virtual CORBA::Object_ptr objref (CORBA_Environment &ACE_TRY_ENV =
+  // @@ PPOA: TAO_default_environment ());
   // Return the object reference of the request.
 
   virtual IOP::ServiceContextList &service_info (void);
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 60815928e53..43e4344d4d8 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -8,7 +8,6 @@
 #include "tao/Environment.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
-#include "tao/POA.h"
 #include "tao/debug.h"
 
 ACE_RCSID(tao, IIOP_Profile, "$Id$")
@@ -314,7 +313,7 @@ TAO_IIOP_Profile::parse_string (const char *string,
 
   start = ++okd;  // increment past the object key separator
 
-  TAO_POA::decode_string_to_sequence (this->object_key_, start);
+  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, start);
 
   return 1;
 }
@@ -393,8 +392,8 @@ char *
 TAO_IIOP_Profile::to_string (CORBA::Environment &)
 {
   CORBA::String_var key;
-  TAO_POA::encode_sequence_to_string (key.inout(),
-                                      this->object_key_);
+  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
+                                             this->object_key_);
 
   u_int buflen = (ACE_OS::strlen (::prefix_) +
                   3 /* "loc" */ +
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 0f81fc317ab..32f657bf441 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -147,8 +147,8 @@ public:
 
   IOP::TaggedProfile &create_tagged_profile (void);
   // Please refer to Profile.h for the documentation of this
-  // function.  
-  
+  // function.
+
 private:
   int set (const ACE_INET_Addr &addr);
   // helper method to set the INET_Addr.
@@ -183,7 +183,7 @@ private:
 
   IOP::TaggedProfile tagged_profile_;
   // Our tagged profile
-  
+
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/InterfaceC.h b/TAO/tao/InterfaceC.h
index a7b24ee733f..64331414a91 100644
--- a/TAO/tao/InterfaceC.h
+++ b/TAO/tao/InterfaceC.h
@@ -143,7 +143,6 @@ class TAO_Export CORBA_IRObject : public virtual ACE_CORBA_1 (Object)
   protected:
     CORBA_IRObject (void);
     CORBA_IRObject (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
         CORBA::Boolean _tao_collocated = 0
       );
     virtual ~CORBA_IRObject (void);
@@ -560,7 +559,6 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
   protected:
     IR_Contained (void);
     IR_Contained (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
         CORBA::Boolean _tao_collocated = 0
       );
     virtual ~IR_Contained (void);
@@ -4231,7 +4229,6 @@ virtual const char* _interface_repository_id (void) const;
 protected:
   IR_Container (void);
   IR_Container (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_Container (void);
@@ -4527,7 +4524,6 @@ public:
 protected:
   IR_IDLType (void);
   IR_IDLType (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_IDLType (void);
@@ -4986,7 +4982,6 @@ public:
 protected:
   IR_Repository (void);
   IR_Repository (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_Repository (void);
@@ -5239,7 +5234,6 @@ public:
 protected:
   IR_ComponentRepository (void);
   IR_ComponentRepository (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ComponentRepository (void);
@@ -5372,7 +5366,6 @@ public:
 protected:
   IR_ModuleDef (void);
   IR_ModuleDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ModuleDef (void);
@@ -5582,7 +5575,6 @@ public:
 protected:
   IR_ConstantDef (void);
   IR_ConstantDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ConstantDef (void);
@@ -5839,7 +5831,6 @@ public:
 protected:
   IR_TypedefDef (void);
   IR_TypedefDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_TypedefDef (void);
@@ -6025,7 +6016,6 @@ public:
 protected:
   IR_StructDef (void);
   IR_StructDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_StructDef (void);
@@ -6190,7 +6180,6 @@ public:
 protected:
   IR_UnionDef (void);
   IR_UnionDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_UnionDef (void);
@@ -6355,7 +6344,6 @@ public:
 protected:
   IR_EnumDef (void);
   IR_EnumDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_EnumDef (void);
@@ -6495,7 +6483,6 @@ public:
 protected:
   IR_AliasDef (void);
   IR_AliasDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_AliasDef (void);
@@ -6618,7 +6605,6 @@ public:
 protected:
   IR_NativeDef (void);
   IR_NativeDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_NativeDef (void);
@@ -6732,7 +6718,6 @@ public:
 protected:
   IR_PrimitiveDef (void);
   IR_PrimitiveDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_PrimitiveDef (void);
@@ -6863,7 +6848,6 @@ public:
 protected:
   IR_StringDef (void);
   IR_StringDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_StringDef (void);
@@ -7003,7 +6987,6 @@ public:
 protected:
   IR_WstringDef (void);
   IR_WstringDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_WstringDef (void);
@@ -7160,7 +7143,6 @@ public:
 protected:
   IR_FixedDef (void);
   IR_FixedDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_FixedDef (void);
@@ -7342,7 +7324,6 @@ public:
 protected:
   IR_SequenceDef (void);
   IR_SequenceDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_SequenceDef (void);
@@ -7532,7 +7513,6 @@ public:
 protected:
   IR_ArrayDef (void);
   IR_ArrayDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ArrayDef (void);
@@ -7705,7 +7685,6 @@ public:
 protected:
   IR_ExceptionDef (void);
   IR_ExceptionDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ExceptionDef (void);
@@ -8225,7 +8204,6 @@ public:
 protected:
   IR_AttributeDef (void);
   IR_AttributeDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_AttributeDef (void);
@@ -8841,7 +8819,6 @@ public:
 protected:
   IR_OperationDef (void);
   IR_OperationDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_OperationDef (void);
@@ -9519,7 +9496,6 @@ public:
 protected:
   IR_InterfaceDef (void);
   IR_InterfaceDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_InterfaceDef (void);
@@ -10055,7 +10031,6 @@ public:
 protected:
   IR_ValueMemberDef (void);
   IR_ValueMemberDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ValueMemberDef (void);
@@ -10375,7 +10350,6 @@ public:
 protected:
   IR_ValueDef (void);
   IR_ValueDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ValueDef (void);
@@ -10743,7 +10717,6 @@ public:
 protected:
   IR_ValueBoxDef (void);
   IR_ValueBoxDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ValueBoxDef (void);
@@ -10874,7 +10847,6 @@ public:
 protected:
   IR_ProvidesDef (void);
   IR_ProvidesDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ProvidesDef (void);
@@ -11067,7 +11039,6 @@ public:
 protected:
   IR_UsesDef (void);
   IR_UsesDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_UsesDef (void);
@@ -11511,7 +11482,6 @@ public:
 protected:
   IR_EventDef (void);
   IR_EventDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_EventDef (void);
@@ -11697,7 +11667,6 @@ public:
 protected:
   IR_EmitsDef (void);
   IR_EmitsDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_EmitsDef (void);
@@ -11803,7 +11772,6 @@ public:
 protected:
   IR_PublishesDef (void);
   IR_PublishesDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_PublishesDef (void);
@@ -11909,7 +11877,6 @@ public:
 protected:
   IR_ConsumesDef (void);
   IR_ConsumesDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ConsumesDef (void);
@@ -12149,7 +12116,6 @@ public:
 protected:
   IR_ComponentDef (void);
   IR_ComponentDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_ComponentDef (void);
@@ -12477,7 +12443,6 @@ public:
 protected:
   IR_PrimaryKeyDef (void);
   IR_PrimaryKeyDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_PrimaryKeyDef (void);
@@ -12663,7 +12628,6 @@ public:
 protected:
   IR_FactoryDef (void);
   IR_FactoryDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_FactoryDef (void);
@@ -12769,7 +12733,6 @@ public:
 protected:
   IR_FinderDef (void);
   IR_FinderDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_FinderDef (void);
@@ -12961,7 +12924,6 @@ public:
 protected:
   IR_HomeDef (void);
   IR_HomeDef (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IR_HomeDef (void);
@@ -13455,7 +13417,6 @@ class TAO_Export CORBA_TypeCodeFactory : public virtual ACE_CORBA_1 (Object)
   protected:
     CORBA_TypeCodeFactory (void);
     CORBA_TypeCodeFactory (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
         CORBA::Boolean _tao_collocated = 0
       );
     virtual ~CORBA_TypeCodeFactory (void);
diff --git a/TAO/tao/InterfaceC.i b/TAO/tao/InterfaceC.i
index 6c9fb72abcd..7a812e1e176 100644
--- a/TAO/tao/InterfaceC.i
+++ b/TAO/tao/InterfaceC.i
@@ -13,8 +13,8 @@ CORBA_IRObject::CORBA_IRObject (void) // default constructor
 {}
 
 ACE_INLINE
-CORBA_IRObject::CORBA_IRObject (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+CORBA_IRObject::CORBA_IRObject (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -39,7 +39,7 @@ CORBA_IRObject_var::CORBA_IRObject_var (CORBA_IRObject_ptr p)
   : ptr_ (p)
 {}
 
-ACE_INLINE CORBA_IRObject_ptr 
+ACE_INLINE CORBA_IRObject_ptr
 CORBA_IRObject_var::ptr (void) const
 {
   return this->ptr_;
@@ -76,19 +76,19 @@ CORBA_IRObject_var::operator= (const CORBA_IRObject_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_IRObject_var::operator const CORBA_IRObject_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_IRObject_var::operator CORBA_IRObject_ptr &() // cast 
+ACE_INLINE
+CORBA_IRObject_var::operator CORBA_IRObject_ptr &() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_IRObject_ptr 
+ACE_INLINE CORBA_IRObject_ptr
 CORBA_IRObject_var::operator-> (void) const
 {
   return this->ptr_;
@@ -114,7 +114,7 @@ CORBA_IRObject_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_IRObject_ptr 
+ACE_INLINE CORBA_IRObject_ptr
 CORBA_IRObject_var::_retn (void)
 {
   // yield ownership of managed obj reference
@@ -175,7 +175,7 @@ CORBA_IRObject_out::operator= (CORBA::IRObject_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_IRObject_out::operator CORBA_IRObject_ptr &() // cast
 {
   return this->ptr_;
@@ -187,7 +187,7 @@ CORBA_IRObject_out::ptr (void) // ptr
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_IRObject_ptr 
+ACE_INLINE CORBA_IRObject_ptr
 CORBA_IRObject_out::operator-> (void)
 {
   return this->ptr_;
@@ -201,8 +201,8 @@ IR_Contained::IR_Contained (void) // default constructor
 {}
 
 ACE_INLINE
-IR_Contained::IR_Contained (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_Contained::IR_Contained (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -264,14 +264,14 @@ IR_Contained_var::operator= (const ::IR_Contained_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Contained_var::operator const ::IR_Contained_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_Contained_var::operator ::IR_Contained_ptr &() // cast 
+ACE_INLINE
+IR_Contained_var::operator ::IR_Contained_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -363,7 +363,7 @@ IR_Contained_out::operator= (IR_Contained_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Contained_out::operator ::IR_Contained_ptr &() // cast
 {
   return this->ptr_;
@@ -451,20 +451,20 @@ IR_Contained::Description_var::operator const ::IR_Contained::Description &() co
 }
 
 ACE_INLINE
-IR_Contained::Description_var::operator ::IR_Contained::Description &() // cast 
+IR_Contained::Description_var::operator ::IR_Contained::Description &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_Contained::Description_var::operator ::IR_Contained::Description &() const // cast 
+IR_Contained::Description_var::operator ::IR_Contained::Description &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_Contained::Description_var::operator ::IR_Contained::Description *&() // cast 
+IR_Contained::Description_var::operator ::IR_Contained::Description *&() // cast
 {
   return this->ptr_;
 }
@@ -481,7 +481,7 @@ IR_Contained::Description_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_Contained::Description *&
 IR_Contained::Description_var::out (void)
 {
@@ -542,7 +542,7 @@ IR_Contained::Description_out::operator= (Description *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Contained::Description_out::operator ::IR_Contained::Description *&() // cast
 {
   return this->ptr_;
@@ -566,8 +566,8 @@ IR_IDLType::IR_IDLType (void) // default constructor
 {}
 
 ACE_INLINE
-IR_IDLType::IR_IDLType (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_IDLType::IR_IDLType (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -629,14 +629,14 @@ IR_IDLType_var::operator= (const ::IR_IDLType_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_IDLType_var::operator const ::IR_IDLType_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_IDLType_var::operator ::IR_IDLType_ptr &() // cast 
+ACE_INLINE
+IR_IDLType_var::operator ::IR_IDLType_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -728,7 +728,7 @@ IR_IDLType_out::operator= (IR_IDLType_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_IDLType_out::operator ::IR_IDLType_ptr &() // cast
 {
   return this->ptr_;
@@ -750,7 +750,7 @@ IR_IDLType_out::operator-> (void)
 #endif /* end #if !defined */
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_
 
@@ -758,34 +758,34 @@ IR_IDLType_out::operator-> (void)
   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_InterfaceDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_InterfaceDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_InterfaceDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (IR_InterfaceDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -794,7 +794,7 @@ IR_IDLType_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -803,10 +803,10 @@ IR_IDLType_out::operator-> (void)
     {
       IR_InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (this->maximum_);
       IR_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_InterfaceDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -814,17 +814,17 @@ IR_IDLType_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_InterfaceDef **tmp = ACE_reinterpret_cast (IR_InterfaceDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -838,18 +838,18 @@ IR_IDLType_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_InterfaceDef **tmp1 = ACE_reinterpret_cast (IR_InterfaceDef **, this->buffer_);
     IR_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_InterfaceDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>
   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -858,7 +858,7 @@ IR_IDLType_out::operator-> (void)
     IR_InterfaceDef ** const tmp = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_InterfaceDef* *
   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -870,7 +870,7 @@ IR_IDLType_out::operator-> (void)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -892,18 +892,18 @@ IR_IDLType_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_InterfaceDef* *
   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_INTERFACEDEFSEQ_CI_)
 #define _IR_INTERFACEDEFSEQ_CI_
@@ -968,32 +968,32 @@ IR_InterfaceDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_InterfaceDefSeq_var::operator const ::IR_InterfaceDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() // cast 
+ACE_INLINE
+IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() const // cast 
+ACE_INLINE
+IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq *&() // cast 
+IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var>
 IR_InterfaceDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -1011,7 +1011,7 @@ IR_InterfaceDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_InterfaceDefSeq *&
 IR_InterfaceDefSeq_var::out (void)
 {
@@ -1072,7 +1072,7 @@ IR_InterfaceDefSeq_out::operator= (IR_InterfaceDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_InterfaceDefSeq_out::operator ::IR_InterfaceDefSeq *&() // cast
 {
   return this->ptr_;
@@ -1090,7 +1090,7 @@ IR_InterfaceDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var>
 IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -1101,7 +1101,7 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_
 
@@ -1109,34 +1109,34 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_ValueDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_ValueDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_ValueDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::freebuf (IR_ValueDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -1145,7 +1145,7 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -1154,10 +1154,10 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (this->maximum_);
       IR_ValueDef ** const tmp2 = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_ValueDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -1165,17 +1165,17 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_ValueDef **tmp = ACE_reinterpret_cast (IR_ValueDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -1189,18 +1189,18 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_ValueDef **tmp1 = ACE_reinterpret_cast (IR_ValueDef **, this->buffer_);
     IR_ValueDef ** const tmp2 = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_ValueDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>
   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -1209,7 +1209,7 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
     IR_ValueDef ** const tmp = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_ValueDef* *
   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -1221,7 +1221,7 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -1243,18 +1243,18 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_ValueDef* *
   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_ValueDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_VALUEDEFSEQ_CI_)
 #define _IR_VALUEDEFSEQ_CI_
@@ -1319,32 +1319,32 @@ IR_ValueDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueDefSeq_var::operator const ::IR_ValueDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() // cast 
+ACE_INLINE
+IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() const // cast 
+ACE_INLINE
+IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ValueDefSeq_var::operator ::IR_ValueDefSeq *&() // cast 
+IR_ValueDefSeq_var::operator ::IR_ValueDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var>
 IR_ValueDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -1362,7 +1362,7 @@ IR_ValueDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ValueDefSeq *&
 IR_ValueDefSeq_var::out (void)
 {
@@ -1423,7 +1423,7 @@ IR_ValueDefSeq_out::operator= (IR_ValueDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueDefSeq_out::operator ::IR_ValueDefSeq *&() // cast
 {
   return this->ptr_;
@@ -1441,7 +1441,7 @@ IR_ValueDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var>
 IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -1452,7 +1452,7 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_
 
@@ -1460,34 +1460,34 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_ComponentDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_ComponentDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_ComponentDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (IR_ComponentDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -1496,7 +1496,7 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -1505,10 +1505,10 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_ComponentDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
       IR_ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_ComponentDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -1516,17 +1516,17 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_ComponentDef **tmp = ACE_reinterpret_cast (IR_ComponentDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -1540,18 +1540,18 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_ComponentDef **tmp1 = ACE_reinterpret_cast (IR_ComponentDef **, this->buffer_);
     IR_ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_ComponentDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -1560,7 +1560,7 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
     IR_ComponentDef ** const tmp = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_ComponentDef* *
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -1572,7 +1572,7 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -1594,18 +1594,18 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_ComponentDef* *
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_ComponentDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_COMPONENTDEFSEQ_CI_)
 #define _IR_COMPONENTDEFSEQ_CI_
@@ -1670,32 +1670,32 @@ IR_ComponentDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ComponentDefSeq_var::operator const ::IR_ComponentDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() // cast 
+ACE_INLINE
+IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() const // cast 
+ACE_INLINE
+IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq *&() // cast 
+IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var>
 IR_ComponentDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -1713,7 +1713,7 @@ IR_ComponentDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ComponentDefSeq *&
 IR_ComponentDefSeq_var::out (void)
 {
@@ -1774,7 +1774,7 @@ IR_ComponentDefSeq_out::operator= (IR_ComponentDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ComponentDefSeq_out::operator ::IR_ComponentDefSeq *&() // cast
 {
   return this->ptr_;
@@ -1792,7 +1792,7 @@ IR_ComponentDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var>
 IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -1803,7 +1803,7 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_
 
@@ -1811,34 +1811,34 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_ProvidesDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_ProvidesDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_ProvidesDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (IR_ProvidesDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -1847,7 +1847,7 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -1856,10 +1856,10 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_ProvidesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
       IR_ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_ProvidesDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -1867,17 +1867,17 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_ProvidesDef **tmp = ACE_reinterpret_cast (IR_ProvidesDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -1891,18 +1891,18 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_ProvidesDef **tmp1 = ACE_reinterpret_cast (IR_ProvidesDef **, this->buffer_);
     IR_ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_ProvidesDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -1911,7 +1911,7 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
     IR_ProvidesDef ** const tmp = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_ProvidesDef* *
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -1923,7 +1923,7 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -1945,18 +1945,18 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_ProvidesDef* *
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_ProvidesDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_PROVIDESDEFSEQ_CI_)
 #define _IR_PROVIDESDEFSEQ_CI_
@@ -2021,32 +2021,32 @@ IR_ProvidesDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ProvidesDefSeq_var::operator const ::IR_ProvidesDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() // cast 
+ACE_INLINE
+IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() const // cast 
+ACE_INLINE
+IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq *&() // cast 
+IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var>
 IR_ProvidesDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -2064,7 +2064,7 @@ IR_ProvidesDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ProvidesDefSeq *&
 IR_ProvidesDefSeq_var::out (void)
 {
@@ -2125,7 +2125,7 @@ IR_ProvidesDefSeq_out::operator= (IR_ProvidesDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ProvidesDefSeq_out::operator ::IR_ProvidesDefSeq *&() // cast
 {
   return this->ptr_;
@@ -2143,7 +2143,7 @@ IR_ProvidesDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var>
 IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -2154,7 +2154,7 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_
 
@@ -2162,34 +2162,34 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_UsesDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_UsesDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_UsesDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (IR_UsesDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -2198,7 +2198,7 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -2207,10 +2207,10 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_UsesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
       IR_UsesDef ** const tmp2 = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_UsesDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -2218,17 +2218,17 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_UsesDef **tmp = ACE_reinterpret_cast (IR_UsesDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -2242,18 +2242,18 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_UsesDef **tmp1 = ACE_reinterpret_cast (IR_UsesDef **, this->buffer_);
     IR_UsesDef ** const tmp2 = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_UsesDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -2262,7 +2262,7 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
     IR_UsesDef ** const tmp = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_UsesDef* *
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -2274,7 +2274,7 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -2296,18 +2296,18 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_UsesDef* *
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_UsesDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_USESDEFSEQ_CI_)
 #define _IR_USESDEFSEQ_CI_
@@ -2372,32 +2372,32 @@ IR_UsesDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UsesDefSeq_var::operator const ::IR_UsesDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() // cast 
+ACE_INLINE
+IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() const // cast 
+ACE_INLINE
+IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_UsesDefSeq_var::operator ::IR_UsesDefSeq *&() // cast 
+IR_UsesDefSeq_var::operator ::IR_UsesDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var>
 IR_UsesDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -2415,7 +2415,7 @@ IR_UsesDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_UsesDefSeq *&
 IR_UsesDefSeq_var::out (void)
 {
@@ -2476,7 +2476,7 @@ IR_UsesDefSeq_out::operator= (IR_UsesDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UsesDefSeq_out::operator ::IR_UsesDefSeq *&() // cast
 {
   return this->ptr_;
@@ -2494,7 +2494,7 @@ IR_UsesDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var>
 IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -2505,7 +2505,7 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_
 
@@ -2513,34 +2513,34 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_HomeDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_HomeDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_HomeDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (IR_HomeDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -2549,7 +2549,7 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -2558,10 +2558,10 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_HomeDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
       IR_HomeDef ** const tmp2 = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_HomeDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -2569,17 +2569,17 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_HomeDef **tmp = ACE_reinterpret_cast (IR_HomeDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -2593,18 +2593,18 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_HomeDef **tmp1 = ACE_reinterpret_cast (IR_HomeDef **, this->buffer_);
     IR_HomeDef ** const tmp2 = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_HomeDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -2613,7 +2613,7 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
     IR_HomeDef ** const tmp = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_HomeDef* *
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -2625,7 +2625,7 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -2647,18 +2647,18 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_HomeDef* *
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_HomeDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_HOMEDEFSEQ_CI_)
 #define _IR_HOMEDEFSEQ_CI_
@@ -2723,32 +2723,32 @@ IR_HomeDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_HomeDefSeq_var::operator const ::IR_HomeDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() // cast 
+ACE_INLINE
+IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() const // cast 
+ACE_INLINE
+IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_HomeDefSeq_var::operator ::IR_HomeDefSeq *&() // cast 
+IR_HomeDefSeq_var::operator ::IR_HomeDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var>
 IR_HomeDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -2766,7 +2766,7 @@ IR_HomeDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_HomeDefSeq *&
 IR_HomeDefSeq_var::out (void)
 {
@@ -2827,7 +2827,7 @@ IR_HomeDefSeq_out::operator= (IR_HomeDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_HomeDefSeq_out::operator ::IR_HomeDefSeq *&() // cast
 {
   return this->ptr_;
@@ -2845,7 +2845,7 @@ IR_HomeDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var>
 IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -2856,7 +2856,7 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_
 
@@ -2864,34 +2864,34 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_EmitsDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_EmitsDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_EmitsDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (IR_EmitsDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -2900,7 +2900,7 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -2909,10 +2909,10 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_EmitsDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
       IR_EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_EmitsDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -2920,17 +2920,17 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_EmitsDef **tmp = ACE_reinterpret_cast (IR_EmitsDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -2944,18 +2944,18 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_EmitsDef **tmp1 = ACE_reinterpret_cast (IR_EmitsDef **, this->buffer_);
     IR_EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_EmitsDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -2964,7 +2964,7 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
     IR_EmitsDef ** const tmp = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_EmitsDef* *
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -2976,7 +2976,7 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -2998,18 +2998,18 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_EmitsDef* *
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_EmitsDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_EMITSDEFSEQ_CI_)
 #define _IR_EMITSDEFSEQ_CI_
@@ -3074,32 +3074,32 @@ IR_EmitsDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EmitsDefSeq_var::operator const ::IR_EmitsDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() // cast 
+ACE_INLINE
+IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() const // cast 
+ACE_INLINE
+IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq *&() // cast 
+IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var>
 IR_EmitsDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -3117,7 +3117,7 @@ IR_EmitsDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_EmitsDefSeq *&
 IR_EmitsDefSeq_var::out (void)
 {
@@ -3178,7 +3178,7 @@ IR_EmitsDefSeq_out::operator= (IR_EmitsDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EmitsDefSeq_out::operator ::IR_EmitsDefSeq *&() // cast
 {
   return this->ptr_;
@@ -3196,7 +3196,7 @@ IR_EmitsDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var>
 IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -3207,7 +3207,7 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_
 
@@ -3215,34 +3215,34 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_PublishesDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_PublishesDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_PublishesDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (IR_PublishesDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -3251,7 +3251,7 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -3260,10 +3260,10 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_PublishesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
       IR_PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_PublishesDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -3271,17 +3271,17 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_PublishesDef **tmp = ACE_reinterpret_cast (IR_PublishesDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -3295,18 +3295,18 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_PublishesDef **tmp1 = ACE_reinterpret_cast (IR_PublishesDef **, this->buffer_);
     IR_PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_PublishesDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -3315,7 +3315,7 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
     IR_PublishesDef ** const tmp = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_PublishesDef* *
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -3327,7 +3327,7 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -3349,18 +3349,18 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_PublishesDef* *
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_PublishesDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_PUBLISHESDEFSEQ_CI_)
 #define _IR_PUBLISHESDEFSEQ_CI_
@@ -3425,32 +3425,32 @@ IR_PublishesDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_PublishesDefSeq_var::operator const ::IR_PublishesDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() // cast 
+ACE_INLINE
+IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() const // cast 
+ACE_INLINE
+IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq *&() // cast 
+IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var>
 IR_PublishesDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -3468,7 +3468,7 @@ IR_PublishesDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_PublishesDefSeq *&
 IR_PublishesDefSeq_var::out (void)
 {
@@ -3529,7 +3529,7 @@ IR_PublishesDefSeq_out::operator= (IR_PublishesDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_PublishesDefSeq_out::operator ::IR_PublishesDefSeq *&() // cast
 {
   return this->ptr_;
@@ -3547,7 +3547,7 @@ IR_PublishesDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var>
 IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -3558,7 +3558,7 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_
 
@@ -3566,34 +3566,34 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_ConsumesDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_ConsumesDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_ConsumesDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (IR_ConsumesDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -3602,7 +3602,7 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -3611,10 +3611,10 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_ConsumesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
       IR_ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_ConsumesDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -3622,17 +3622,17 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_ConsumesDef **tmp = ACE_reinterpret_cast (IR_ConsumesDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -3646,18 +3646,18 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_ConsumesDef **tmp1 = ACE_reinterpret_cast (IR_ConsumesDef **, this->buffer_);
     IR_ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_ConsumesDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -3666,7 +3666,7 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
     IR_ConsumesDef ** const tmp = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_ConsumesDef* *
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -3678,7 +3678,7 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -3700,18 +3700,18 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_ConsumesDef* *
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_ConsumesDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_CONSUMESDEFSEQ_CI_)
 #define _IR_CONSUMESDEFSEQ_CI_
@@ -3776,32 +3776,32 @@ IR_ConsumesDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ConsumesDefSeq_var::operator const ::IR_ConsumesDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() // cast 
+ACE_INLINE
+IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() const // cast 
+ACE_INLINE
+IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq *&() // cast 
+IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var>
 IR_ConsumesDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -3819,7 +3819,7 @@ IR_ConsumesDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ConsumesDefSeq *&
 IR_ConsumesDefSeq_var::out (void)
 {
@@ -3880,7 +3880,7 @@ IR_ConsumesDefSeq_out::operator= (IR_ConsumesDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ConsumesDefSeq_out::operator ::IR_ConsumesDefSeq *&() // cast
 {
   return this->ptr_;
@@ -3898,7 +3898,7 @@ IR_ConsumesDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var>
 IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -3909,7 +3909,7 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_
 
@@ -3917,34 +3917,34 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_FactoryDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_FactoryDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_FactoryDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (IR_FactoryDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -3953,7 +3953,7 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -3962,10 +3962,10 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_FactoryDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
       IR_FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_FactoryDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -3973,17 +3973,17 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_FactoryDef **tmp = ACE_reinterpret_cast (IR_FactoryDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -3997,18 +3997,18 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_FactoryDef **tmp1 = ACE_reinterpret_cast (IR_FactoryDef **, this->buffer_);
     IR_FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_FactoryDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -4017,7 +4017,7 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
     IR_FactoryDef ** const tmp = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_FactoryDef* *
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -4029,7 +4029,7 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -4051,18 +4051,18 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_FactoryDef* *
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_FactoryDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_FACTORYDEFSEQ_CI_)
 #define _IR_FACTORYDEFSEQ_CI_
@@ -4127,32 +4127,32 @@ IR_FactoryDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_FactoryDefSeq_var::operator const ::IR_FactoryDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() // cast 
+ACE_INLINE
+IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() const // cast 
+ACE_INLINE
+IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq *&() // cast 
+IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var>
 IR_FactoryDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -4170,7 +4170,7 @@ IR_FactoryDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_FactoryDefSeq *&
 IR_FactoryDefSeq_var::out (void)
 {
@@ -4231,7 +4231,7 @@ IR_FactoryDefSeq_out::operator= (IR_FactoryDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_FactoryDefSeq_out::operator ::IR_FactoryDefSeq *&() // cast
 {
   return this->ptr_;
@@ -4249,7 +4249,7 @@ IR_FactoryDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var>
 IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -4260,7 +4260,7 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_
 
@@ -4268,34 +4268,34 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_FinderDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_FinderDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_FinderDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (IR_FinderDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -4304,7 +4304,7 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -4313,10 +4313,10 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_FinderDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
       IR_FinderDef ** const tmp2 = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_FinderDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -4324,17 +4324,17 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_FinderDef **tmp = ACE_reinterpret_cast (IR_FinderDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -4348,18 +4348,18 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_FinderDef **tmp1 = ACE_reinterpret_cast (IR_FinderDef **, this->buffer_);
     IR_FinderDef ** const tmp2 = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_FinderDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -4368,7 +4368,7 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
     IR_FinderDef ** const tmp = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_FinderDef* *
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -4380,7 +4380,7 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -4402,18 +4402,18 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_FinderDef* *
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_FinderDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_FINDERDEFSEQ_CI_)
 #define _IR_FINDERDEFSEQ_CI_
@@ -4478,32 +4478,32 @@ IR_FinderDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_FinderDefSeq_var::operator const ::IR_FinderDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() // cast 
+ACE_INLINE
+IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() const // cast 
+ACE_INLINE
+IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_FinderDefSeq_var::operator ::IR_FinderDefSeq *&() // cast 
+IR_FinderDefSeq_var::operator ::IR_FinderDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var>
 IR_FinderDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -4521,7 +4521,7 @@ IR_FinderDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_FinderDefSeq *&
 IR_FinderDefSeq_var::out (void)
 {
@@ -4582,7 +4582,7 @@ IR_FinderDefSeq_out::operator= (IR_FinderDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_FinderDefSeq_out::operator ::IR_FinderDefSeq *&() // cast
 {
   return this->ptr_;
@@ -4600,7 +4600,7 @@ IR_FinderDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var>
 IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -4611,7 +4611,7 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_
 
@@ -4619,34 +4619,34 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_Contained **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_Contained*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_Contained::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::freebuf (IR_Contained **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -4655,7 +4655,7 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq(const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -4664,10 +4664,10 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_Contained **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (this->maximum_);
       IR_Contained ** const tmp2 = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_Contained::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -4675,17 +4675,17 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &
   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_Contained **tmp = ACE_reinterpret_cast (IR_Contained **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -4699,18 +4699,18 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_Contained **tmp1 = ACE_reinterpret_cast (IR_Contained **, this->buffer_);
     IR_Contained ** const tmp2 = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_Contained::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_Contained,IR_Contained_var>
   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -4719,7 +4719,7 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
     IR_Contained ** const tmp = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_Contained,IR_Contained_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_Contained* *
   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -4731,7 +4731,7 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -4753,18 +4753,18 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_Contained* *
   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_Contained ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_CONTAINEDSEQ_CI_)
 #define _IR_CONTAINEDSEQ_CI_
@@ -4829,32 +4829,32 @@ IR_ContainedSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ContainedSeq_var::operator const ::IR_ContainedSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ContainedSeq_var::operator ::IR_ContainedSeq &() // cast 
+ACE_INLINE
+IR_ContainedSeq_var::operator ::IR_ContainedSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ContainedSeq_var::operator ::IR_ContainedSeq &() const // cast 
+ACE_INLINE
+IR_ContainedSeq_var::operator ::IR_ContainedSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ContainedSeq_var::operator ::IR_ContainedSeq *&() // cast 
+IR_ContainedSeq_var::operator ::IR_ContainedSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_Contained, IR_Contained_var> 
+ACE_INLINE TAO_Object_Manager<IR_Contained, IR_Contained_var>
 IR_ContainedSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -4872,7 +4872,7 @@ IR_ContainedSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ContainedSeq *&
 IR_ContainedSeq_var::out (void)
 {
@@ -4933,7 +4933,7 @@ IR_ContainedSeq_out::operator= (IR_ContainedSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ContainedSeq_out::operator ::IR_ContainedSeq *&() // cast
 {
   return this->ptr_;
@@ -4951,7 +4951,7 @@ IR_ContainedSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_Contained, IR_Contained_var> 
+ACE_INLINE TAO_Object_Manager<IR_Contained, IR_Contained_var>
 IR_ContainedSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -5027,20 +5027,20 @@ IR_StructMember_var::operator const ::IR_StructMember &() const // cast
 }
 
 ACE_INLINE
-IR_StructMember_var::operator ::IR_StructMember &() // cast 
+IR_StructMember_var::operator ::IR_StructMember &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_StructMember_var::operator ::IR_StructMember &() const // cast 
+IR_StructMember_var::operator ::IR_StructMember &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_StructMember_var::operator ::IR_StructMember *&() // cast 
+IR_StructMember_var::operator ::IR_StructMember *&() // cast
 {
   return this->ptr_;
 }
@@ -5057,7 +5057,7 @@ IR_StructMember_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_StructMember *&
 IR_StructMember_var::out (void)
 {
@@ -5118,7 +5118,7 @@ IR_StructMember_out::operator= (IR_StructMember *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_StructMember_out::operator ::IR_StructMember *&() // cast
 {
   return this->ptr_;
@@ -5138,7 +5138,7 @@ IR_StructMember_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_
 
@@ -5151,24 +5151,24 @@ IR_StructMember_out::operator-> (void)
     ACE_NEW_RETURN (retval, IR_StructMember[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (IR_StructMember *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -5177,7 +5177,7 @@ IR_StructMember_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
   // Copy constructor.
@@ -5187,10 +5187,10 @@ IR_StructMember_out::operator-> (void)
     {
       IR_StructMember *tmp1 = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (this->maximum_);
       IR_StructMember * const tmp2 = ACE_reinterpret_cast (IR_StructMember * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -5198,14 +5198,14 @@ IR_StructMember_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_IR_StructMemberSeq &
   _TAO_Unbounded_Sequence_IR_StructMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -5218,18 +5218,18 @@ IR_StructMember_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_StructMember *tmp1 = ACE_reinterpret_cast (IR_StructMember *, this->buffer_);
     IR_StructMember * const tmp2 = ACE_reinterpret_cast (IR_StructMember * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_StructMember &
   _TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i)
@@ -5239,7 +5239,7 @@ IR_StructMember_out::operator-> (void)
     IR_StructMember* tmp = ACE_reinterpret_cast(IR_StructMember*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_StructMember &
   _TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -5248,9 +5248,9 @@ IR_StructMember_out::operator-> (void)
     IR_StructMember * const tmp = ACE_reinterpret_cast (IR_StructMember* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_StructMember *
   _TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -5262,7 +5262,7 @@ IR_StructMember_out::operator-> (void)
       {
         result = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -5284,13 +5284,13 @@ IR_StructMember_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_StructMember *
   _TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_StructMember * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_IR_StructMemberSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -5307,11 +5307,11 @@ IR_StructMember_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_STRUCTMEMBERSEQ_CI_)
 #define _IR_STRUCTMEMBERSEQ_CI_
@@ -5376,27 +5376,27 @@ IR_StructMemberSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_StructMemberSeq_var::operator const ::IR_StructMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() // cast 
+ACE_INLINE
+IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() const // cast 
+ACE_INLINE
+IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_StructMemberSeq_var::operator ::IR_StructMemberSeq *&() // cast 
+IR_StructMemberSeq_var::operator ::IR_StructMemberSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -5419,7 +5419,7 @@ IR_StructMemberSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_StructMemberSeq *&
 IR_StructMemberSeq_var::out (void)
 {
@@ -5480,7 +5480,7 @@ IR_StructMemberSeq_out::operator= (IR_StructMemberSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_StructMemberSeq_out::operator ::IR_StructMemberSeq *&() // cast
 {
   return this->ptr_;
@@ -5574,20 +5574,20 @@ IR_Initializer_var::operator const ::IR_Initializer &() const // cast
 }
 
 ACE_INLINE
-IR_Initializer_var::operator ::IR_Initializer &() // cast 
+IR_Initializer_var::operator ::IR_Initializer &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_Initializer_var::operator ::IR_Initializer &() const // cast 
+IR_Initializer_var::operator ::IR_Initializer &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_Initializer_var::operator ::IR_Initializer *&() // cast 
+IR_Initializer_var::operator ::IR_Initializer *&() // cast
 {
   return this->ptr_;
 }
@@ -5604,7 +5604,7 @@ IR_Initializer_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_Initializer *&
 IR_Initializer_var::out (void)
 {
@@ -5665,7 +5665,7 @@ IR_Initializer_out::operator= (IR_Initializer *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Initializer_out::operator ::IR_Initializer *&() // cast
 {
   return this->ptr_;
@@ -5685,7 +5685,7 @@ IR_Initializer_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_
 
@@ -5698,24 +5698,24 @@ IR_Initializer_out::operator-> (void)
     ACE_NEW_RETURN (retval, IR_Initializer[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (IR_Initializer *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -5724,7 +5724,7 @@ IR_Initializer_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
   // Copy constructor.
@@ -5734,10 +5734,10 @@ IR_Initializer_out::operator-> (void)
     {
       IR_Initializer *tmp1 = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (this->maximum_);
       IR_Initializer * const tmp2 = ACE_reinterpret_cast (IR_Initializer * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -5745,14 +5745,14 @@ IR_Initializer_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_IR_InitializerSeq &
   _TAO_Unbounded_Sequence_IR_InitializerSeq::operator= (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -5765,18 +5765,18 @@ IR_Initializer_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_Initializer *tmp1 = ACE_reinterpret_cast (IR_Initializer *, this->buffer_);
     IR_Initializer * const tmp2 = ACE_reinterpret_cast (IR_Initializer * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_Initializer &
   _TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i)
@@ -5786,7 +5786,7 @@ IR_Initializer_out::operator-> (void)
     IR_Initializer* tmp = ACE_reinterpret_cast(IR_Initializer*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_Initializer &
   _TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -5795,9 +5795,9 @@ IR_Initializer_out::operator-> (void)
     IR_Initializer * const tmp = ACE_reinterpret_cast (IR_Initializer* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_Initializer *
   _TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -5809,7 +5809,7 @@ IR_Initializer_out::operator-> (void)
       {
         result = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -5831,13 +5831,13 @@ IR_Initializer_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_Initializer *
   _TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_Initializer * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_IR_InitializerSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -5854,11 +5854,11 @@ IR_Initializer_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_INITIALIZERSEQ_CI_)
 #define _IR_INITIALIZERSEQ_CI_
@@ -5923,27 +5923,27 @@ IR_InitializerSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_InitializerSeq_var::operator const ::IR_InitializerSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_InitializerSeq_var::operator ::IR_InitializerSeq &() // cast 
+ACE_INLINE
+IR_InitializerSeq_var::operator ::IR_InitializerSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_InitializerSeq_var::operator ::IR_InitializerSeq &() const // cast 
+ACE_INLINE
+IR_InitializerSeq_var::operator ::IR_InitializerSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_InitializerSeq_var::operator ::IR_InitializerSeq *&() // cast 
+IR_InitializerSeq_var::operator ::IR_InitializerSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -5966,7 +5966,7 @@ IR_InitializerSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_InitializerSeq *&
 IR_InitializerSeq_var::out (void)
 {
@@ -6027,7 +6027,7 @@ IR_InitializerSeq_out::operator= (IR_InitializerSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_InitializerSeq_out::operator ::IR_InitializerSeq *&() // cast
 {
   return this->ptr_;
@@ -6121,20 +6121,20 @@ IR_UnionMember_var::operator const ::IR_UnionMember &() const // cast
 }
 
 ACE_INLINE
-IR_UnionMember_var::operator ::IR_UnionMember &() // cast 
+IR_UnionMember_var::operator ::IR_UnionMember &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_UnionMember_var::operator ::IR_UnionMember &() const // cast 
+IR_UnionMember_var::operator ::IR_UnionMember &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_UnionMember_var::operator ::IR_UnionMember *&() // cast 
+IR_UnionMember_var::operator ::IR_UnionMember *&() // cast
 {
   return this->ptr_;
 }
@@ -6151,7 +6151,7 @@ IR_UnionMember_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_UnionMember *&
 IR_UnionMember_var::out (void)
 {
@@ -6212,7 +6212,7 @@ IR_UnionMember_out::operator= (IR_UnionMember *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UnionMember_out::operator ::IR_UnionMember *&() // cast
 {
   return this->ptr_;
@@ -6232,7 +6232,7 @@ IR_UnionMember_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_
 
@@ -6245,24 +6245,24 @@ IR_UnionMember_out::operator-> (void)
     ACE_NEW_RETURN (retval, IR_UnionMember[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (IR_UnionMember *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -6271,7 +6271,7 @@ IR_UnionMember_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
   // Copy constructor.
@@ -6281,10 +6281,10 @@ IR_UnionMember_out::operator-> (void)
     {
       IR_UnionMember *tmp1 = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (this->maximum_);
       IR_UnionMember * const tmp2 = ACE_reinterpret_cast (IR_UnionMember * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -6292,14 +6292,14 @@ IR_UnionMember_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_IR_UnionMemberSeq &
   _TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -6312,18 +6312,18 @@ IR_UnionMember_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_UnionMember *tmp1 = ACE_reinterpret_cast (IR_UnionMember *, this->buffer_);
     IR_UnionMember * const tmp2 = ACE_reinterpret_cast (IR_UnionMember * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_UnionMember &
   _TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i)
@@ -6333,7 +6333,7 @@ IR_UnionMember_out::operator-> (void)
     IR_UnionMember* tmp = ACE_reinterpret_cast(IR_UnionMember*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_UnionMember &
   _TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -6342,9 +6342,9 @@ IR_UnionMember_out::operator-> (void)
     IR_UnionMember * const tmp = ACE_reinterpret_cast (IR_UnionMember* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_UnionMember *
   _TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -6356,7 +6356,7 @@ IR_UnionMember_out::operator-> (void)
       {
         result = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -6378,13 +6378,13 @@ IR_UnionMember_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_UnionMember *
   _TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_UnionMember * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_IR_UnionMemberSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -6401,11 +6401,11 @@ IR_UnionMember_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_UNIONMEMBERSEQ_CI_)
 #define _IR_UNIONMEMBERSEQ_CI_
@@ -6470,27 +6470,27 @@ IR_UnionMemberSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UnionMemberSeq_var::operator const ::IR_UnionMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() // cast 
+ACE_INLINE
+IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() const // cast 
+ACE_INLINE
+IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq *&() // cast 
+IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -6513,7 +6513,7 @@ IR_UnionMemberSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_UnionMemberSeq *&
 IR_UnionMemberSeq_var::out (void)
 {
@@ -6574,7 +6574,7 @@ IR_UnionMemberSeq_out::operator= (IR_UnionMemberSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UnionMemberSeq_out::operator ::IR_UnionMemberSeq *&() // cast
 {
   return this->ptr_;
@@ -6665,32 +6665,32 @@ IR_EnumMemberSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EnumMemberSeq_var::operator const ::IR_EnumMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() // cast 
+ACE_INLINE
+IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() const // cast 
+ACE_INLINE
+IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq *&() // cast 
+IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager 
+ACE_INLINE TAO_SeqElem_String_Manager
 IR_EnumMemberSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -6708,7 +6708,7 @@ IR_EnumMemberSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_EnumMemberSeq *&
 IR_EnumMemberSeq_var::out (void)
 {
@@ -6769,7 +6769,7 @@ IR_EnumMemberSeq_out::operator= (IR_EnumMemberSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EnumMemberSeq_out::operator ::IR_EnumMemberSeq *&() // cast
 {
   return this->ptr_;
@@ -6787,7 +6787,7 @@ IR_EnumMemberSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager 
+ACE_INLINE TAO_SeqElem_String_Manager
 IR_EnumMemberSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -6801,8 +6801,8 @@ IR_Container::IR_Container (void) // default constructor
 {}
 
 ACE_INLINE
-IR_Container::IR_Container (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_Container::IR_Container (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -6864,14 +6864,14 @@ IR_Container_var::operator= (const ::IR_Container_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Container_var::operator const ::IR_Container_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_Container_var::operator ::IR_Container_ptr &() // cast 
+ACE_INLINE
+IR_Container_var::operator ::IR_Container_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -6963,7 +6963,7 @@ IR_Container_out::operator= (IR_Container_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Container_out::operator ::IR_Container_ptr &() // cast
 {
   return this->ptr_;
@@ -7051,20 +7051,20 @@ IR_Container::Description_var::operator const ::IR_Container::Description &() co
 }
 
 ACE_INLINE
-IR_Container::Description_var::operator ::IR_Container::Description &() // cast 
+IR_Container::Description_var::operator ::IR_Container::Description &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_Container::Description_var::operator ::IR_Container::Description &() const // cast 
+IR_Container::Description_var::operator ::IR_Container::Description &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_Container::Description_var::operator ::IR_Container::Description *&() // cast 
+IR_Container::Description_var::operator ::IR_Container::Description *&() // cast
 {
   return this->ptr_;
 }
@@ -7081,7 +7081,7 @@ IR_Container::Description_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_Container::Description *&
 IR_Container::Description_var::out (void)
 {
@@ -7142,7 +7142,7 @@ IR_Container::Description_out::operator= (Description *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Container::Description_out::operator ::IR_Container::Description *&() // cast
 {
   return this->ptr_;
@@ -7162,7 +7162,7 @@ IR_Container::Description_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_
 
@@ -7175,24 +7175,24 @@ IR_Container::Description_out::operator-> (void)
     ACE_NEW_RETURN (retval, IR_Container::Description[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (IR_Container::Description *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -7201,7 +7201,7 @@ IR_Container::Description_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
   // Copy constructor.
@@ -7211,10 +7211,10 @@ IR_Container::Description_out::operator-> (void)
     {
       IR_Container::Description *tmp1 = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (this->maximum_);
       IR_Container::Description * const tmp2 = ACE_reinterpret_cast (IR_Container::Description * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -7222,14 +7222,14 @@ IR_Container::Description_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &
   IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -7242,18 +7242,18 @@ IR_Container::Description_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_Container::Description *tmp1 = ACE_reinterpret_cast (IR_Container::Description *, this->buffer_);
     IR_Container::Description * const tmp2 = ACE_reinterpret_cast (IR_Container::Description * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_Container::Description &
   IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i)
@@ -7263,7 +7263,7 @@ IR_Container::Description_out::operator-> (void)
     IR_Container::Description* tmp = ACE_reinterpret_cast(IR_Container::Description*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_Container::Description &
   IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -7272,9 +7272,9 @@ IR_Container::Description_out::operator-> (void)
     IR_Container::Description * const tmp = ACE_reinterpret_cast (IR_Container::Description* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_Container::Description *
   IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -7286,7 +7286,7 @@ IR_Container::Description_out::operator-> (void)
       {
         result = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -7308,13 +7308,13 @@ IR_Container::Description_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_Container::Description *
   IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_Container::Description * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -7331,11 +7331,11 @@ IR_Container::Description_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
 #define _IR_CONTAINER_DESCRIPTIONSEQ_CI_
@@ -7400,27 +7400,27 @@ IR_Container::DescriptionSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Container::DescriptionSeq_var::operator const ::IR_Container::DescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() // cast 
+ACE_INLINE
+IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() const // cast 
+ACE_INLINE
+IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq *&() // cast 
+IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -7443,7 +7443,7 @@ IR_Container::DescriptionSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_Container::DescriptionSeq *&
 IR_Container::DescriptionSeq_var::out (void)
 {
@@ -7504,7 +7504,7 @@ IR_Container::DescriptionSeq_out::operator= (DescriptionSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Container::DescriptionSeq_out::operator ::IR_Container::DescriptionSeq *&() // cast
 {
   return this->ptr_;
@@ -7536,8 +7536,8 @@ IR_Repository::IR_Repository (void) // default constructor
 {}
 
 ACE_INLINE
-IR_Repository::IR_Repository (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_Repository::IR_Repository (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -7599,14 +7599,14 @@ IR_Repository_var::operator= (const ::IR_Repository_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Repository_var::operator const ::IR_Repository_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_Repository_var::operator ::IR_Repository_ptr &() // cast 
+ACE_INLINE
+IR_Repository_var::operator ::IR_Repository_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -7698,7 +7698,7 @@ IR_Repository_out::operator= (IR_Repository_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_Repository_out::operator ::IR_Repository_ptr &() // cast
 {
   return this->ptr_;
@@ -7724,8 +7724,8 @@ IR_ComponentRepository::IR_ComponentRepository (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ComponentRepository::IR_ComponentRepository (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ComponentRepository::IR_ComponentRepository (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -7787,14 +7787,14 @@ IR_ComponentRepository_var::operator= (const ::IR_ComponentRepository_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ComponentRepository_var::operator const ::IR_ComponentRepository_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ComponentRepository_var::operator ::IR_ComponentRepository_ptr &() // cast 
+ACE_INLINE
+IR_ComponentRepository_var::operator ::IR_ComponentRepository_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -7886,7 +7886,7 @@ IR_ComponentRepository_out::operator= (IR_ComponentRepository_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ComponentRepository_out::operator ::IR_ComponentRepository_ptr &() // cast
 {
   return this->ptr_;
@@ -7912,8 +7912,8 @@ IR_ModuleDef::IR_ModuleDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ModuleDef::IR_ModuleDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ModuleDef::IR_ModuleDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -7975,14 +7975,14 @@ IR_ModuleDef_var::operator= (const ::IR_ModuleDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ModuleDef_var::operator const ::IR_ModuleDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ModuleDef_var::operator ::IR_ModuleDef_ptr &() // cast 
+ACE_INLINE
+IR_ModuleDef_var::operator ::IR_ModuleDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -8074,7 +8074,7 @@ IR_ModuleDef_out::operator= (IR_ModuleDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ModuleDef_out::operator ::IR_ModuleDef_ptr &() // cast
 {
   return this->ptr_;
@@ -8162,20 +8162,20 @@ IR_ModuleDescription_var::operator const ::IR_ModuleDescription &() const // cas
 }
 
 ACE_INLINE
-IR_ModuleDescription_var::operator ::IR_ModuleDescription &() // cast 
+IR_ModuleDescription_var::operator ::IR_ModuleDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_ModuleDescription_var::operator ::IR_ModuleDescription &() const // cast 
+IR_ModuleDescription_var::operator ::IR_ModuleDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ModuleDescription_var::operator ::IR_ModuleDescription *&() // cast 
+IR_ModuleDescription_var::operator ::IR_ModuleDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -8192,7 +8192,7 @@ IR_ModuleDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ModuleDescription *&
 IR_ModuleDescription_var::out (void)
 {
@@ -8253,7 +8253,7 @@ IR_ModuleDescription_out::operator= (IR_ModuleDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ModuleDescription_out::operator ::IR_ModuleDescription *&() // cast
 {
   return this->ptr_;
@@ -8276,8 +8276,8 @@ IR_ConstantDef::IR_ConstantDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ConstantDef::IR_ConstantDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ConstantDef::IR_ConstantDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -8339,14 +8339,14 @@ IR_ConstantDef_var::operator= (const ::IR_ConstantDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ConstantDef_var::operator const ::IR_ConstantDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ConstantDef_var::operator ::IR_ConstantDef_ptr &() // cast 
+ACE_INLINE
+IR_ConstantDef_var::operator ::IR_ConstantDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -8438,7 +8438,7 @@ IR_ConstantDef_out::operator= (IR_ConstantDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ConstantDef_out::operator ::IR_ConstantDef_ptr &() // cast
 {
   return this->ptr_;
@@ -8526,20 +8526,20 @@ IR_ConstantDescription_var::operator const ::IR_ConstantDescription &() const //
 }
 
 ACE_INLINE
-IR_ConstantDescription_var::operator ::IR_ConstantDescription &() // cast 
+IR_ConstantDescription_var::operator ::IR_ConstantDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_ConstantDescription_var::operator ::IR_ConstantDescription &() const // cast 
+IR_ConstantDescription_var::operator ::IR_ConstantDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ConstantDescription_var::operator ::IR_ConstantDescription *&() // cast 
+IR_ConstantDescription_var::operator ::IR_ConstantDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -8556,7 +8556,7 @@ IR_ConstantDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ConstantDescription *&
 IR_ConstantDescription_var::out (void)
 {
@@ -8617,7 +8617,7 @@ IR_ConstantDescription_out::operator= (IR_ConstantDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ConstantDescription_out::operator ::IR_ConstantDescription *&() // cast
 {
   return this->ptr_;
@@ -8640,8 +8640,8 @@ IR_TypedefDef::IR_TypedefDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_TypedefDef::IR_TypedefDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_TypedefDef::IR_TypedefDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -8703,14 +8703,14 @@ IR_TypedefDef_var::operator= (const ::IR_TypedefDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_TypedefDef_var::operator const ::IR_TypedefDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_TypedefDef_var::operator ::IR_TypedefDef_ptr &() // cast 
+ACE_INLINE
+IR_TypedefDef_var::operator ::IR_TypedefDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -8802,7 +8802,7 @@ IR_TypedefDef_out::operator= (IR_TypedefDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_TypedefDef_out::operator ::IR_TypedefDef_ptr &() // cast
 {
   return this->ptr_;
@@ -8890,20 +8890,20 @@ IR_TypeDescription_var::operator const ::IR_TypeDescription &() const // cast
 }
 
 ACE_INLINE
-IR_TypeDescription_var::operator ::IR_TypeDescription &() // cast 
+IR_TypeDescription_var::operator ::IR_TypeDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_TypeDescription_var::operator ::IR_TypeDescription &() const // cast 
+IR_TypeDescription_var::operator ::IR_TypeDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_TypeDescription_var::operator ::IR_TypeDescription *&() // cast 
+IR_TypeDescription_var::operator ::IR_TypeDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -8920,7 +8920,7 @@ IR_TypeDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_TypeDescription *&
 IR_TypeDescription_var::out (void)
 {
@@ -8981,7 +8981,7 @@ IR_TypeDescription_out::operator= (IR_TypeDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_TypeDescription_out::operator ::IR_TypeDescription *&() // cast
 {
   return this->ptr_;
@@ -9004,8 +9004,8 @@ IR_StructDef::IR_StructDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_StructDef::IR_StructDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_StructDef::IR_StructDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -9067,14 +9067,14 @@ IR_StructDef_var::operator= (const ::IR_StructDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_StructDef_var::operator const ::IR_StructDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_StructDef_var::operator ::IR_StructDef_ptr &() // cast 
+ACE_INLINE
+IR_StructDef_var::operator ::IR_StructDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -9166,7 +9166,7 @@ IR_StructDef_out::operator= (IR_StructDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_StructDef_out::operator ::IR_StructDef_ptr &() // cast
 {
   return this->ptr_;
@@ -9192,8 +9192,8 @@ IR_UnionDef::IR_UnionDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_UnionDef::IR_UnionDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_UnionDef::IR_UnionDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -9255,14 +9255,14 @@ IR_UnionDef_var::operator= (const ::IR_UnionDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UnionDef_var::operator const ::IR_UnionDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_UnionDef_var::operator ::IR_UnionDef_ptr &() // cast 
+ACE_INLINE
+IR_UnionDef_var::operator ::IR_UnionDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -9354,7 +9354,7 @@ IR_UnionDef_out::operator= (IR_UnionDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UnionDef_out::operator ::IR_UnionDef_ptr &() // cast
 {
   return this->ptr_;
@@ -9380,8 +9380,8 @@ IR_EnumDef::IR_EnumDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_EnumDef::IR_EnumDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_EnumDef::IR_EnumDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -9443,14 +9443,14 @@ IR_EnumDef_var::operator= (const ::IR_EnumDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EnumDef_var::operator const ::IR_EnumDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_EnumDef_var::operator ::IR_EnumDef_ptr &() // cast 
+ACE_INLINE
+IR_EnumDef_var::operator ::IR_EnumDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -9542,7 +9542,7 @@ IR_EnumDef_out::operator= (IR_EnumDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EnumDef_out::operator ::IR_EnumDef_ptr &() // cast
 {
   return this->ptr_;
@@ -9568,8 +9568,8 @@ IR_AliasDef::IR_AliasDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_AliasDef::IR_AliasDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_AliasDef::IR_AliasDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -9631,14 +9631,14 @@ IR_AliasDef_var::operator= (const ::IR_AliasDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_AliasDef_var::operator const ::IR_AliasDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_AliasDef_var::operator ::IR_AliasDef_ptr &() // cast 
+ACE_INLINE
+IR_AliasDef_var::operator ::IR_AliasDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -9730,7 +9730,7 @@ IR_AliasDef_out::operator= (IR_AliasDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_AliasDef_out::operator ::IR_AliasDef_ptr &() // cast
 {
   return this->ptr_;
@@ -9756,8 +9756,8 @@ IR_NativeDef::IR_NativeDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_NativeDef::IR_NativeDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_NativeDef::IR_NativeDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -9819,14 +9819,14 @@ IR_NativeDef_var::operator= (const ::IR_NativeDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_NativeDef_var::operator const ::IR_NativeDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_NativeDef_var::operator ::IR_NativeDef_ptr &() // cast 
+ACE_INLINE
+IR_NativeDef_var::operator ::IR_NativeDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -9918,7 +9918,7 @@ IR_NativeDef_out::operator= (IR_NativeDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_NativeDef_out::operator ::IR_NativeDef_ptr &() // cast
 {
   return this->ptr_;
@@ -9944,8 +9944,8 @@ IR_PrimitiveDef::IR_PrimitiveDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_PrimitiveDef::IR_PrimitiveDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_PrimitiveDef::IR_PrimitiveDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -10007,14 +10007,14 @@ IR_PrimitiveDef_var::operator= (const ::IR_PrimitiveDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_PrimitiveDef_var::operator const ::IR_PrimitiveDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_PrimitiveDef_var::operator ::IR_PrimitiveDef_ptr &() // cast 
+ACE_INLINE
+IR_PrimitiveDef_var::operator ::IR_PrimitiveDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -10106,7 +10106,7 @@ IR_PrimitiveDef_out::operator= (IR_PrimitiveDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_PrimitiveDef_out::operator ::IR_PrimitiveDef_ptr &() // cast
 {
   return this->ptr_;
@@ -10132,8 +10132,8 @@ IR_StringDef::IR_StringDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_StringDef::IR_StringDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_StringDef::IR_StringDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -10195,14 +10195,14 @@ IR_StringDef_var::operator= (const ::IR_StringDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_StringDef_var::operator const ::IR_StringDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_StringDef_var::operator ::IR_StringDef_ptr &() // cast 
+ACE_INLINE
+IR_StringDef_var::operator ::IR_StringDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -10294,7 +10294,7 @@ IR_StringDef_out::operator= (IR_StringDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_StringDef_out::operator ::IR_StringDef_ptr &() // cast
 {
   return this->ptr_;
@@ -10320,8 +10320,8 @@ IR_WstringDef::IR_WstringDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_WstringDef::IR_WstringDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_WstringDef::IR_WstringDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -10383,14 +10383,14 @@ IR_WstringDef_var::operator= (const ::IR_WstringDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_WstringDef_var::operator const ::IR_WstringDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_WstringDef_var::operator ::IR_WstringDef_ptr &() // cast 
+ACE_INLINE
+IR_WstringDef_var::operator ::IR_WstringDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -10482,7 +10482,7 @@ IR_WstringDef_out::operator= (IR_WstringDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_WstringDef_out::operator ::IR_WstringDef_ptr &() // cast
 {
   return this->ptr_;
@@ -10508,8 +10508,8 @@ IR_FixedDef::IR_FixedDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_FixedDef::IR_FixedDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_FixedDef::IR_FixedDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -10571,14 +10571,14 @@ IR_FixedDef_var::operator= (const ::IR_FixedDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_FixedDef_var::operator const ::IR_FixedDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_FixedDef_var::operator ::IR_FixedDef_ptr &() // cast 
+ACE_INLINE
+IR_FixedDef_var::operator ::IR_FixedDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -10670,7 +10670,7 @@ IR_FixedDef_out::operator= (IR_FixedDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_FixedDef_out::operator ::IR_FixedDef_ptr &() // cast
 {
   return this->ptr_;
@@ -10696,8 +10696,8 @@ IR_SequenceDef::IR_SequenceDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_SequenceDef::IR_SequenceDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_SequenceDef::IR_SequenceDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -10759,14 +10759,14 @@ IR_SequenceDef_var::operator= (const ::IR_SequenceDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_SequenceDef_var::operator const ::IR_SequenceDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_SequenceDef_var::operator ::IR_SequenceDef_ptr &() // cast 
+ACE_INLINE
+IR_SequenceDef_var::operator ::IR_SequenceDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -10858,7 +10858,7 @@ IR_SequenceDef_out::operator= (IR_SequenceDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_SequenceDef_out::operator ::IR_SequenceDef_ptr &() // cast
 {
   return this->ptr_;
@@ -10884,8 +10884,8 @@ IR_ArrayDef::IR_ArrayDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ArrayDef::IR_ArrayDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ArrayDef::IR_ArrayDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -10947,14 +10947,14 @@ IR_ArrayDef_var::operator= (const ::IR_ArrayDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ArrayDef_var::operator const ::IR_ArrayDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ArrayDef_var::operator ::IR_ArrayDef_ptr &() // cast 
+ACE_INLINE
+IR_ArrayDef_var::operator ::IR_ArrayDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -11046,7 +11046,7 @@ IR_ArrayDef_out::operator= (IR_ArrayDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ArrayDef_out::operator ::IR_ArrayDef_ptr &() // cast
 {
   return this->ptr_;
@@ -11072,8 +11072,8 @@ IR_ExceptionDef::IR_ExceptionDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ExceptionDef::IR_ExceptionDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ExceptionDef::IR_ExceptionDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -11135,14 +11135,14 @@ IR_ExceptionDef_var::operator= (const ::IR_ExceptionDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ExceptionDef_var::operator const ::IR_ExceptionDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ExceptionDef_var::operator ::IR_ExceptionDef_ptr &() // cast 
+ACE_INLINE
+IR_ExceptionDef_var::operator ::IR_ExceptionDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -11234,7 +11234,7 @@ IR_ExceptionDef_out::operator= (IR_ExceptionDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ExceptionDef_out::operator ::IR_ExceptionDef_ptr &() // cast
 {
   return this->ptr_;
@@ -11322,20 +11322,20 @@ IR_ExceptionDescription_var::operator const ::IR_ExceptionDescription &() const
 }
 
 ACE_INLINE
-IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() // cast 
+IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() const // cast 
+IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ExceptionDescription_var::operator ::IR_ExceptionDescription *&() // cast 
+IR_ExceptionDescription_var::operator ::IR_ExceptionDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -11352,7 +11352,7 @@ IR_ExceptionDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ExceptionDescription *&
 IR_ExceptionDescription_var::out (void)
 {
@@ -11413,7 +11413,7 @@ IR_ExceptionDescription_out::operator= (IR_ExceptionDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ExceptionDescription_out::operator ::IR_ExceptionDescription *&() // cast
 {
   return this->ptr_;
@@ -11433,7 +11433,7 @@ IR_ExceptionDescription_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_
 
@@ -11441,34 +11441,34 @@ IR_ExceptionDescription_out::operator-> (void)
   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
   {
     IR_ExceptionDef **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, IR_ExceptionDef*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = IR_ExceptionDef::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (IR_ExceptionDef **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -11477,7 +11477,7 @@ IR_ExceptionDescription_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -11486,10 +11486,10 @@ IR_ExceptionDescription_out::operator-> (void)
     {
       IR_ExceptionDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (this->maximum_);
       IR_ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = IR_ExceptionDef::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -11497,17 +11497,17 @@ IR_ExceptionDescription_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &
   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       IR_ExceptionDef **tmp = ACE_reinterpret_cast (IR_ExceptionDef **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -11521,18 +11521,18 @@ IR_ExceptionDescription_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_ExceptionDef **tmp1 = ACE_reinterpret_cast (IR_ExceptionDef **, this->buffer_);
     IR_ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = IR_ExceptionDef::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>
   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -11541,7 +11541,7 @@ IR_ExceptionDescription_out::operator-> (void)
     IR_ExceptionDef ** const tmp = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE IR_ExceptionDef* *
   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -11553,7 +11553,7 @@ IR_ExceptionDescription_out::operator-> (void)
       {
         result = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -11575,18 +11575,18 @@ IR_ExceptionDescription_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_ExceptionDef* *
   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_ExceptionDef ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_EXCEPTIONDEFSEQ_CI_)
 #define _IR_EXCEPTIONDEFSEQ_CI_
@@ -11651,32 +11651,32 @@ IR_ExceptionDefSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ExceptionDefSeq_var::operator const ::IR_ExceptionDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() // cast 
+ACE_INLINE
+IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() const // cast 
+ACE_INLINE
+IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq *&() // cast 
+IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var>
 IR_ExceptionDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -11694,7 +11694,7 @@ IR_ExceptionDefSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ExceptionDefSeq *&
 IR_ExceptionDefSeq_var::out (void)
 {
@@ -11755,7 +11755,7 @@ IR_ExceptionDefSeq_out::operator= (IR_ExceptionDefSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ExceptionDefSeq_out::operator ::IR_ExceptionDefSeq *&() // cast
 {
   return this->ptr_;
@@ -11773,7 +11773,7 @@ IR_ExceptionDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var> 
+ACE_INLINE TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var>
 IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -11784,7 +11784,7 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_
 
@@ -11797,24 +11797,24 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
     ACE_NEW_RETURN (retval, IR_ExceptionDescription[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (IR_ExceptionDescription *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -11823,7 +11823,7 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
   // Copy constructor.
@@ -11833,10 +11833,10 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
     {
       IR_ExceptionDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (this->maximum_);
       IR_ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR_ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -11844,14 +11844,14 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &
   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -11864,18 +11864,18 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_ExceptionDescription *tmp1 = ACE_reinterpret_cast (IR_ExceptionDescription *, this->buffer_);
     IR_ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR_ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_ExceptionDescription &
   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i)
@@ -11885,7 +11885,7 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
     IR_ExceptionDescription* tmp = ACE_reinterpret_cast(IR_ExceptionDescription*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_ExceptionDescription &
   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -11894,9 +11894,9 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
     IR_ExceptionDescription * const tmp = ACE_reinterpret_cast (IR_ExceptionDescription* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_ExceptionDescription *
   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -11908,7 +11908,7 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -11930,13 +11930,13 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_ExceptionDescription *
   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_ExceptionDescription * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -11953,11 +11953,11 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_EXCDESCRIPTIONSEQ_CI_)
 #define _IR_EXCDESCRIPTIONSEQ_CI_
@@ -12022,27 +12022,27 @@ IR_ExcDescriptionSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ExcDescriptionSeq_var::operator const ::IR_ExcDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() // cast 
+ACE_INLINE
+IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() const // cast 
+ACE_INLINE
+IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq *&() // cast 
+IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -12065,7 +12065,7 @@ IR_ExcDescriptionSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ExcDescriptionSeq *&
 IR_ExcDescriptionSeq_var::out (void)
 {
@@ -12126,7 +12126,7 @@ IR_ExcDescriptionSeq_out::operator= (IR_ExcDescriptionSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ExcDescriptionSeq_out::operator ::IR_ExcDescriptionSeq *&() // cast
 {
   return this->ptr_;
@@ -12158,8 +12158,8 @@ IR_AttributeDef::IR_AttributeDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_AttributeDef::IR_AttributeDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_AttributeDef::IR_AttributeDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -12221,14 +12221,14 @@ IR_AttributeDef_var::operator= (const ::IR_AttributeDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_AttributeDef_var::operator const ::IR_AttributeDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_AttributeDef_var::operator ::IR_AttributeDef_ptr &() // cast 
+ACE_INLINE
+IR_AttributeDef_var::operator ::IR_AttributeDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -12320,7 +12320,7 @@ IR_AttributeDef_out::operator= (IR_AttributeDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_AttributeDef_out::operator ::IR_AttributeDef_ptr &() // cast
 {
   return this->ptr_;
@@ -12408,20 +12408,20 @@ IR_AttributeDescription_var::operator const ::IR_AttributeDescription &() const
 }
 
 ACE_INLINE
-IR_AttributeDescription_var::operator ::IR_AttributeDescription &() // cast 
+IR_AttributeDescription_var::operator ::IR_AttributeDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_AttributeDescription_var::operator ::IR_AttributeDescription &() const // cast 
+IR_AttributeDescription_var::operator ::IR_AttributeDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_AttributeDescription_var::operator ::IR_AttributeDescription *&() // cast 
+IR_AttributeDescription_var::operator ::IR_AttributeDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -12438,7 +12438,7 @@ IR_AttributeDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_AttributeDescription *&
 IR_AttributeDescription_var::out (void)
 {
@@ -12499,7 +12499,7 @@ IR_AttributeDescription_out::operator= (IR_AttributeDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_AttributeDescription_out::operator ::IR_AttributeDescription *&() // cast
 {
   return this->ptr_;
@@ -12584,20 +12584,20 @@ IR_ParameterDescription_var::operator const ::IR_ParameterDescription &() const
 }
 
 ACE_INLINE
-IR_ParameterDescription_var::operator ::IR_ParameterDescription &() // cast 
+IR_ParameterDescription_var::operator ::IR_ParameterDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_ParameterDescription_var::operator ::IR_ParameterDescription &() const // cast 
+IR_ParameterDescription_var::operator ::IR_ParameterDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ParameterDescription_var::operator ::IR_ParameterDescription *&() // cast 
+IR_ParameterDescription_var::operator ::IR_ParameterDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -12614,7 +12614,7 @@ IR_ParameterDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ParameterDescription *&
 IR_ParameterDescription_var::out (void)
 {
@@ -12675,7 +12675,7 @@ IR_ParameterDescription_out::operator= (IR_ParameterDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ParameterDescription_out::operator ::IR_ParameterDescription *&() // cast
 {
   return this->ptr_;
@@ -12695,7 +12695,7 @@ IR_ParameterDescription_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_
 
@@ -12708,24 +12708,24 @@ IR_ParameterDescription_out::operator-> (void)
     ACE_NEW_RETURN (retval, IR_ParameterDescription[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (IR_ParameterDescription *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -12734,7 +12734,7 @@ IR_ParameterDescription_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
   // Copy constructor.
@@ -12744,10 +12744,10 @@ IR_ParameterDescription_out::operator-> (void)
     {
       IR_ParameterDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (this->maximum_);
       IR_ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR_ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -12755,14 +12755,14 @@ IR_ParameterDescription_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &
   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -12775,18 +12775,18 @@ IR_ParameterDescription_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_ParameterDescription *tmp1 = ACE_reinterpret_cast (IR_ParameterDescription *, this->buffer_);
     IR_ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR_ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_ParameterDescription &
   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i)
@@ -12796,7 +12796,7 @@ IR_ParameterDescription_out::operator-> (void)
     IR_ParameterDescription* tmp = ACE_reinterpret_cast(IR_ParameterDescription*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_ParameterDescription &
   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -12805,9 +12805,9 @@ IR_ParameterDescription_out::operator-> (void)
     IR_ParameterDescription * const tmp = ACE_reinterpret_cast (IR_ParameterDescription* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_ParameterDescription *
   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -12819,7 +12819,7 @@ IR_ParameterDescription_out::operator-> (void)
       {
         result = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -12841,13 +12841,13 @@ IR_ParameterDescription_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_ParameterDescription *
   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_ParameterDescription * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -12864,11 +12864,11 @@ IR_ParameterDescription_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_PARDESCRIPTIONSEQ_CI_)
 #define _IR_PARDESCRIPTIONSEQ_CI_
@@ -12933,27 +12933,27 @@ IR_ParDescriptionSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ParDescriptionSeq_var::operator const ::IR_ParDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() // cast 
+ACE_INLINE
+IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() const // cast 
+ACE_INLINE
+IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq *&() // cast 
+IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -12976,7 +12976,7 @@ IR_ParDescriptionSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ParDescriptionSeq *&
 IR_ParDescriptionSeq_var::out (void)
 {
@@ -13037,7 +13037,7 @@ IR_ParDescriptionSeq_out::operator= (IR_ParDescriptionSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ParDescriptionSeq_out::operator ::IR_ParDescriptionSeq *&() // cast
 {
   return this->ptr_;
@@ -13128,32 +13128,32 @@ IR_ContextIdSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ContextIdSeq_var::operator const ::IR_ContextIdSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() // cast 
+ACE_INLINE
+IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() const // cast 
+ACE_INLINE
+IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ContextIdSeq_var::operator ::IR_ContextIdSeq *&() // cast 
+IR_ContextIdSeq_var::operator ::IR_ContextIdSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager 
+ACE_INLINE TAO_SeqElem_String_Manager
 IR_ContextIdSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -13171,7 +13171,7 @@ IR_ContextIdSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ContextIdSeq *&
 IR_ContextIdSeq_var::out (void)
 {
@@ -13232,7 +13232,7 @@ IR_ContextIdSeq_out::operator= (IR_ContextIdSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ContextIdSeq_out::operator ::IR_ContextIdSeq *&() // cast
 {
   return this->ptr_;
@@ -13250,7 +13250,7 @@ IR_ContextIdSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager 
+ACE_INLINE TAO_SeqElem_String_Manager
 IR_ContextIdSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -13264,8 +13264,8 @@ IR_OperationDef::IR_OperationDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_OperationDef::IR_OperationDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_OperationDef::IR_OperationDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -13327,14 +13327,14 @@ IR_OperationDef_var::operator= (const ::IR_OperationDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_OperationDef_var::operator const ::IR_OperationDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_OperationDef_var::operator ::IR_OperationDef_ptr &() // cast 
+ACE_INLINE
+IR_OperationDef_var::operator ::IR_OperationDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -13426,7 +13426,7 @@ IR_OperationDef_out::operator= (IR_OperationDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_OperationDef_out::operator ::IR_OperationDef_ptr &() // cast
 {
   return this->ptr_;
@@ -13514,20 +13514,20 @@ IR_OperationDescription_var::operator const ::IR_OperationDescription &() const
 }
 
 ACE_INLINE
-IR_OperationDescription_var::operator ::IR_OperationDescription &() // cast 
+IR_OperationDescription_var::operator ::IR_OperationDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_OperationDescription_var::operator ::IR_OperationDescription &() const // cast 
+IR_OperationDescription_var::operator ::IR_OperationDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_OperationDescription_var::operator ::IR_OperationDescription *&() // cast 
+IR_OperationDescription_var::operator ::IR_OperationDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -13544,7 +13544,7 @@ IR_OperationDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_OperationDescription *&
 IR_OperationDescription_var::out (void)
 {
@@ -13605,7 +13605,7 @@ IR_OperationDescription_out::operator= (IR_OperationDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_OperationDescription_out::operator ::IR_OperationDescription *&() // cast
 {
   return this->ptr_;
@@ -13687,32 +13687,32 @@ IR_RepositoryIdSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_RepositoryIdSeq_var::operator const ::IR_RepositoryIdSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() // cast 
+ACE_INLINE
+IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() const // cast 
+ACE_INLINE
+IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq *&() // cast 
+IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager 
+ACE_INLINE TAO_SeqElem_String_Manager
 IR_RepositoryIdSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -13730,7 +13730,7 @@ IR_RepositoryIdSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_RepositoryIdSeq *&
 IR_RepositoryIdSeq_var::out (void)
 {
@@ -13791,7 +13791,7 @@ IR_RepositoryIdSeq_out::operator= (IR_RepositoryIdSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_RepositoryIdSeq_out::operator ::IR_RepositoryIdSeq *&() // cast
 {
   return this->ptr_;
@@ -13809,7 +13809,7 @@ IR_RepositoryIdSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager 
+ACE_INLINE TAO_SeqElem_String_Manager
 IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -13820,7 +13820,7 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_
 
@@ -13833,24 +13833,24 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
     ACE_NEW_RETURN (retval, IR_OperationDescription[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (IR_OperationDescription *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -13859,7 +13859,7 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
   // Copy constructor.
@@ -13869,10 +13869,10 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
     {
       IR_OperationDescription *tmp1 = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (this->maximum_);
       IR_OperationDescription * const tmp2 = ACE_reinterpret_cast (IR_OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -13880,14 +13880,14 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &
   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -13900,18 +13900,18 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_OperationDescription *tmp1 = ACE_reinterpret_cast (IR_OperationDescription *, this->buffer_);
     IR_OperationDescription * const tmp2 = ACE_reinterpret_cast (IR_OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_OperationDescription &
   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i)
@@ -13921,7 +13921,7 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
     IR_OperationDescription* tmp = ACE_reinterpret_cast(IR_OperationDescription*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_OperationDescription &
   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -13930,9 +13930,9 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
     IR_OperationDescription * const tmp = ACE_reinterpret_cast (IR_OperationDescription* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_OperationDescription *
   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -13944,7 +13944,7 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -13966,13 +13966,13 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_OperationDescription *
   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_OperationDescription * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -13989,11 +13989,11 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_OPDESCRIPTIONSEQ_CI_)
 #define _IR_OPDESCRIPTIONSEQ_CI_
@@ -14058,27 +14058,27 @@ IR_OpDescriptionSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_OpDescriptionSeq_var::operator const ::IR_OpDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() // cast 
+ACE_INLINE
+IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() const // cast 
+ACE_INLINE
+IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq *&() // cast 
+IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -14101,7 +14101,7 @@ IR_OpDescriptionSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_OpDescriptionSeq *&
 IR_OpDescriptionSeq_var::out (void)
 {
@@ -14162,7 +14162,7 @@ IR_OpDescriptionSeq_out::operator= (IR_OpDescriptionSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_OpDescriptionSeq_out::operator ::IR_OpDescriptionSeq *&() // cast
 {
   return this->ptr_;
@@ -14191,7 +14191,7 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_
 
@@ -14204,24 +14204,24 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
     ACE_NEW_RETURN (retval, IR_AttributeDescription[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (IR_AttributeDescription *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -14230,7 +14230,7 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
   // Copy constructor.
@@ -14240,10 +14240,10 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
     {
       IR_AttributeDescription *tmp1 = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (this->maximum_);
       IR_AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR_AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -14251,14 +14251,14 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &
   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -14271,18 +14271,18 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_AttributeDescription *tmp1 = ACE_reinterpret_cast (IR_AttributeDescription *, this->buffer_);
     IR_AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR_AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_AttributeDescription &
   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i)
@@ -14292,7 +14292,7 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
     IR_AttributeDescription* tmp = ACE_reinterpret_cast(IR_AttributeDescription*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_AttributeDescription &
   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -14301,9 +14301,9 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
     IR_AttributeDescription * const tmp = ACE_reinterpret_cast (IR_AttributeDescription* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_AttributeDescription *
   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -14315,7 +14315,7 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -14337,13 +14337,13 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_AttributeDescription *
   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_AttributeDescription * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -14360,11 +14360,11 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_ATTRDESCRIPTIONSEQ_CI_)
 #define _IR_ATTRDESCRIPTIONSEQ_CI_
@@ -14429,27 +14429,27 @@ IR_AttrDescriptionSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_AttrDescriptionSeq_var::operator const ::IR_AttrDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() // cast 
+ACE_INLINE
+IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() const // cast 
+ACE_INLINE
+IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq *&() // cast 
+IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -14472,7 +14472,7 @@ IR_AttrDescriptionSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_AttrDescriptionSeq *&
 IR_AttrDescriptionSeq_var::out (void)
 {
@@ -14533,7 +14533,7 @@ IR_AttrDescriptionSeq_out::operator= (IR_AttrDescriptionSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_AttrDescriptionSeq_out::operator ::IR_AttrDescriptionSeq *&() // cast
 {
   return this->ptr_;
@@ -14565,8 +14565,8 @@ IR_InterfaceDef::IR_InterfaceDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_InterfaceDef::IR_InterfaceDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_InterfaceDef::IR_InterfaceDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -14628,14 +14628,14 @@ IR_InterfaceDef_var::operator= (const ::IR_InterfaceDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_InterfaceDef_var::operator const ::IR_InterfaceDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_InterfaceDef_var::operator ::IR_InterfaceDef_ptr &() // cast 
+ACE_INLINE
+IR_InterfaceDef_var::operator ::IR_InterfaceDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -14727,7 +14727,7 @@ IR_InterfaceDef_out::operator= (IR_InterfaceDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_InterfaceDef_out::operator ::IR_InterfaceDef_ptr &() // cast
 {
   return this->ptr_;
@@ -14815,20 +14815,20 @@ IR_InterfaceDescription_var::operator const ::IR_InterfaceDescription &() const
 }
 
 ACE_INLINE
-IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() // cast 
+IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() const // cast 
+IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_InterfaceDescription_var::operator ::IR_InterfaceDescription *&() // cast 
+IR_InterfaceDescription_var::operator ::IR_InterfaceDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -14845,7 +14845,7 @@ IR_InterfaceDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_InterfaceDescription *&
 IR_InterfaceDescription_var::out (void)
 {
@@ -14906,7 +14906,7 @@ IR_InterfaceDescription_out::operator= (IR_InterfaceDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_InterfaceDescription_out::operator ::IR_InterfaceDescription *&() // cast
 {
   return this->ptr_;
@@ -14991,20 +14991,20 @@ IR_ValueMember_var::operator const ::IR_ValueMember &() const // cast
 }
 
 ACE_INLINE
-IR_ValueMember_var::operator ::IR_ValueMember &() // cast 
+IR_ValueMember_var::operator ::IR_ValueMember &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_ValueMember_var::operator ::IR_ValueMember &() const // cast 
+IR_ValueMember_var::operator ::IR_ValueMember &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ValueMember_var::operator ::IR_ValueMember *&() // cast 
+IR_ValueMember_var::operator ::IR_ValueMember *&() // cast
 {
   return this->ptr_;
 }
@@ -15021,7 +15021,7 @@ IR_ValueMember_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ValueMember *&
 IR_ValueMember_var::out (void)
 {
@@ -15082,7 +15082,7 @@ IR_ValueMember_out::operator= (IR_ValueMember *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueMember_out::operator ::IR_ValueMember *&() // cast
 {
   return this->ptr_;
@@ -15102,7 +15102,7 @@ IR_ValueMember_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_
 
@@ -15115,24 +15115,24 @@ IR_ValueMember_out::operator-> (void)
     ACE_NEW_RETURN (retval, IR_ValueMember[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (IR_ValueMember *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -15141,7 +15141,7 @@ IR_ValueMember_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
   // Copy constructor.
@@ -15151,10 +15151,10 @@ IR_ValueMember_out::operator-> (void)
     {
       IR_ValueMember *tmp1 = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (this->maximum_);
       IR_ValueMember * const tmp2 = ACE_reinterpret_cast (IR_ValueMember * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -15162,14 +15162,14 @@ IR_ValueMember_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_IR_ValueMemberSeq &
   _TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -15182,18 +15182,18 @@ IR_ValueMember_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_ValueMember *tmp1 = ACE_reinterpret_cast (IR_ValueMember *, this->buffer_);
     IR_ValueMember * const tmp2 = ACE_reinterpret_cast (IR_ValueMember * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_ValueMember &
   _TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i)
@@ -15203,7 +15203,7 @@ IR_ValueMember_out::operator-> (void)
     IR_ValueMember* tmp = ACE_reinterpret_cast(IR_ValueMember*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_ValueMember &
   _TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -15212,9 +15212,9 @@ IR_ValueMember_out::operator-> (void)
     IR_ValueMember * const tmp = ACE_reinterpret_cast (IR_ValueMember* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_ValueMember *
   _TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -15226,7 +15226,7 @@ IR_ValueMember_out::operator-> (void)
       {
         result = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -15248,13 +15248,13 @@ IR_ValueMember_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_ValueMember *
   _TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_ValueMember * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_IR_ValueMemberSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -15271,11 +15271,11 @@ IR_ValueMember_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_VALUEMEMBERSEQ_CI_)
 #define _IR_VALUEMEMBERSEQ_CI_
@@ -15340,27 +15340,27 @@ IR_ValueMemberSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueMemberSeq_var::operator const ::IR_ValueMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() // cast 
+ACE_INLINE
+IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() const // cast 
+ACE_INLINE
+IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq *&() // cast 
+IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -15383,7 +15383,7 @@ IR_ValueMemberSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ValueMemberSeq *&
 IR_ValueMemberSeq_var::out (void)
 {
@@ -15444,7 +15444,7 @@ IR_ValueMemberSeq_out::operator= (IR_ValueMemberSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueMemberSeq_out::operator ::IR_ValueMemberSeq *&() // cast
 {
   return this->ptr_;
@@ -15476,8 +15476,8 @@ IR_ValueMemberDef::IR_ValueMemberDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ValueMemberDef::IR_ValueMemberDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ValueMemberDef::IR_ValueMemberDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -15539,14 +15539,14 @@ IR_ValueMemberDef_var::operator= (const ::IR_ValueMemberDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueMemberDef_var::operator const ::IR_ValueMemberDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ValueMemberDef_var::operator ::IR_ValueMemberDef_ptr &() // cast 
+ACE_INLINE
+IR_ValueMemberDef_var::operator ::IR_ValueMemberDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -15638,7 +15638,7 @@ IR_ValueMemberDef_out::operator= (IR_ValueMemberDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueMemberDef_out::operator ::IR_ValueMemberDef_ptr &() // cast
 {
   return this->ptr_;
@@ -15664,8 +15664,8 @@ IR_ValueDef::IR_ValueDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ValueDef::IR_ValueDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ValueDef::IR_ValueDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -15727,14 +15727,14 @@ IR_ValueDef_var::operator= (const ::IR_ValueDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueDef_var::operator const ::IR_ValueDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ValueDef_var::operator ::IR_ValueDef_ptr &() // cast 
+ACE_INLINE
+IR_ValueDef_var::operator ::IR_ValueDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -15826,7 +15826,7 @@ IR_ValueDef_out::operator= (IR_ValueDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueDef_out::operator ::IR_ValueDef_ptr &() // cast
 {
   return this->ptr_;
@@ -15914,20 +15914,20 @@ IR_ValueDescription_var::operator const ::IR_ValueDescription &() const // cast
 }
 
 ACE_INLINE
-IR_ValueDescription_var::operator ::IR_ValueDescription &() // cast 
+IR_ValueDescription_var::operator ::IR_ValueDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_ValueDescription_var::operator ::IR_ValueDescription &() const // cast 
+IR_ValueDescription_var::operator ::IR_ValueDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ValueDescription_var::operator ::IR_ValueDescription *&() // cast 
+IR_ValueDescription_var::operator ::IR_ValueDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -15944,7 +15944,7 @@ IR_ValueDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ValueDescription *&
 IR_ValueDescription_var::out (void)
 {
@@ -16005,7 +16005,7 @@ IR_ValueDescription_out::operator= (IR_ValueDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueDescription_out::operator ::IR_ValueDescription *&() // cast
 {
   return this->ptr_;
@@ -16028,8 +16028,8 @@ IR_ValueBoxDef::IR_ValueBoxDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ValueBoxDef::IR_ValueBoxDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ValueBoxDef::IR_ValueBoxDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -16091,14 +16091,14 @@ IR_ValueBoxDef_var::operator= (const ::IR_ValueBoxDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueBoxDef_var::operator const ::IR_ValueBoxDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ValueBoxDef_var::operator ::IR_ValueBoxDef_ptr &() // cast 
+ACE_INLINE
+IR_ValueBoxDef_var::operator ::IR_ValueBoxDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -16190,7 +16190,7 @@ IR_ValueBoxDef_out::operator= (IR_ValueBoxDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ValueBoxDef_out::operator ::IR_ValueBoxDef_ptr &() // cast
 {
   return this->ptr_;
@@ -16216,8 +16216,8 @@ IR_ProvidesDef::IR_ProvidesDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ProvidesDef::IR_ProvidesDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ProvidesDef::IR_ProvidesDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -16279,14 +16279,14 @@ IR_ProvidesDef_var::operator= (const ::IR_ProvidesDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ProvidesDef_var::operator const ::IR_ProvidesDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ProvidesDef_var::operator ::IR_ProvidesDef_ptr &() // cast 
+ACE_INLINE
+IR_ProvidesDef_var::operator ::IR_ProvidesDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -16378,7 +16378,7 @@ IR_ProvidesDef_out::operator= (IR_ProvidesDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ProvidesDef_out::operator ::IR_ProvidesDef_ptr &() // cast
 {
   return this->ptr_;
@@ -16466,20 +16466,20 @@ IR_ProvidesDescription_var::operator const ::IR_ProvidesDescription &() const //
 }
 
 ACE_INLINE
-IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() // cast 
+IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() const // cast 
+IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ProvidesDescription_var::operator ::IR_ProvidesDescription *&() // cast 
+IR_ProvidesDescription_var::operator ::IR_ProvidesDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -16496,7 +16496,7 @@ IR_ProvidesDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ProvidesDescription *&
 IR_ProvidesDescription_var::out (void)
 {
@@ -16557,7 +16557,7 @@ IR_ProvidesDescription_out::operator= (IR_ProvidesDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ProvidesDescription_out::operator ::IR_ProvidesDescription *&() // cast
 {
   return this->ptr_;
@@ -16580,8 +16580,8 @@ IR_UsesDef::IR_UsesDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_UsesDef::IR_UsesDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_UsesDef::IR_UsesDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -16643,14 +16643,14 @@ IR_UsesDef_var::operator= (const ::IR_UsesDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UsesDef_var::operator const ::IR_UsesDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_UsesDef_var::operator ::IR_UsesDef_ptr &() // cast 
+ACE_INLINE
+IR_UsesDef_var::operator ::IR_UsesDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -16742,7 +16742,7 @@ IR_UsesDef_out::operator= (IR_UsesDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UsesDef_out::operator ::IR_UsesDef_ptr &() // cast
 {
   return this->ptr_;
@@ -16830,20 +16830,20 @@ IR_UsesDescription_var::operator const ::IR_UsesDescription &() const // cast
 }
 
 ACE_INLINE
-IR_UsesDescription_var::operator ::IR_UsesDescription &() // cast 
+IR_UsesDescription_var::operator ::IR_UsesDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_UsesDescription_var::operator ::IR_UsesDescription &() const // cast 
+IR_UsesDescription_var::operator ::IR_UsesDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_UsesDescription_var::operator ::IR_UsesDescription *&() // cast 
+IR_UsesDescription_var::operator ::IR_UsesDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -16860,7 +16860,7 @@ IR_UsesDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_UsesDescription *&
 IR_UsesDescription_var::out (void)
 {
@@ -16921,7 +16921,7 @@ IR_UsesDescription_out::operator= (IR_UsesDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UsesDescription_out::operator ::IR_UsesDescription *&() // cast
 {
   return this->ptr_;
@@ -16941,7 +16941,7 @@ IR_UsesDescription_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_
 
@@ -16954,24 +16954,24 @@ IR_UsesDescription_out::operator-> (void)
     ACE_NEW_RETURN (retval, IR_ProvidesDescription[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (IR_ProvidesDescription *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -16980,7 +16980,7 @@ IR_UsesDescription_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
   // Copy constructor.
@@ -16990,10 +16990,10 @@ IR_UsesDescription_out::operator-> (void)
     {
       IR_ProvidesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->maximum_);
       IR_ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR_ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -17001,14 +17001,14 @@ IR_UsesDescription_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &
   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -17021,18 +17021,18 @@ IR_UsesDescription_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_ProvidesDescription *tmp1 = ACE_reinterpret_cast (IR_ProvidesDescription *, this->buffer_);
     IR_ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR_ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_ProvidesDescription &
   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i)
@@ -17042,7 +17042,7 @@ IR_UsesDescription_out::operator-> (void)
     IR_ProvidesDescription* tmp = ACE_reinterpret_cast(IR_ProvidesDescription*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_ProvidesDescription &
   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -17051,9 +17051,9 @@ IR_UsesDescription_out::operator-> (void)
     IR_ProvidesDescription * const tmp = ACE_reinterpret_cast (IR_ProvidesDescription* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_ProvidesDescription *
   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -17065,7 +17065,7 @@ IR_UsesDescription_out::operator-> (void)
       {
         result = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -17087,13 +17087,13 @@ IR_UsesDescription_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_ProvidesDescription *
   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_ProvidesDescription * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -17110,11 +17110,11 @@ IR_UsesDescription_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_PROVIDESDESCSEQ_CI_)
 #define _IR_PROVIDESDESCSEQ_CI_
@@ -17179,27 +17179,27 @@ IR_ProvidesDescSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ProvidesDescSeq_var::operator const ::IR_ProvidesDescSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() // cast 
+ACE_INLINE
+IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() const // cast 
+ACE_INLINE
+IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq *&() // cast 
+IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -17222,7 +17222,7 @@ IR_ProvidesDescSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ProvidesDescSeq *&
 IR_ProvidesDescSeq_var::out (void)
 {
@@ -17283,7 +17283,7 @@ IR_ProvidesDescSeq_out::operator= (IR_ProvidesDescSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ProvidesDescSeq_out::operator ::IR_ProvidesDescSeq *&() // cast
 {
   return this->ptr_;
@@ -17312,7 +17312,7 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_
 
@@ -17325,24 +17325,24 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
     ACE_NEW_RETURN (retval, IR_UsesDescription[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (IR_UsesDescription *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -17351,7 +17351,7 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
   // Copy constructor.
@@ -17361,10 +17361,10 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
     {
       IR_UsesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->maximum_);
       IR_UsesDescription * const tmp2 = ACE_reinterpret_cast (IR_UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -17372,14 +17372,14 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_IR_UsesDescSeq &
   _TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -17392,18 +17392,18 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     IR_UsesDescription *tmp1 = ACE_reinterpret_cast (IR_UsesDescription *, this->buffer_);
     IR_UsesDescription * const tmp2 = ACE_reinterpret_cast (IR_UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE IR_UsesDescription &
   _TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i)
@@ -17413,7 +17413,7 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
     IR_UsesDescription* tmp = ACE_reinterpret_cast(IR_UsesDescription*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const IR_UsesDescription &
   _TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -17422,9 +17422,9 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
     IR_UsesDescription * const tmp = ACE_reinterpret_cast (IR_UsesDescription* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE IR_UsesDescription *
   _TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -17436,7 +17436,7 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -17458,13 +17458,13 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const IR_UsesDescription *
   _TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const IR_UsesDescription * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -17481,11 +17481,11 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IR_USESDESCSEQ_CI_)
 #define _IR_USESDESCSEQ_CI_
@@ -17550,27 +17550,27 @@ IR_UsesDescSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UsesDescSeq_var::operator const ::IR_UsesDescSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() // cast 
+ACE_INLINE
+IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() const // cast 
+ACE_INLINE
+IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_UsesDescSeq_var::operator ::IR_UsesDescSeq *&() // cast 
+IR_UsesDescSeq_var::operator ::IR_UsesDescSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -17593,7 +17593,7 @@ IR_UsesDescSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_UsesDescSeq *&
 IR_UsesDescSeq_var::out (void)
 {
@@ -17654,7 +17654,7 @@ IR_UsesDescSeq_out::operator= (IR_UsesDescSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_UsesDescSeq_out::operator ::IR_UsesDescSeq *&() // cast
 {
   return this->ptr_;
@@ -17686,8 +17686,8 @@ IR_EventDef::IR_EventDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_EventDef::IR_EventDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_EventDef::IR_EventDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -17749,14 +17749,14 @@ IR_EventDef_var::operator= (const ::IR_EventDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EventDef_var::operator const ::IR_EventDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_EventDef_var::operator ::IR_EventDef_ptr &() // cast 
+ACE_INLINE
+IR_EventDef_var::operator ::IR_EventDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -17848,7 +17848,7 @@ IR_EventDef_out::operator= (IR_EventDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EventDef_out::operator ::IR_EventDef_ptr &() // cast
 {
   return this->ptr_;
@@ -17936,20 +17936,20 @@ IR_EventDescription_var::operator const ::IR_EventDescription &() const // cast
 }
 
 ACE_INLINE
-IR_EventDescription_var::operator ::IR_EventDescription &() // cast 
+IR_EventDescription_var::operator ::IR_EventDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_EventDescription_var::operator ::IR_EventDescription &() const // cast 
+IR_EventDescription_var::operator ::IR_EventDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_EventDescription_var::operator ::IR_EventDescription *&() // cast 
+IR_EventDescription_var::operator ::IR_EventDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -17966,7 +17966,7 @@ IR_EventDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_EventDescription *&
 IR_EventDescription_var::out (void)
 {
@@ -18027,7 +18027,7 @@ IR_EventDescription_out::operator= (IR_EventDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EventDescription_out::operator ::IR_EventDescription *&() // cast
 {
   return this->ptr_;
@@ -18050,8 +18050,8 @@ IR_EmitsDef::IR_EmitsDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_EmitsDef::IR_EmitsDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_EmitsDef::IR_EmitsDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -18113,14 +18113,14 @@ IR_EmitsDef_var::operator= (const ::IR_EmitsDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EmitsDef_var::operator const ::IR_EmitsDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_EmitsDef_var::operator ::IR_EmitsDef_ptr &() // cast 
+ACE_INLINE
+IR_EmitsDef_var::operator ::IR_EmitsDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -18212,7 +18212,7 @@ IR_EmitsDef_out::operator= (IR_EmitsDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_EmitsDef_out::operator ::IR_EmitsDef_ptr &() // cast
 {
   return this->ptr_;
@@ -18238,8 +18238,8 @@ IR_PublishesDef::IR_PublishesDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_PublishesDef::IR_PublishesDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_PublishesDef::IR_PublishesDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -18301,14 +18301,14 @@ IR_PublishesDef_var::operator= (const ::IR_PublishesDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_PublishesDef_var::operator const ::IR_PublishesDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_PublishesDef_var::operator ::IR_PublishesDef_ptr &() // cast 
+ACE_INLINE
+IR_PublishesDef_var::operator ::IR_PublishesDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -18400,7 +18400,7 @@ IR_PublishesDef_out::operator= (IR_PublishesDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_PublishesDef_out::operator ::IR_PublishesDef_ptr &() // cast
 {
   return this->ptr_;
@@ -18426,8 +18426,8 @@ IR_ConsumesDef::IR_ConsumesDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ConsumesDef::IR_ConsumesDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ConsumesDef::IR_ConsumesDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -18489,14 +18489,14 @@ IR_ConsumesDef_var::operator= (const ::IR_ConsumesDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ConsumesDef_var::operator const ::IR_ConsumesDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ConsumesDef_var::operator ::IR_ConsumesDef_ptr &() // cast 
+ACE_INLINE
+IR_ConsumesDef_var::operator ::IR_ConsumesDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -18588,7 +18588,7 @@ IR_ConsumesDef_out::operator= (IR_ConsumesDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ConsumesDef_out::operator ::IR_ConsumesDef_ptr &() // cast
 {
   return this->ptr_;
@@ -18614,8 +18614,8 @@ IR_ComponentDef::IR_ComponentDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_ComponentDef::IR_ComponentDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_ComponentDef::IR_ComponentDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -18677,14 +18677,14 @@ IR_ComponentDef_var::operator= (const ::IR_ComponentDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ComponentDef_var::operator const ::IR_ComponentDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_ComponentDef_var::operator ::IR_ComponentDef_ptr &() // cast 
+ACE_INLINE
+IR_ComponentDef_var::operator ::IR_ComponentDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -18776,7 +18776,7 @@ IR_ComponentDef_out::operator= (IR_ComponentDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ComponentDef_out::operator ::IR_ComponentDef_ptr &() // cast
 {
   return this->ptr_;
@@ -18864,20 +18864,20 @@ IR_ComponentDescription_var::operator const ::IR_ComponentDescription &() const
 }
 
 ACE_INLINE
-IR_ComponentDescription_var::operator ::IR_ComponentDescription &() // cast 
+IR_ComponentDescription_var::operator ::IR_ComponentDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_ComponentDescription_var::operator ::IR_ComponentDescription &() const // cast 
+IR_ComponentDescription_var::operator ::IR_ComponentDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_ComponentDescription_var::operator ::IR_ComponentDescription *&() // cast 
+IR_ComponentDescription_var::operator ::IR_ComponentDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -18894,7 +18894,7 @@ IR_ComponentDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_ComponentDescription *&
 IR_ComponentDescription_var::out (void)
 {
@@ -18955,7 +18955,7 @@ IR_ComponentDescription_out::operator= (IR_ComponentDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_ComponentDescription_out::operator ::IR_ComponentDescription *&() // cast
 {
   return this->ptr_;
@@ -18978,8 +18978,8 @@ IR_PrimaryKeyDef::IR_PrimaryKeyDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_PrimaryKeyDef::IR_PrimaryKeyDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_PrimaryKeyDef::IR_PrimaryKeyDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -19041,14 +19041,14 @@ IR_PrimaryKeyDef_var::operator= (const ::IR_PrimaryKeyDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_PrimaryKeyDef_var::operator const ::IR_PrimaryKeyDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_PrimaryKeyDef_var::operator ::IR_PrimaryKeyDef_ptr &() // cast 
+ACE_INLINE
+IR_PrimaryKeyDef_var::operator ::IR_PrimaryKeyDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -19140,7 +19140,7 @@ IR_PrimaryKeyDef_out::operator= (IR_PrimaryKeyDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_PrimaryKeyDef_out::operator ::IR_PrimaryKeyDef_ptr &() // cast
 {
   return this->ptr_;
@@ -19228,20 +19228,20 @@ IR_PrimaryKeyDescription_var::operator const ::IR_PrimaryKeyDescription &() cons
 }
 
 ACE_INLINE
-IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() // cast 
+IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() const // cast 
+IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription *&() // cast 
+IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -19258,7 +19258,7 @@ IR_PrimaryKeyDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_PrimaryKeyDescription *&
 IR_PrimaryKeyDescription_var::out (void)
 {
@@ -19319,7 +19319,7 @@ IR_PrimaryKeyDescription_out::operator= (IR_PrimaryKeyDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_PrimaryKeyDescription_out::operator ::IR_PrimaryKeyDescription *&() // cast
 {
   return this->ptr_;
@@ -19342,8 +19342,8 @@ IR_FactoryDef::IR_FactoryDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_FactoryDef::IR_FactoryDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_FactoryDef::IR_FactoryDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -19405,14 +19405,14 @@ IR_FactoryDef_var::operator= (const ::IR_FactoryDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_FactoryDef_var::operator const ::IR_FactoryDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_FactoryDef_var::operator ::IR_FactoryDef_ptr &() // cast 
+ACE_INLINE
+IR_FactoryDef_var::operator ::IR_FactoryDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -19504,7 +19504,7 @@ IR_FactoryDef_out::operator= (IR_FactoryDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_FactoryDef_out::operator ::IR_FactoryDef_ptr &() // cast
 {
   return this->ptr_;
@@ -19530,8 +19530,8 @@ IR_FinderDef::IR_FinderDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_FinderDef::IR_FinderDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_FinderDef::IR_FinderDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -19593,14 +19593,14 @@ IR_FinderDef_var::operator= (const ::IR_FinderDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_FinderDef_var::operator const ::IR_FinderDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_FinderDef_var::operator ::IR_FinderDef_ptr &() // cast 
+ACE_INLINE
+IR_FinderDef_var::operator ::IR_FinderDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -19692,7 +19692,7 @@ IR_FinderDef_out::operator= (IR_FinderDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_FinderDef_out::operator ::IR_FinderDef_ptr &() // cast
 {
   return this->ptr_;
@@ -19718,8 +19718,8 @@ IR_HomeDef::IR_HomeDef (void) // default constructor
 {}
 
 ACE_INLINE
-IR_HomeDef::IR_HomeDef (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+IR_HomeDef::IR_HomeDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -19781,14 +19781,14 @@ IR_HomeDef_var::operator= (const ::IR_HomeDef_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_HomeDef_var::operator const ::IR_HomeDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-IR_HomeDef_var::operator ::IR_HomeDef_ptr &() // cast 
+ACE_INLINE
+IR_HomeDef_var::operator ::IR_HomeDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -19880,7 +19880,7 @@ IR_HomeDef_out::operator= (IR_HomeDef_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_HomeDef_out::operator ::IR_HomeDef_ptr &() // cast
 {
   return this->ptr_;
@@ -19968,20 +19968,20 @@ IR_HomeDescription_var::operator const ::IR_HomeDescription &() const // cast
 }
 
 ACE_INLINE
-IR_HomeDescription_var::operator ::IR_HomeDescription &() // cast 
+IR_HomeDescription_var::operator ::IR_HomeDescription &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-IR_HomeDescription_var::operator ::IR_HomeDescription &() const // cast 
+IR_HomeDescription_var::operator ::IR_HomeDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-IR_HomeDescription_var::operator ::IR_HomeDescription *&() // cast 
+IR_HomeDescription_var::operator ::IR_HomeDescription *&() // cast
 {
   return this->ptr_;
 }
@@ -19998,7 +19998,7 @@ IR_HomeDescription_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::IR_HomeDescription *&
 IR_HomeDescription_var::out (void)
 {
@@ -20059,7 +20059,7 @@ IR_HomeDescription_out::operator= (IR_HomeDescription *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 IR_HomeDescription_out::operator ::IR_HomeDescription *&() // cast
 {
   return this->ptr_;
@@ -20082,8 +20082,8 @@ CORBA_TypeCodeFactory::CORBA_TypeCodeFactory (void) // default constructor
 {}
 
 ACE_INLINE
-CORBA_TypeCodeFactory::CORBA_TypeCodeFactory (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+CORBA_TypeCodeFactory::CORBA_TypeCodeFactory (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -20145,14 +20145,14 @@ CORBA_TypeCodeFactory_var::operator= (const ::CORBA_TypeCodeFactory_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_TypeCodeFactory_var::operator const ::CORBA_TypeCodeFactory_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_TypeCodeFactory_var::operator ::CORBA_TypeCodeFactory_ptr &() // cast 
+ACE_INLINE
+CORBA_TypeCodeFactory_var::operator ::CORBA_TypeCodeFactory_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -20244,7 +20244,7 @@ CORBA_TypeCodeFactory_out::operator= (CORBA_TypeCodeFactory_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_TypeCodeFactory_out::operator ::CORBA_TypeCodeFactory_ptr &() // cast
 {
   return this->ptr_;
@@ -20275,12 +20275,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::DefinitionKind &_t
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (IR::DefinitionKind, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -20372,7 +20372,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Contained::D
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Contained::Description &_tao_aggregate)
@@ -20384,7 +20384,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Contained::Descript
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean
@@ -20845,7 +20845,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_StructMember
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_StructMember &_tao_aggregate)
@@ -20858,7 +20858,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_StructMember &_tao_
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -20885,7 +20885,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Initializer
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Initializer &_tao_aggregate)
@@ -20897,7 +20897,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Initializer &_tao_a
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -20926,7 +20926,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_UnionMember
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UnionMember &_tao_aggregate)
@@ -20940,7 +20940,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UnionMember &_tao_a
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -20994,7 +20994,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Container::D
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Container::Description &_tao_aggregate)
@@ -21007,7 +21007,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Container::Descript
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -21182,12 +21182,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::PrimitiveKind &_ta
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (IR::PrimitiveKind, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -21349,7 +21349,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ModuleDescri
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ModuleDescription &_tao_aggregate)
@@ -21363,7 +21363,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ModuleDescription &
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean
@@ -21428,7 +21428,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ConstantDesc
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ConstantDescription &_tao_aggregate)
@@ -21444,7 +21444,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ConstantDescription
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean
@@ -21508,7 +21508,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_TypeDescript
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_TypeDescription &_tao_aggregate)
@@ -21523,7 +21523,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_TypeDescription &_t
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean
@@ -22126,7 +22126,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ExceptionDes
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ExceptionDescription &_tao_aggregate)
@@ -22141,7 +22141,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ExceptionDescriptio
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -22184,12 +22184,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::AttributeMode &_ta
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (IR::AttributeMode, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -22257,7 +22257,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_AttributeDes
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_AttributeDescription &_tao_aggregate)
@@ -22275,7 +22275,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_AttributeDescriptio
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::OperationMode &_tao_enumval)
@@ -22288,12 +22288,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::OperationMode &_ta
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (IR::OperationMode, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -22307,12 +22307,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ParameterMode &_ta
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (IR::ParameterMode, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -22327,7 +22327,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ParameterDes
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ParameterDescription &_tao_aggregate)
@@ -22341,7 +22341,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ParameterDescriptio
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -22439,7 +22439,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_OperationDes
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_OperationDescription &_tao_aggregate)
@@ -22458,7 +22458,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_OperationDescriptio
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -22572,7 +22572,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_InterfaceDes
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_InterfaceDescription &_tao_aggregate)
@@ -22592,7 +22592,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_InterfaceDescriptio
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ValueMember &_tao_aggregate)
@@ -22609,7 +22609,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ValueMember
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueMember &_tao_aggregate)
@@ -22626,7 +22626,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueMember &_tao_a
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -22764,7 +22764,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ValueDescrip
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueDescription &_tao_aggregate)
@@ -22789,7 +22789,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueDescription &_
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean
@@ -22902,7 +22902,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ProvidesDesc
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ProvidesDescription &_tao_aggregate)
@@ -22917,7 +22917,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ProvidesDescription
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean
@@ -22982,7 +22982,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_UsesDescript
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UsesDescription &_tao_aggregate)
@@ -22998,7 +22998,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UsesDescription &_t
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -23092,7 +23092,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_EventDescrip
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_EventDescription &_tao_aggregate)
@@ -23107,7 +23107,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_EventDescription &_
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean
@@ -23326,7 +23326,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ComponentDes
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ComponentDescription &_tao_aggregate)
@@ -23349,7 +23349,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ComponentDescriptio
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean
@@ -23413,7 +23413,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_PrimaryKeyDe
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_PrimaryKeyDescription &_tao_aggregate)
@@ -23428,7 +23428,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_PrimaryKeyDescripti
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean
@@ -23597,7 +23597,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_HomeDescript
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_HomeDescription &_tao_aggregate)
@@ -23619,7 +23619,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_HomeDescription &_t
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean
@@ -23670,4 +23670,3 @@ operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 420fdf5f789..bda9103ef3c 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -1,18 +1,10 @@
-// @(#) $Id$
 //
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
+// $Id$
 //
-// ORB:         CORBA_Object operations
 
 #include "tao/LocalObject.h"
-#include "tao/Object_Adapter.h"
 #include "tao/Stub.h"
-#include "tao/Servant_Base.h"
 #include "tao/Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Invocation.h"
-#include "tao/Connector_Registry.h"
 #include "tao/debug.h"
 
 #if (TAO_HAS_INTERFACE_REPOSITORY == 1)
@@ -25,7 +17,7 @@
 # include "tao/LocalObject.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(tao, Object, "$Id$")
+ACE_RCSID(tao, LocalObject, "$Id$")
 
 CORBA::LocalObject::~LocalObject (void)
 {
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
index 4eee314cef0..5c0220ea8b8 100644
--- a/TAO/tao/MProfile.i
+++ b/TAO/tao/MProfile.i
@@ -45,7 +45,7 @@ TAO_MProfile::~TAO_MProfile (void)
         (*policy_list_)[i]->destroy ();
     }
   delete policy_list_;
-  
+
   this->cleanup ();
 }
 
@@ -258,11 +258,11 @@ TAO_MProfile::create_policy_list (void)
   ACE_ASSERT (this->policy_list_ == 0);
 
   ACE_NEW (this->policy_list_, CORBA::PolicyList ());
- 
+
   // Post-Condition: Make sure that the memory get allcated
   // for real.
   ACE_ASSERT (this->policy_list_ != 0);
-  
+
   // @@ Marina & Irfan I would raise an exception in this case.
 }
 
@@ -273,15 +273,15 @@ TAO_MProfile::policy_list (CORBA::PolicyList *policy_list)
   this->policy_list_ = policy_list;
 }
 
-ACE_INLINE CORBA::PolicyList* 
-TAO_MProfile::policy_list (void) 
+ACE_INLINE CORBA::PolicyList*
+TAO_MProfile::policy_list (void)
 {
-  
+
   // Here we use Double-Checked Loking to
-  // avoid to create more then one policy list 
+  // avoid to create more then one policy list
   // if more thread try to get a policy for
   // the first time, at the same time.
-  
+
   if (this->is_policy_list_initialized_)
     return this->policy_list_;
   else
@@ -294,7 +294,7 @@ TAO_MProfile::policy_list (void)
           this->get_current_profile ()->policies ();
           // Right now all the profile share the same
           // policies, so any profile can be picked up
-          // to parse the policy. 
+          // to parse the policy.
           // So we pick the current profile, so that no
           // state is changed in the MProfile.
 
@@ -302,5 +302,4 @@ TAO_MProfile::policy_list (void)
         }
     }
   return this->policy_list_;
-  
-}  
+}
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 553a05b236c..2753419088e 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -10,7 +10,8 @@ LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
 
 DIRS = \
-	DynamicAny
+  PortableServer \
+  DynamicAny
 
 # These are headers for things which are exported and must be
 # installed.  (Currently not used).
@@ -68,16 +69,9 @@ PUB_HDRS = \
   TAO_Export \
   TAO_Singleton_Manager \
   TAO_Singleton \
-  DLL_ORB
-
-POA_FILES = \
-  Object_Adapter \
-  Key_Adapters \
-  POA \
-  PortableServerC \
-  POAManager \
-  Active_Object_Map \
-  Servant_Base
+  DLL_ORB \
+  Adapter \
+  Acceptor_Filter
 
 PLUGGABLE_PROTOCOLS_FILES = \
   Pluggable \
@@ -85,6 +79,7 @@ PLUGGABLE_PROTOCOLS_FILES = \
   Connector_Registry \
   Acceptor_Registry \
   Protocol_Factory \
+  Acceptor_Filter \
   IIOP_Factory \
   IIOP_Lite_Factory \
   IIOP_Profile \
@@ -136,8 +131,7 @@ INTERPRETIVE_MARSHALING_FILES = \
   skip
 
 IDL_COMPILER_FILES = \
-  Managed_Types \
-  Operation_Table
+  Managed_Types
 
 ORB_CORE_FILES = \
   Any \
@@ -151,11 +145,9 @@ ORB_CORE_FILES = \
   ORB \
   corbafwd \
   PolicyC \
-  PolicyS \
   Encodable \
   Policy_Factory \
   DomainC \
-  DomainS \
   TimeBaseC \
   TimeBaseS \
   Principal \
@@ -192,7 +184,6 @@ ORB_CORE_FILES = \
   TAO_Internal \
   Typecode_Constants \
   IOR_LookupTable \
-  TAO \
   Wait_Strategy \
   Wait_On_Read \
   Wait_On_Reactor \
@@ -217,13 +208,13 @@ ORB_CORE_FILES = \
   TAOS \
   Object_Loader \
   TAO_Singleton_Manager \
-  DLL_ORB
+  DLL_ORB \
+  Adapter
 
 DYNAMIC_ANY_FILES =
 
 FT_CORBA_FILES = \
   FT_CORBAC \
-  FT_CORBAS
 
 TEMPLATE_FILES = \
   TAO_Singleton
@@ -245,11 +236,6 @@ include $(TAO_ROOT)/rules.tao.GNU
 
 ifeq ($(minimum_corba),0)
 
-POA_FILES += \
-  Forwarding_Servant \
-  ImplRepoC \
-  ImplRepoS
-
 ORB_CORE_FILES += \
   Context \
   Request \
@@ -265,7 +251,6 @@ ifeq ($(corba_messaging),1)
 
 ORB_CORE_FILES += \
   MessagingC \
-  MessagingS \
   Policy_Manager \
   Messaging_Policy_i \
   Client_Priority_Policy \
@@ -273,7 +258,6 @@ ORB_CORE_FILES += \
 
 endif # corba_messaging
 
-
 ifeq ($(rt_corba),1)
 
 ORB_CORE_FILES += \
@@ -320,10 +304,6 @@ endif # TAO_COMPONENTS
 ####
 #### TAO_COMPONENTS support.
 ####
-ifneq (,$(findstring POA,$(TAO_COMPONENTS)))
-  FILES += $(POA_FILES)
-endif # POA
-
 ifneq (,$(findstring Pluggable_Protocols,$(TAO_COMPONENTS)))
   FILES += $(PLUGGABLE_PROTOCOLS_FILES)
 endif # Pluggable_Protocols
@@ -416,7 +396,7 @@ TAO_COMPONENTS:
 	@sh $(ACE_ROOT)/bin/ace_components --tao --set ' $(TAO_COMPONENTS) '
 
 .PHONY: SIZES
-MODULES=POA_FILES \
+MODULES= \
 	PLUGGABLE_PROTOCOLS_FILES \
 	DEFAULT_RESOURCES_FILES \
 	INTERPRETIVE_MARSHALING_FILES \
@@ -452,723 +432,8 @@ realclean:
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/Object_Adapter.o .obj/Object_Adapter.o .obj/Object_Adapter.o .obj/Object_Adapter.o: Object_Adapter.cpp \
- Object_Adapter.h \
- $(ACE_ROOT)/ace/pre.h \
- Key_Adapters.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- PortableServerC.h \
- CurrentC.h \
- Object.h \
- Object.i \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Servant_Base.h \
- Servant_Base.i \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- IOPC.h \
- IOPC.i \
- TimeBaseC.h \
- TimeBaseC.i \
- RTCORBAC.i \
- LocalObject.h \
- LocalObject.i \
- Object_Adapter.i \
- POA.h \
- Object_KeyC.h \
- Object_KeyC.i \
- POAManager.h \
- POAManager.i \
- POA.i \
- ORB.h \
- IOR_LookupTable.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i \
- ORB_Core.h \
- Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Policy_Manager.i \
- Resource_Factory.h \
- Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Pluggable.i \
- Protocol_Factory.h \
- params.h \
- params.i \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- Server_Request.h \
- Server_Request.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h
-
-.obj/Key_Adapters.o .obj/Key_Adapters.o .obj/Key_Adapters.o .obj/Key_Adapters.o: Key_Adapters.cpp \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- PortableServerC.h \
- CurrentC.h \
- Object.h \
- Object.i \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- Key_Adapters.i
-
-.obj/POA.o .obj/POA.o .obj/POA.o .obj/POA.o: POA.cpp \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- POA.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Object_Adapter.h \
- Key_Adapters.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- PortableServerC.h \
- CurrentC.h \
- Object.h \
- Object.i \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Servant_Base.h \
- Servant_Base.i \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- IOPC.h \
- IOPC.i \
- TimeBaseC.h \
- TimeBaseC.i \
- RTCORBAC.i \
- LocalObject.h \
- LocalObject.i \
- Object_Adapter.i \
- Object_KeyC.h \
- Object_KeyC.i \
- POAManager.h \
- POAManager.i \
- POA.i \
- ORB_Core.h \
- ORB.h \
- IOR_LookupTable.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i \
- Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Policy_Manager.i \
- Resource_Factory.h \
+.obj/Pluggable.o .obj/Pluggable.so .shobj/Pluggable.o .shobj/Pluggable.so: Pluggable.cpp \
  Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Pluggable.i \
- Protocol_Factory.h \
- params.h \
- params.i \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- Stub.h \
- MProfile.h \
- Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
- CONV_FRAMEC.i \
- Tagged_Components.i \
- Profile.i \
- MProfile.i \
- Stub.i \
- debug.h \
- RT_Policy_i.h \
- RTCORBAS.h \
- IOPS.h \
- IOPS_T.h \
- IOPS_T.i \
- IOPS_T.cpp \
- IOPS.i \
- TimeBaseS.h \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- RTCORBAS_T.h \
- RTCORBAS_T.i \
- RTCORBAS_T.cpp \
- RTCORBAS.i \
- RT_Policy_i.i \
- ImplRepoC.h \
- ImplRepoC.i \
- ImplRepoS.h \
- ImplRepoS_T.h \
- ImplRepoS_T.i \
- ImplRepoS_T.cpp \
- ImplRepoS.i \
- Forwarding_Servant.h
-
-.obj/PortableServerC.o .obj/PortableServerC.o .obj/PortableServerC.o .obj/PortableServerC.o: PortableServerC.cpp PortableServerC.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -1194,1044 +459,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- CurrentC.h \
- Object.h \
- Object.i \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- ORB.h \
- IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- LocalObject.i \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- IOPC.h \
- IOPC.i \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- PortableServerC.h \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Servant_Base.h \
- Servant_Base.i \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- Object_KeyC.h \
- Object_KeyC.i \
- POAManager.h \
- POAManager.i \
- POA.i
-
-.obj/POAManager.o .obj/POAManager.o .obj/POAManager.o .obj/POAManager.o: POAManager.cpp \
- POAManager.h \
- $(ACE_ROOT)/ace/pre.h \
- PortableServerC.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- CurrentC.h \
- Object.h \
- Object.i \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- poa_macros.h \
- LocalObject.h \
- LocalObject.i \
- POAManager.i \
- POA.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- Servant_Base.h \
- Servant_Base.i \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- IOPC.h \
- IOPC.i \
- TimeBaseC.h \
- TimeBaseC.i \
- RTCORBAC.i \
- Object_Adapter.i \
- Object_KeyC.h \
- Object_KeyC.i \
- POA.i
-
-.obj/Active_Object_Map.o .obj/Active_Object_Map.o .obj/Active_Object_Map.o .obj/Active_Object_Map.o: Active_Object_Map.cpp \
- Active_Object_Map.h \
- $(ACE_ROOT)/ace/pre.h \
- Key_Adapters.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- PortableServerC.h \
- CurrentC.h \
- Object.h \
- Object.i \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- Servant_Base.h \
- Servant_Base.i \
- Active_Object_Map.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-
-.obj/Servant_Base.o .obj/Servant_Base.o .obj/Servant_Base.o .obj/Servant_Base.o: Servant_Base.cpp \
- Servant_Base.h \
- $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- PortableServerC.h \
- CurrentC.h \
- Object.h \
- Object.i \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- Servant_Base.i \
- Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- ORB_Core.h \
- ORB.h \
- IOR_LookupTable.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- LocalObject.i \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- IOPC.h \
- IOPC.i \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i \
- Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Policy_Manager.i \
- Resource_Factory.h \
- Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Pluggable.i \
- Protocol_Factory.h \
- params.h \
- params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- Object_KeyC.h \
- Object_KeyC.i \
- POAManager.h \
- POAManager.i \
- POA.i \
- Stub.h \
- MProfile.h \
- Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
- CONV_FRAMEC.i \
- Tagged_Components.i \
- Profile.i \
- MProfile.i \
- Stub.i \
- Server_Request.h \
- Server_Request.i
-
-.obj/Forwarding_Servant.o .obj/Forwarding_Servant.o .obj/Forwarding_Servant.o .obj/Forwarding_Servant.o: Forwarding_Servant.cpp \
- Forwarding_Servant.h \
- $(ACE_ROOT)/ace/pre.h \
- orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- Servant_Base.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- PortableServerC.h \
- CurrentC.h \
- Object.h \
- Object.i \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- Servant_Base.i \
- ORB.h \
- IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- LocalObject.i \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- IOPC.h \
- IOPC.i \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i \
- Server_Request.h \
- Object_KeyC.h \
- Object_KeyC.i \
- Server_Request.i
-
-.obj/ImplRepoC.o .obj/ImplRepoC.o .obj/ImplRepoC.o .obj/ImplRepoC.o: ImplRepoC.cpp ImplRepoC.h \
- $(ACE_ROOT)/ace/pre.h \
- Object.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -2289,32 +523,6 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i \
- Object.i \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.h \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- Exception.h \
- Exception.i \
- Environment.h \
- Environment.i \
- CDR.h \
- CDR.i \
- Any.h \
- Typecode.h \
- Typecode.i \
- Any.i \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- ImplRepoC.i \
- Stub.h \
- Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Queue_T.h \
@@ -2341,524 +549,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- IOPC.h \
- IOPC.i \
- Pluggable.i \
- MProfile.h \
- Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
- CONV_FRAMEC.i \
- Tagged_Components.i \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Encodable.h \
- PolicyC.i \
- Profile.i \
- MProfile.i \
- ORB.h \
- IOR_LookupTable.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- LocalObject.i \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i \
- Stub.i \
- NVList.h \
- NVList.i \
- ORB_Core.h \
- Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
- Policy_Manager.i \
- Resource_Factory.h \
- Protocol_Factory.h \
- params.h \
- params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- Invocation.h \
- Synch_Reply_Dispatcher.h \
- Reply_Dispatcher.h \
- Reply_Dispatcher.i \
- GIOP_Message_State.h \
- Pluggable_Messaging.h \
- Pluggable_Messaging_Utils.h \
- Pluggable_Messaging_Utils.i \
- Pluggable_Messaging.i \
- GIOP_Message_State.i \
- Synch_Reply_Dispatcher.i \
- TAOC.h \
- Priority_Mapping_Manager.h \
- Priority_Mapping.h \
- RTCORBAC.h \
- RTCORBAC.i \
- Priority_Mapping.i \
- Priority_Mapping_Manager.i \
- TAOC.i \
- operation_details.h \
- target_specification.h \
- Object_KeyC.h \
- Object_KeyC.i \
- target_specification.i \
- operation_details.i \
- Invocation.i
-
-.obj/ImplRepoS.o .obj/ImplRepoS.o .obj/ImplRepoS.o .obj/ImplRepoS.o: ImplRepoS.cpp ImplRepoS.h \
- $(ACE_ROOT)/ace/pre.h \
- ImplRepoC.h \
- Object.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- Object.i \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.h \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- Exception.h \
- Exception.i \
- Environment.h \
- Environment.i \
- CDR.h \
- CDR.i \
- Any.h \
- Typecode.h \
- Typecode.i \
- Any.i \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- ImplRepoC.i \
- PortableServerC.h \
- CurrentC.h \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- PolicyC.i \
- PortableServerC.i \
- Servant_Base.h \
- Servant_Base.i \
- ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \
- Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- IOPC.h \
- IOPC.i \
- TimeBaseC.h \
- TimeBaseC.i \
- RTCORBAC.i \
- LocalObject.h \
- LocalObject.i \
- Object_Adapter.i \
- Stub.h \
- Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Pluggable.i \
- MProfile.h \
- Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
- CONV_FRAMEC.i \
- Tagged_Components.i \
- Profile.i \
- MProfile.i \
- ORB.h \
- IOR_LookupTable.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i \
- Stub.i \
- GIOP_Server_Request.h \
- Server_Request.h \
- Object_KeyC.h \
- Object_KeyC.i \
- Server_Request.i \
- Principal.h \
- Principal.i \
- GIOP_Message_Base.h \
- GIOP_Message_State.h \
- Pluggable_Messaging.h \
- Pluggable_Messaging_Utils.h \
- Pluggable_Messaging_Utils.i \
- Pluggable_Messaging.i \
- GIOP_Message_State.i \
- GIOP_Message_Base.i \
- Tagged_Profile.h \
- GIOPC.h \
- GIOPC.i \
- Tagged_Profile.i \
- GIOP_Server_Request.i \
- ORB_Core.h \
- Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Policy_Manager.i \
- Resource_Factory.h \
- Protocol_Factory.h \
- params.h \
- params.i \
- ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- NVList.h \
- NVList.i
-
-.obj/Pluggable.o .obj/Pluggable.o .obj/Pluggable.o .obj/Pluggable.o: Pluggable.cpp \
- Pluggable.h \
- $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
  $(ACE_ROOT)/ace/Thread_Adapter.h \
  $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -2928,7 +620,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -2939,17 +630,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -2960,6 +643,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -2975,7 +660,7 @@ realclean:
  Object_KeyC.i \
  target_specification.i
 
-.obj/Profile.o .obj/Profile.o .obj/Profile.o .obj/Profile.o: Profile.cpp \
+.obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp \
  Profile.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -3002,19 +687,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -3166,6 +845,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -3200,13 +881,12 @@ realclean:
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
- DynamicC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
- Stub.i
+ Stub.i \
+ debug.h
 
-.obj/Connector_Registry.o .obj/Connector_Registry.o .obj/Connector_Registry.o .obj/Connector_Registry.o: Connector_Registry.cpp \
+.obj/Connector_Registry.o .obj/Connector_Registry.so .shobj/Connector_Registry.o .shobj/Connector_Registry.so: Connector_Registry.cpp \
  ORB_Core.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -3233,19 +913,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -3362,7 +1036,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -3378,17 +1051,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -3402,6 +1067,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -3422,6 +1089,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -3438,7 +1107,7 @@ realclean:
  Profile.i \
  debug.h
 
-.obj/Acceptor_Registry.o .obj/Acceptor_Registry.o .obj/Acceptor_Registry.o .obj/Acceptor_Registry.o: Acceptor_Registry.cpp \
+.obj/Acceptor_Registry.o .obj/Acceptor_Registry.so .shobj/Acceptor_Registry.o .shobj/Acceptor_Registry.so: Acceptor_Registry.cpp \
  Acceptor_Registry.h \
  $(ACE_ROOT)/ace/pre.h \
  Pluggable.h \
@@ -3466,19 +1135,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -3562,6 +1225,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -3632,7 +1297,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -3643,17 +1307,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  params.h \
  params.i \
@@ -3662,6 +1318,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -3690,38 +1348,13 @@ realclean:
  RTCORBAS_T.cpp \
  RTCORBAS.i \
  RT_Policy_i.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- Object_Adapter.i \
- Object_KeyC.h \
- Object_KeyC.i \
- POAManager.h \
- POAManager.i \
- POA.i \
+ Acceptor_Filter.h \
+ Acceptor_Filter.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/Protocol_Factory.o .obj/Protocol_Factory.o .obj/Protocol_Factory.o .obj/Protocol_Factory.o: Protocol_Factory.cpp \
+.obj/Protocol_Factory.o .obj/Protocol_Factory.so .shobj/Protocol_Factory.o .shobj/Protocol_Factory.so: Protocol_Factory.cpp \
  Protocol_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -3747,16 +1380,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -3779,6 +1402,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -3826,6 +1453,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -3884,12 +1513,12 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/IIOP_Factory.o .obj/IIOP_Factory.o .obj/IIOP_Factory.o .obj/IIOP_Factory.o: IIOP_Factory.cpp \
- IIOP_Factory.h \
+.obj/Acceptor_Filter.o .obj/Acceptor_Filter.so .shobj/Acceptor_Filter.o .shobj/Acceptor_Filter.so: Acceptor_Filter.cpp \
+ Acceptor_Filter.h \
  $(ACE_ROOT)/ace/pre.h \
- Protocol_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/post.h \
@@ -3911,16 +1540,103 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ Acceptor_Filter.i
+
+.obj/IIOP_Factory.o .obj/IIOP_Factory.so .shobj/IIOP_Factory.o .shobj/IIOP_Factory.so: IIOP_Factory.cpp \
+ IIOP_Factory.h \
+ $(ACE_ROOT)/ace/pre.h \
+ Protocol_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -3943,6 +1659,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -3990,6 +1710,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -4118,7 +1840,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -4134,17 +1855,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  params.h \
@@ -4154,6 +1867,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -4190,7 +1905,7 @@ realclean:
  $(ACE_ROOT)/ace/Caching_Strategies_T.cpp \
  $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.cpp
 
-.obj/IIOP_Lite_Factory.o .obj/IIOP_Lite_Factory.o .obj/IIOP_Lite_Factory.o .obj/IIOP_Lite_Factory.o: IIOP_Lite_Factory.cpp \
+.obj/IIOP_Lite_Factory.o .obj/IIOP_Lite_Factory.so .shobj/IIOP_Lite_Factory.o .shobj/IIOP_Lite_Factory.so: IIOP_Lite_Factory.cpp \
  IIOP_Lite_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
  Protocol_Factory.h \
@@ -4217,16 +1932,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -4249,6 +1954,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -4296,6 +2005,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -4424,7 +2135,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -4440,17 +2150,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  params.h \
@@ -4460,6 +2162,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -4498,7 +2202,7 @@ realclean:
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
 
-.obj/IIOP_Profile.o .obj/IIOP_Profile.o .obj/IIOP_Profile.o .obj/IIOP_Profile.o: IIOP_Profile.cpp \
+.obj/IIOP_Profile.o .obj/IIOP_Profile.so .shobj/IIOP_Profile.o .shobj/IIOP_Profile.so: IIOP_Profile.cpp \
  IIOP_Profile.h \
  $(ACE_ROOT)/ace/pre.h \
  Profile.h \
@@ -4526,19 +2230,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -4671,7 +2369,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -4682,7 +2379,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Object_KeyC.h \
@@ -4699,6 +2395,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -4754,13 +2452,6 @@ realclean:
  IIOP_Connect.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -4771,42 +2462,17 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- POAManager.h \
- POAManager.i \
- POA.i \
  debug.h
 
-.obj/IIOP_Transport.o .obj/IIOP_Transport.o .obj/IIOP_Transport.o .obj/IIOP_Transport.o: IIOP_Transport.cpp \
+.obj/IIOP_Transport.o .obj/IIOP_Transport.so .shobj/IIOP_Transport.o .shobj/IIOP_Transport.so: IIOP_Transport.cpp \
  IIOP_Transport.h \
  $(ACE_ROOT)/ace/pre.h \
  Pluggable.h \
@@ -4834,19 +2500,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -4930,6 +2590,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -5045,7 +2707,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -5056,7 +2717,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  IIOP_Profile.i \
@@ -5079,13 +2739,6 @@ realclean:
  Stub.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -5096,6 +2749,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -5112,7 +2767,7 @@ realclean:
  GIOP_Utils.i \
  GIOP_Message_Lite.i
 
-.obj/IIOP_Connector.o .obj/IIOP_Connector.o .obj/IIOP_Connector.o .obj/IIOP_Connector.o: IIOP_Connector.cpp \
+.obj/IIOP_Connector.o .obj/IIOP_Connector.so .shobj/IIOP_Connector.o .shobj/IIOP_Connector.so: IIOP_Connector.cpp \
  IIOP_Connector.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Connector.h \
@@ -5140,16 +2795,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -5168,6 +2813,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -5220,6 +2869,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -5380,7 +3031,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -5391,20 +3041,12 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  IIOP_Profile.i \
  debug.h \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  params.h \
  params.i \
@@ -5413,6 +3055,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -5421,7 +3065,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.o: IIOP_Acceptor.cpp \
+.obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.so .shobj/IIOP_Acceptor.o .shobj/IIOP_Acceptor.so: IIOP_Acceptor.cpp \
  IIOP_Acceptor.h \
  $(ACE_ROOT)/ace/pre.h \
  Pluggable.h \
@@ -5449,19 +3093,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -5545,6 +3183,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -5653,7 +3293,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -5669,17 +3308,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -5690,6 +3321,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -5734,7 +3367,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/IIOP_Connect.o .obj/IIOP_Connect.o .obj/IIOP_Connect.o .obj/IIOP_Connect.o: IIOP_Connect.cpp \
+.obj/IIOP_Connect.o .obj/IIOP_Connect.so .shobj/IIOP_Connect.o .shobj/IIOP_Connect.so: IIOP_Connect.cpp \
  IIOP_Connect.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Reactor.h \
@@ -5760,16 +3393,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -5787,6 +3410,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -5839,6 +3466,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -5965,7 +3594,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -5981,17 +3609,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -6002,6 +3622,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -6028,7 +3650,7 @@ realclean:
  GIOP_Message_Acceptors.i \
  Server_Strategy_Factory.h
 
-.obj/UIOP_Factory.o .obj/UIOP_Factory.o .obj/UIOP_Factory.o .obj/UIOP_Factory.o: UIOP_Factory.cpp \
+.obj/UIOP_Factory.o .obj/UIOP_Factory.so .shobj/UIOP_Factory.o .shobj/UIOP_Factory.so: UIOP_Factory.cpp \
  UIOP_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
  Protocol_Factory.h \
@@ -6055,16 +3677,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -6087,6 +3699,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -6134,6 +3750,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -6263,7 +3881,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -6279,17 +3896,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  params.h \
@@ -6299,6 +3908,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -6336,7 +3947,7 @@ realclean:
  $(ACE_ROOT)/ace/Caching_Strategies_T.cpp \
  $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.cpp
 
-.obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.o: UIOP_Lite_Factory.cpp \
+.obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.so .shobj/UIOP_Lite_Factory.o .shobj/UIOP_Lite_Factory.so: UIOP_Lite_Factory.cpp \
  UIOP_Lite_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
  Protocol_Factory.h \
@@ -6363,16 +3974,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -6395,6 +3996,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -6442,6 +4047,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -6571,7 +4178,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -6587,17 +4193,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  params.h \
@@ -6607,6 +4205,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -6644,7 +4244,7 @@ realclean:
  $(ACE_ROOT)/ace/Caching_Strategies_T.cpp \
  $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.cpp
 
-.obj/UIOP_Profile.o .obj/UIOP_Profile.o .obj/UIOP_Profile.o .obj/UIOP_Profile.o: UIOP_Profile.cpp \
+.obj/UIOP_Profile.o .obj/UIOP_Profile.so .shobj/UIOP_Profile.o .shobj/UIOP_Profile.so: UIOP_Profile.cpp \
  UIOP_Profile.h \
  $(ACE_ROOT)/ace/pre.h \
  Profile.h \
@@ -6672,19 +4272,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -6802,6 +4396,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -6887,7 +4483,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -6898,18 +4493,10 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -6920,42 +4507,17 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- POAManager.h \
- POAManager.i \
- POA.i \
  debug.h
 
-.obj/UIOP_Transport.o .obj/UIOP_Transport.o .obj/UIOP_Transport.o .obj/UIOP_Transport.o: UIOP_Transport.cpp \
+.obj/UIOP_Transport.o .obj/UIOP_Transport.so .shobj/UIOP_Transport.o .shobj/UIOP_Transport.so: UIOP_Transport.cpp \
  UIOP_Transport.h \
  $(ACE_ROOT)/ace/pre.h \
  Pluggable.h \
@@ -6983,19 +4545,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -7079,6 +4635,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -7216,7 +4774,6 @@ realclean:
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -7225,19 +4782,11 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -7248,6 +4797,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -7264,7 +4815,7 @@ realclean:
  GIOP_Utils.i \
  GIOP_Message_Lite.i
 
-.obj/UIOP_Connector.o .obj/UIOP_Connector.o .obj/UIOP_Connector.o .obj/UIOP_Connector.o: UIOP_Connector.cpp \
+.obj/UIOP_Connector.o .obj/UIOP_Connector.so .shobj/UIOP_Connector.o .shobj/UIOP_Connector.so: UIOP_Connector.cpp \
  UIOP_Connector.h \
  $(ACE_ROOT)/ace/pre.h \
  Pluggable.h \
@@ -7292,19 +4843,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -7388,6 +4933,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -7540,7 +5087,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -7551,17 +5097,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  params.h \
  params.i \
@@ -7570,6 +5108,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -7577,7 +5117,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.o: UIOP_Acceptor.cpp \
+.obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.so .shobj/UIOP_Acceptor.o .shobj/UIOP_Acceptor.so: UIOP_Acceptor.cpp \
  UIOP_Acceptor.h \
  $(ACE_ROOT)/ace/pre.h \
  Pluggable.h \
@@ -7605,19 +5145,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -7701,6 +5235,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -7810,7 +5346,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -7826,17 +5361,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -7847,6 +5374,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -7889,7 +5418,7 @@ realclean:
  RTCORBAS.i \
  RT_Policy_i.i
 
-.obj/UIOP_Connect.o .obj/UIOP_Connect.o .obj/UIOP_Connect.o .obj/UIOP_Connect.o: UIOP_Connect.cpp \
+.obj/UIOP_Connect.o .obj/UIOP_Connect.so .shobj/UIOP_Connect.o .shobj/UIOP_Connect.so: UIOP_Connect.cpp \
  UIOP_Connect.h \
  $(ACE_ROOT)/ace/pre.h \
  UIOP_Transport.h \
@@ -7918,19 +5447,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -8014,6 +5537,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -8119,7 +5644,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -8135,17 +5659,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -8156,6 +5672,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -8186,7 +5704,7 @@ realclean:
  GIOP_Utils.i \
  GIOP_Message_Lite.i
 
-.obj/SHMIOP_Factory.o .obj/SHMIOP_Factory.o .obj/SHMIOP_Factory.o .obj/SHMIOP_Factory.o: SHMIOP_Factory.cpp \
+.obj/SHMIOP_Factory.o .obj/SHMIOP_Factory.so .shobj/SHMIOP_Factory.o .shobj/SHMIOP_Factory.so: SHMIOP_Factory.cpp \
  SHMIOP_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -8213,19 +5731,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -8306,6 +5818,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -8424,7 +5938,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -8440,17 +5953,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  params.h \
@@ -8460,6 +5965,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -8498,7 +6005,7 @@ realclean:
  $(ACE_ROOT)/ace/Caching_Strategies_T.cpp \
  $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.cpp
 
-.obj/SHMIOP_Profile.o .obj/SHMIOP_Profile.o .obj/SHMIOP_Profile.o .obj/SHMIOP_Profile.o: SHMIOP_Profile.cpp \
+.obj/SHMIOP_Profile.o .obj/SHMIOP_Profile.so .shobj/SHMIOP_Profile.o .shobj/SHMIOP_Profile.so: SHMIOP_Profile.cpp \
  SHMIOP_Profile.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -8525,19 +6032,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -8665,7 +6166,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -8676,7 +6176,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Object_KeyC.h \
@@ -8701,6 +6200,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -8760,13 +6261,6 @@ realclean:
  SHMIOP_Connect.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -8777,42 +6271,17 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- POAManager.h \
- POAManager.i \
- POA.i \
  debug.h
 
-.obj/SHMIOP_Transport.o .obj/SHMIOP_Transport.o .obj/SHMIOP_Transport.o .obj/SHMIOP_Transport.o: SHMIOP_Transport.cpp \
+.obj/SHMIOP_Transport.o .obj/SHMIOP_Transport.so .shobj/SHMIOP_Transport.o .shobj/SHMIOP_Transport.so: SHMIOP_Transport.cpp \
  SHMIOP_Transport.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -8839,19 +6308,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -8936,6 +6399,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -9055,7 +6520,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -9066,7 +6530,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Object_KeyC.h \
@@ -9091,13 +6554,6 @@ realclean:
  Stub.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -9108,6 +6564,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -9124,7 +6582,7 @@ realclean:
  GIOP_Message_Base.i \
  GIOP_Message_Connectors.i
 
-.obj/SHMIOP_Connector.o .obj/SHMIOP_Connector.o .obj/SHMIOP_Connector.o .obj/SHMIOP_Connector.o: SHMIOP_Connector.cpp \
+.obj/SHMIOP_Connector.o .obj/SHMIOP_Connector.so .shobj/SHMIOP_Connector.o .shobj/SHMIOP_Connector.so: SHMIOP_Connector.cpp \
  SHMIOP_Connector.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -9151,19 +6609,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -9246,6 +6698,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -9398,7 +6852,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -9409,7 +6862,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Object_KeyC.h \
@@ -9418,13 +6870,6 @@ realclean:
  debug.h \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  params.h \
  params.i \
@@ -9433,6 +6878,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -9441,7 +6888,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/SHMIOP_Acceptor.o .obj/SHMIOP_Acceptor.o .obj/SHMIOP_Acceptor.o .obj/SHMIOP_Acceptor.o: SHMIOP_Acceptor.cpp \
+.obj/SHMIOP_Acceptor.o .obj/SHMIOP_Acceptor.so .shobj/SHMIOP_Acceptor.o .shobj/SHMIOP_Acceptor.so: SHMIOP_Acceptor.cpp \
  SHMIOP_Acceptor.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -9468,19 +6915,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -9565,6 +7006,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -9677,7 +7120,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -9693,17 +7135,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -9714,6 +7148,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -9738,7 +7174,7 @@ realclean:
  MProfile.h \
  MProfile.i
 
-.obj/SHMIOP_Connect.o .obj/SHMIOP_Connect.o .obj/SHMIOP_Connect.o .obj/SHMIOP_Connect.o: SHMIOP_Connect.cpp \
+.obj/SHMIOP_Connect.o .obj/SHMIOP_Connect.so .shobj/SHMIOP_Connect.o .shobj/SHMIOP_Connect.so: SHMIOP_Connect.cpp \
  SHMIOP_Connect.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -9765,19 +7201,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -9857,6 +7287,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -9973,7 +7405,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -9989,17 +7420,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -10010,6 +7433,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -10038,7 +7463,7 @@ realclean:
  GIOP_Message_Lite.i \
  Server_Strategy_Factory.h
 
-.obj/IORC.o .obj/IORC.o .obj/IORC.o .obj/IORC.o: IORC.cpp IORC.h \
+.obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp IORC.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -10064,19 +7489,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -10149,7 +7568,7 @@ realclean:
  Sequence_T.cpp \
  IORC.i
 
-.obj/IORManipulation.o .obj/IORManipulation.o .obj/IORManipulation.o .obj/IORManipulation.o: IORManipulation.cpp \
+.obj/IORManipulation.o .obj/IORManipulation.so .shobj/IORManipulation.o .shobj/IORManipulation.so: IORManipulation.cpp \
  IORManipulation.h \
  $(ACE_ROOT)/ace/pre.h \
  LocalObject.h \
@@ -10177,19 +7596,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -10310,6 +7723,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -10341,7 +7756,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -10352,19 +7766,11 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -10375,6 +7781,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -10385,7 +7793,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/default_client.o .obj/default_client.o .obj/default_client.o .obj/default_client.o: default_client.cpp \
+.obj/default_client.o .obj/default_client.so .shobj/default_client.o .shobj/default_client.so: default_client.cpp \
  default_client.h \
  $(ACE_ROOT)/ace/pre.h \
  Client_Strategy_Factory.h \
@@ -10412,16 +7820,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -10432,6 +7830,10 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -10544,7 +7946,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -10560,17 +7961,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -10584,6 +7977,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -10604,6 +7999,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -10624,7 +8021,7 @@ realclean:
  GIOP_Message_State.i \
  Muxed_TMS.h
 
-.obj/default_server.o .obj/default_server.o .obj/default_server.o .obj/default_server.o: default_server.cpp \
+.obj/default_server.o .obj/default_server.so .shobj/default_server.o .shobj/default_server.so: default_server.cpp \
  default_server.h \
  $(ACE_ROOT)/ace/pre.h \
  Server_Strategy_Factory.h \
@@ -10652,19 +8049,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -10783,7 +8174,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -10799,17 +8189,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -10823,6 +8205,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -10843,6 +8227,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -10850,7 +8236,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/default_resource.o .obj/default_resource.o .obj/default_resource.o .obj/default_resource.o: default_resource.cpp \
+.obj/default_resource.o .obj/default_resource.so .shobj/default_resource.o .shobj/default_resource.so: default_resource.cpp \
  default_resource.h \
  $(ACE_ROOT)/ace/pre.h \
  Resource_Factory.h \
@@ -10877,16 +8263,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -10899,6 +8275,10 @@ realclean:
  $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -10984,6 +8364,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -11035,7 +8417,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -11051,17 +8432,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  params.h \
  params.i \
@@ -11070,6 +8443,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -11122,7 +8497,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/xt_resource.o .obj/xt_resource.o .obj/xt_resource.o .obj/xt_resource.o: xt_resource.cpp \
+.obj/xt_resource.o .obj/xt_resource.so .shobj/xt_resource.o .shobj/xt_resource.so: xt_resource.cpp \
  xt_resource.h \
  $(ACE_ROOT)/ace/pre.h \
  default_resource.h \
@@ -11150,16 +8525,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -11172,6 +8537,10 @@ realclean:
  $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -11257,6 +8626,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -11287,7 +8658,7 @@ realclean:
  Protocol_Factory.h \
  default_resource.i
 
-.obj/qt_resource.o .obj/qt_resource.o .obj/qt_resource.o .obj/qt_resource.o: qt_resource.cpp \
+.obj/qt_resource.o .obj/qt_resource.so .shobj/qt_resource.o .shobj/qt_resource.so: qt_resource.cpp \
  qt_resource.h \
  $(ACE_ROOT)/ace/pre.h \
  default_resource.h \
@@ -11315,16 +8686,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -11337,6 +8698,10 @@ realclean:
  $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -11422,6 +8787,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -11452,7 +8819,7 @@ realclean:
  Protocol_Factory.h \
  default_resource.i
 
-.obj/append.o .obj/append.o .obj/append.o .obj/append.o: append.cpp \
+.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp \
  Marshal.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -11479,19 +8846,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -11610,7 +8971,6 @@ realclean:
  DynamicC.h \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -11626,13 +8986,12 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Marshal.i \
  debug.h
 
-.obj/Marshal.o .obj/Marshal.o .obj/Marshal.o .obj/Marshal.o: Marshal.cpp \
+.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp \
  Marshal.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -11659,19 +9018,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -11790,7 +9143,6 @@ realclean:
  DynamicC.h \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -11806,12 +9158,11 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Marshal.i
 
-.obj/skip.o .obj/skip.o .obj/skip.o .obj/skip.o: skip.cpp \
+.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \
  Marshal.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -11838,19 +9189,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -11969,7 +9314,6 @@ realclean:
  DynamicC.h \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -11985,13 +9329,12 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Marshal.i \
  debug.h
 
-.obj/Managed_Types.o .obj/Managed_Types.o .obj/Managed_Types.o .obj/Managed_Types.o: Managed_Types.cpp \
+.obj/Managed_Types.o .obj/Managed_Types.so .shobj/Managed_Types.o .shobj/Managed_Types.so: Managed_Types.cpp \
  Managed_Types.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -12018,19 +9361,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -12146,190 +9483,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Encodable.h \
- PolicyC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i
-
-.obj/Operation_Table.o .obj/Operation_Table.o .obj/Operation_Table.o .obj/Operation_Table.o: Operation_Table.cpp \
- Operation_Table.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- TAO_Singleton_Manager.h \
- TAO_Export.h \
- TAO_Singleton_Manager.inl \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- corbafwd.i \
- Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- ORB.h \
- Exception.h \
- Exception.i \
- IOR_LookupTable.h \
- Services.h \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- Object.h \
- Object.i \
- LocalObject.i \
- IORC.h \
- Environment.h \
- Environment.i \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- Any.h \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Any.i \
- IOPC.h \
- IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -12345,11 +9498,10 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i
 
-.obj/Any.o .obj/Any.o .obj/Any.o .obj/Any.o: Any.cpp \
+.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp \
  Any.h \
  $(ACE_ROOT)/ace/pre.h \
  CDR.h \
@@ -12377,19 +9529,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -12507,7 +9653,6 @@ realclean:
  DynamicC.h \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -12523,19 +9668,11 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Marshal.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -12549,6 +9686,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -12569,6 +9708,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -12577,7 +9718,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  debug.h
 
-.obj/CurrentC.o .obj/CurrentC.o .obj/CurrentC.o .obj/CurrentC.o: CurrentC.cpp \
+.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp \
  CurrentC.h \
  $(ACE_ROOT)/ace/pre.h \
  Object.h \
@@ -12605,19 +9746,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -12685,7 +9820,7 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp
 
-.obj/Exception.o .obj/Exception.o .obj/Exception.o .obj/Exception.o: Exception.cpp \
+.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
@@ -12712,19 +9847,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -12840,7 +9969,6 @@ realclean:
  DynamicC.h \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -12856,11 +9984,10 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i
 
-.obj/WrongTransactionC.o .obj/WrongTransactionC.o .obj/WrongTransactionC.o .obj/WrongTransactionC.o: WrongTransactionC.cpp \
+.obj/WrongTransactionC.o .obj/WrongTransactionC.so .shobj/WrongTransactionC.o .shobj/WrongTransactionC.so: WrongTransactionC.cpp \
  WrongTransactionC.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -12884,16 +10011,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -12901,6 +10018,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -12964,7 +10085,7 @@ realclean:
  CDR.h \
  CDR.i
 
-.obj/Environment.o .obj/Environment.o .obj/Environment.o .obj/Environment.o: Environment.cpp \
+.obj/Environment.o .obj/Environment.so .shobj/Environment.o .shobj/Environment.so: Environment.cpp \
  Environment.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -12991,19 +10112,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -13120,7 +10235,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -13136,17 +10250,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -13160,6 +10266,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -13180,6 +10288,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -13187,7 +10297,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Object.o .obj/Object.o .obj/Object.o .obj/Object.o: Object.cpp \
+.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp \
  Object.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -13214,19 +10324,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -13285,17 +10389,15 @@ realclean:
  TAO_Export.h \
  corbafwd.i \
  Object.i \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
+ Stub.h \
+ Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -13312,6 +10414,12 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -13321,20 +10429,16 @@ realclean:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- PortableServerC.h \
- CurrentC.h \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -13342,55 +10446,14 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
- CDR.h \
- CDR.i \
  Typecode.h \
+ Exception.h \
+ Exception.i \
  Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Servant_Base.h \
- Servant_Base.i \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
  IOPC.h \
+ CDR.h \
+ CDR.i \
  IOPC.i \
- TimeBaseC.h \
- TimeBaseC.i \
- RTCORBAC.i \
- LocalObject.h \
- LocalObject.i \
- Object_Adapter.i \
- Stub.h \
- Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
  Pluggable.i \
  MProfile.h \
  Profile.h \
@@ -13398,6 +10461,13 @@ realclean:
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
+ PolicyC.h \
+ CurrentC.h \
+ CurrentC.i \
+ Encodable.h \
+ Environment.h \
+ Environment.i \
+ PolicyC.i \
  Profile.i \
  MProfile.i \
  ORB.h \
@@ -13405,22 +10475,26 @@ realclean:
  Services.h \
  Services.i \
  IORManipulation.h \
+ LocalObject.h \
+ LocalObject.i \
  IORC.h \
  IORC.i \
  PortableInterceptor.h \
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
- DynamicC.i \
+ Any.h \
+ Any.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
  ValueFactory.h \
  ValueFactory.i \
+ TimeBaseC.h \
+ TimeBaseC.i \
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
@@ -13432,9 +10506,6 @@ realclean:
  Request.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -13445,6 +10516,11 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -13462,6 +10538,8 @@ realclean:
  TAOC.h \
  Priority_Mapping_Manager.h \
  Priority_Mapping.h \
+ RTCORBAC.h \
+ RTCORBAC.i \
  Priority_Mapping.i \
  Priority_Mapping_Manager.i \
  TAOC.i \
@@ -13474,9 +10552,12 @@ realclean:
  Invocation.i \
  Connector_Registry.h \
  Connector_Registry.i \
- debug.h
+ debug.h \
+ InterfaceC.h \
+ ifrfwd.h \
+ InterfaceC.i
 
-.obj/LocalObject.o .obj/LocalObject.o .obj/LocalObject.o .obj/LocalObject.o: LocalObject.cpp \
+.obj/LocalObject.o .obj/LocalObject.so .shobj/LocalObject.o .shobj/LocalObject.so: LocalObject.cpp \
  LocalObject.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -13503,19 +10584,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -13576,17 +10651,15 @@ realclean:
  Object.h \
  Object.i \
  LocalObject.i \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
+ Stub.h \
+ Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -13603,6 +10676,12 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -13612,20 +10691,16 @@ realclean:
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- PortableServerC.h \
- CurrentC.h \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -13633,53 +10708,14 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
- CDR.h \
- CDR.i \
  Typecode.h \
+ Exception.h \
+ Exception.i \
  Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Servant_Base.h \
- Servant_Base.i \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
  IOPC.h \
+ CDR.h \
+ CDR.i \
  IOPC.i \
- TimeBaseC.h \
- TimeBaseC.i \
- RTCORBAC.i \
- Object_Adapter.i \
- Stub.h \
- Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
  Pluggable.i \
  MProfile.h \
  Profile.h \
@@ -13687,6 +10723,13 @@ realclean:
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
+ PolicyC.h \
+ CurrentC.h \
+ CurrentC.i \
+ Encodable.h \
+ Environment.h \
+ Environment.i \
+ PolicyC.i \
  Profile.i \
  MProfile.i \
  ORB.h \
@@ -13700,16 +10743,18 @@ realclean:
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
- DynamicC.i \
+ Any.h \
+ Any.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
  ValueFactory.h \
  ValueFactory.i \
+ TimeBaseC.h \
+ TimeBaseC.i \
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
@@ -13719,56 +10764,20 @@ realclean:
  Context.h \
  Context.i \
  Request.i \
- ORB_Core.h \
- Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Policy_Manager.i \
- Resource_Factory.h \
- Protocol_Factory.h \
- params.h \
- params.i \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
+ debug.h \
+ InterfaceC.h \
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
- ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- Invocation.h \
- Synch_Reply_Dispatcher.h \
- Reply_Dispatcher.h \
- Reply_Dispatcher.i \
- GIOP_Message_State.h \
- Pluggable_Messaging.h \
- Pluggable_Messaging_Utils.h \
- Pluggable_Messaging_Utils.i \
- Pluggable_Messaging.i \
- GIOP_Message_State.i \
- Synch_Reply_Dispatcher.i \
- TAOC.h \
- Priority_Mapping_Manager.h \
- Priority_Mapping.h \
- Priority_Mapping.i \
- Priority_Mapping_Manager.i \
- TAOC.i \
- operation_details.h \
- target_specification.h \
- Object_KeyC.h \
- Object_KeyC.i \
- target_specification.i \
- operation_details.i \
- Invocation.i \
- Connector_Registry.h \
- Connector_Registry.i \
- debug.h \
+ TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ ifrfwd.h \
+ InterfaceC.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/ObjectIDList.o .obj/ObjectIDList.o .obj/ObjectIDList.o .obj/ObjectIDList.o: ObjectIDList.cpp \
+.obj/ObjectIDList.o .obj/ObjectIDList.so .shobj/ObjectIDList.o .shobj/ObjectIDList.so: ObjectIDList.cpp \
  ObjectIDList.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -13795,19 +10804,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -13925,7 +10928,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -13941,11 +10943,10 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i
 
-.obj/ORB.o .obj/ORB.o .obj/ORB.o .obj/ORB.o: ORB.cpp \
+.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp \
  ORB.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -13972,19 +10973,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -14100,7 +11095,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -14116,7 +11110,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Connector_Registry.h \
@@ -14131,6 +11124,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -14188,13 +11183,6 @@ realclean:
  Stub.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -14203,6 +11191,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -14210,34 +11200,6 @@ realclean:
  Server_Strategy_Factory.h \
  debug.h \
  TAO_Internal.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- POA.h \
- Object_KeyC.h \
- Object_KeyC.i \
- POAManager.h \
- POAManager.i \
- POA.i \
  Request.h \
  Context.h \
  Context.i \
@@ -14256,6 +11218,8 @@ realclean:
  TimeBaseS_T.i \
  TimeBaseS_T.cpp \
  TimeBaseS.i \
+ RTCORBAC.h \
+ RTCORBAC.i \
  RTCORBAS_T.h \
  RTCORBAS_T.i \
  RTCORBAS_T.cpp \
@@ -14276,9 +11240,11 @@ realclean:
  TAOC.i \
  Client_Priority_Policy.i \
  Buffering_Constraint_Policy.h \
- Buffering_Constraint_Policy.i
+ Buffering_Constraint_Policy.i \
+ Object_KeyC.h \
+ Object_KeyC.i
 
-.obj/corbafwd.o .obj/corbafwd.o .obj/corbafwd.o .obj/corbafwd.o: corbafwd.cpp \
+.obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp \
  corbafwd.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -14304,19 +11270,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -14375,7 +11335,7 @@ realclean:
  TAO_Export.h \
  corbafwd.i
 
-.obj/PolicyC.o .obj/PolicyC.o .obj/PolicyC.o .obj/PolicyC.o: PolicyC.cpp \
+.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp \
  PolicyC.h \
  $(ACE_ROOT)/ace/pre.h \
  CurrentC.h \
@@ -14404,19 +11364,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -14521,6 +11475,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -14567,7 +11523,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -14578,20 +11533,12 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
  Invocation.h \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -14602,6 +11549,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -14636,11 +11585,9 @@ realclean:
  NVList.h \
  NVList.i
 
-.obj/PolicyS.o .obj/PolicyS.o .obj/PolicyS.o .obj/PolicyS.o: PolicyS.cpp \
- PolicyC.h \
+.obj/Encodable.o .obj/Encodable.so .shobj/Encodable.o .shobj/Encodable.so: Encodable.cpp \
+ Encodable.h \
  $(ACE_ROOT)/ace/pre.h \
- CurrentC.h \
- Object.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -14665,280 +11612,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- Object.i \
- CurrentC.i \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- Server_Request.h \
- IOPC.h \
- IOPC.i \
- Object_KeyC.h \
- Object_KeyC.i \
- Server_Request.i \
- NVList.h \
- Any.h \
- Any.i \
- NVList.i \
- Stub.h \
- Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Pluggable.i \
- MProfile.h \
- Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
- CONV_FRAMEC.i \
- Tagged_Components.i \
- Profile.i \
- MProfile.i \
- ORB.h \
- IOR_LookupTable.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- LocalObject.i \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i \
- Stub.i \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- ORB_Core.h \
- Policy_Manager.h \
- Policy_Manager.i \
- Resource_Factory.h \
- Protocol_Factory.h \
- params.h \
- params.i \
- ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-
-.obj/Encodable.o .obj/Encodable.o .obj/Encodable.o .obj/Encodable.o: Encodable.cpp \
- Encodable.h \
- $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -14997,7 +11677,7 @@ realclean:
  TAO_Export.h \
  corbafwd.i
 
-.obj/Policy_Factory.o .obj/Policy_Factory.o .obj/Policy_Factory.o .obj/Policy_Factory.o: Policy_Factory.cpp \
+.obj/Policy_Factory.o .obj/Policy_Factory.so .shobj/Policy_Factory.o .shobj/Policy_Factory.so: Policy_Factory.cpp \
  Policy_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -15024,19 +11704,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -15145,8 +11819,7 @@ realclean:
  LocalObject.i \
  RT_Policy_i.i
 
-.obj/DomainC.o .obj/DomainC.o .obj/DomainC.o .obj/DomainC.o: DomainC.cpp \
- DomainC.h \
+.obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp DomainC.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -15172,19 +11845,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -15245,6 +11912,7 @@ realclean:
  PolicyC.h \
  CurrentC.h \
  Object.h \
+ corbafwd.h \
  Object.i \
  CurrentC.i \
  Encodable.h \
@@ -15264,10 +11932,25 @@ realclean:
  Environment.h \
  Environment.i \
  PolicyC.i \
+ Request_Info.h \
+ PortableInterceptorC.h \
+ DynamicC.h \
  Any.h \
  Any.i \
- DomainC.i \
- Stub.h \
+ IOPC.h \
+ IOPC.i \
+ MessagingC.h \
+ ValueBase.h \
+ ValueBase.i \
+ ValueFactory.h \
+ ValueFactory.i \
+ TimeBaseC.h \
+ TimeBaseC.i \
+ PolicyC.h \
+ PollableC.h \
+ PollableC.i \
+ MessagingC.i \
+ DomainC.i Stub.h \
  Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -15295,6 +11978,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -15315,8 +12000,6 @@ realclean:
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- IOPC.h \
- IOPC.i \
  Pluggable.i \
  MProfile.h \
  Profile.h \
@@ -15337,31 +12020,12 @@ realclean:
  IORC.i \
  PortableInterceptor.h \
  Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
  Invocation.h \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -15372,6 +12036,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -15402,201 +12068,12 @@ realclean:
  Object_KeyC.i \
  target_specification.i \
  operation_details.i \
- Invocation.i
-
-.obj/DomainS.o .obj/DomainS.o .obj/DomainS.o .obj/DomainS.o: DomainS.cpp DomainC.h \
- $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- PolicyC.h \
- CurrentC.h \
- Object.h \
- Object.i \
- CurrentC.i \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- DomainC.i \
- Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- Server_Request.h \
- IOPC.h \
- IOPC.i \
- Object_KeyC.h \
- Object_KeyC.i \
- Server_Request.i \
- POA_CORBA.h \
- DomainC.h \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
- ORB.h \
- IOR_LookupTable.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- LocalObject.i \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i
+ Invocation.i \
+ Exception.h InterfaceC.h \
+ ifrfwd.h \
+ InterfaceC.i
 
-.obj/TimeBaseC.o .obj/TimeBaseC.o .obj/TimeBaseC.o .obj/TimeBaseC.o: TimeBaseC.cpp \
+.obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp \
  TimeBaseC.h \
  $(ACE_ROOT)/ace/pre.h \
  Any.h \
@@ -15625,19 +12102,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -15712,7 +12183,7 @@ realclean:
  TimeBaseS_T.cpp \
  TimeBaseS.i
 
-.obj/TimeBaseS.o .obj/TimeBaseS.o .obj/TimeBaseS.o .obj/TimeBaseS.o: TimeBaseS.cpp \
+.obj/TimeBaseS.o .obj/TimeBaseS.so .shobj/TimeBaseS.o .shobj/TimeBaseS.so: TimeBaseS.cpp \
  TimeBaseS.h \
  $(ACE_ROOT)/ace/pre.h \
  TimeBaseC.h \
@@ -15742,19 +12213,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -15828,7 +12293,7 @@ realclean:
  TimeBaseS_T.cpp \
  TimeBaseS.i
 
-.obj/Principal.o .obj/Principal.o .obj/Principal.o .obj/Principal.o: Principal.cpp \
+.obj/Principal.o .obj/Principal.so .shobj/Principal.o .shobj/Principal.so: Principal.cpp \
  Principal.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -15855,19 +12320,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -15936,7 +12395,7 @@ realclean:
  CDR.h \
  CDR.i
 
-.obj/Sequence.o .obj/Sequence.o .obj/Sequence.o .obj/Sequence.o: Sequence.cpp \
+.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp \
  Sequence.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -15963,19 +12422,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -16040,7 +12493,7 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp
 
-.obj/Server_Request.o .obj/Server_Request.o .obj/Server_Request.o .obj/Server_Request.o: Server_Request.cpp \
+.obj/Server_Request.o .obj/Server_Request.so .shobj/Server_Request.o .shobj/Server_Request.so: Server_Request.cpp \
  Server_Request.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -16067,19 +12520,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -16204,7 +12651,6 @@ realclean:
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -16220,17 +12666,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -16244,6 +12682,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -16264,6 +12704,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -16273,12 +12715,10 @@ realclean:
  Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h
 
-.obj/MProfile.o .obj/MProfile.o .obj/MProfile.o .obj/MProfile.o: MProfile.cpp \
+.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp \
  MProfile.h \
  $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/post.h \
@@ -16300,25 +12740,7 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -16332,6 +12754,20 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -16428,6 +12864,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -16450,7 +12888,7 @@ realclean:
  $(ACE_ROOT)/ace/Message_Queue.i \
  Pluggable.i
 
-.obj/Stub.o .obj/Stub.o .obj/Stub.o .obj/Stub.o: Stub.cpp \
+.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp \
  Stub.h \
  $(ACE_ROOT)/ace/pre.h \
  Pluggable.h \
@@ -16478,19 +12916,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -16574,6 +13006,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -16642,7 +13076,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -16653,7 +13086,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
@@ -16662,13 +13094,6 @@ realclean:
  Invocation.h \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -16679,6 +13104,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -16753,7 +13180,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/Typecode.o .obj/Typecode.o .obj/Typecode.o .obj/Typecode.o: Typecode.cpp \
+.obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp \
  Typecode.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -16778,16 +13205,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -16802,6 +13219,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -16911,7 +13332,6 @@ realclean:
  DynamicC.h \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -16927,13 +13347,12 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Marshal.i \
  debug.h
 
-.obj/ValueBase.o .obj/ValueBase.o .obj/ValueBase.o .obj/ValueBase.o: ValueBase.cpp \
+.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp \
  CDR.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -16960,19 +13379,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -17088,7 +13501,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -17104,18 +13516,10 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -17129,6 +13533,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -17149,6 +13555,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -17156,7 +13564,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/ValueFactory.o .obj/ValueFactory.o .obj/ValueFactory.o .obj/ValueFactory.o: ValueFactory.cpp \
+.obj/ValueFactory.o .obj/ValueFactory.so .shobj/ValueFactory.o .shobj/ValueFactory.so: ValueFactory.cpp \
  ValueFactory.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -17183,19 +13591,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -17255,7 +13657,7 @@ realclean:
  corbafwd.i \
  ValueFactory.i
 
-.obj/ValueFactory_Map.o .obj/ValueFactory_Map.o .obj/ValueFactory_Map.o .obj/ValueFactory_Map.o: ValueFactory_Map.cpp \
+.obj/ValueFactory_Map.o .obj/ValueFactory_Map.so .shobj/ValueFactory_Map.o .shobj/ValueFactory_Map.so: ValueFactory_Map.cpp \
  ValueFactory_Map.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -17279,16 +13681,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -17297,6 +13689,10 @@ realclean:
  $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -17419,7 +13815,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -17433,11 +13828,10 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i
 
-.obj/CDR.o .obj/CDR.o .obj/CDR.o .obj/CDR.o: CDR.cpp \
+.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \
  Timeprobe.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
@@ -17461,16 +13855,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -17479,6 +13863,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -17595,7 +13983,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -17611,17 +13998,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -17635,6 +14014,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -17655,6 +14036,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -17662,7 +14045,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.o: Client_Strategy_Factory.cpp \
+.obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.so .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.so: Client_Strategy_Factory.cpp \
  Client_Strategy_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -17688,16 +14071,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -17708,6 +14081,10 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -17764,7 +14141,7 @@ realclean:
  TAO_Export.h \
  corbafwd.i
 
-.obj/debug.o .obj/debug.o .obj/debug.o .obj/debug.o: debug.cpp \
+.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \
  debug.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -17791,19 +14168,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -17862,7 +14233,7 @@ realclean:
  TAO_Export.h \
  corbafwd.i
 
-.obj/Object_KeyC.o .obj/Object_KeyC.o .obj/Object_KeyC.o .obj/Object_KeyC.o: Object_KeyC.cpp \
+.obj/Object_KeyC.o .obj/Object_KeyC.so .shobj/Object_KeyC.o .shobj/Object_KeyC.so: Object_KeyC.cpp \
  Object_KeyC.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -17889,19 +14260,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -17972,7 +14337,7 @@ realclean:
  Exception.i \
  Typecode.i
 
-.obj/Invocation.o .obj/Invocation.o .obj/Invocation.o .obj/Invocation.o: Invocation.cpp \
+.obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp \
  Invocation.h \
  $(ACE_ROOT)/ace/pre.h \
  CDR.h \
@@ -18000,19 +14365,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -18129,7 +14488,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -18145,17 +14503,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -18169,6 +14519,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -18189,6 +14541,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -18263,7 +14617,7 @@ realclean:
  GIOP_Utils.h \
  GIOP_Utils.i
 
-.obj/Asynch_Invocation.o .obj/Asynch_Invocation.o .obj/Asynch_Invocation.o .obj/Asynch_Invocation.o: Asynch_Invocation.cpp \
+.obj/Asynch_Invocation.o .obj/Asynch_Invocation.so .shobj/Asynch_Invocation.o .shobj/Asynch_Invocation.so: Asynch_Invocation.cpp \
  Asynch_Invocation.h \
  $(ACE_ROOT)/ace/pre.h \
  Invocation.h \
@@ -18292,19 +14646,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -18421,7 +14769,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -18437,17 +14784,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -18461,6 +14800,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -18481,6 +14822,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -18529,7 +14872,7 @@ realclean:
  Stub.i \
  Transport_Mux_Strategy.h
 
-.obj/DII_Invocation.o .obj/DII_Invocation.o .obj/DII_Invocation.o .obj/DII_Invocation.o: DII_Invocation.cpp \
+.obj/DII_Invocation.o .obj/DII_Invocation.so .shobj/DII_Invocation.o .shobj/DII_Invocation.so: DII_Invocation.cpp \
  DII_Invocation.h \
  $(ACE_ROOT)/ace/pre.h \
  Invocation.h \
@@ -18558,19 +14901,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -18687,7 +15024,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -18703,17 +15039,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -18727,6 +15055,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -18747,6 +15077,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -18802,7 +15134,7 @@ realclean:
  Transport_Mux_Strategy.h \
  debug.h
 
-.obj/operation_details.o .obj/operation_details.o .obj/operation_details.o .obj/operation_details.o: operation_details.cpp \
+.obj/operation_details.o .obj/operation_details.so .shobj/operation_details.o .shobj/operation_details.so: operation_details.cpp \
  operation_details.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -18829,19 +15161,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -18916,7 +15242,7 @@ realclean:
  target_specification.i \
  operation_details.i
 
-.obj/PortableInterceptor.o .obj/PortableInterceptor.o .obj/PortableInterceptor.o .obj/PortableInterceptor.o: PortableInterceptor.cpp \
+.obj/PortableInterceptor.o .obj/PortableInterceptor.so .shobj/PortableInterceptor.o .shobj/PortableInterceptor.so: PortableInterceptor.cpp \
  corbafwd.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -18942,19 +15268,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -19037,7 +15357,6 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -19053,10 +15372,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i
 
-.obj/Request_Info.o .obj/Request_Info.o .obj/Request_Info.o .obj/Request_Info.o: Request_Info.cpp Request_Info.h \
+.obj/Request_Info.o .obj/Request_Info.so .shobj/Request_Info.o .shobj/Request_Info.so: Request_Info.cpp Request_Info.h \
  PortableInterceptorC.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -19083,19 +15401,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -19175,7 +15487,6 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -19191,7 +15502,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  corba.h \
  ORB.h \
  IOR_LookupTable.h \
@@ -19243,40 +15553,6 @@ realclean:
  Object_KeyC.h \
  Object_KeyC.i \
  Server_Request.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- PortableServerC.h \
- PortableServerC.i \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Servant_Base.h \
- Servant_Base.i \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- POAManager.h \
- POAManager.i \
- POA.i \
  Stub.h \
  Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -19289,6 +15565,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -19314,9 +15592,6 @@ realclean:
  params.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -19325,12 +15600,17 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- Operation_Table.h \
  debug.h \
  Client_Strategy_Factory.h \
+ Server_Strategy_Factory.h \
  Invocation.h \
  Synch_Reply_Dispatcher.h \
  Reply_Dispatcher.h \
@@ -19345,6 +15625,8 @@ realclean:
  TAOC.h \
  Priority_Mapping_Manager.h \
  Priority_Mapping.h \
+ RTCORBAC.h \
+ RTCORBAC.i \
  Priority_Mapping.i \
  Priority_Mapping_Manager.i \
  TAOC.i \
@@ -19355,23 +15637,16 @@ realclean:
  Invocation.i \
  ObjectIDList.h \
  ObjectIDList.i \
+ DomainC.h \
+ DomainC.i \
  WrongTransactionC.h \
  InterfaceC.h \
  ifrfwd.h \
+ InterfaceC.i \
  BoundsC.h \
- BoundsC.i \
- MessagingS.h \
- TimeBaseS.h \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- MessagingS_T.h \
- MessagingS_T.i \
- MessagingS_T.cpp \
- MessagingS.i
+ BoundsC.i
 
-.obj/PortableInterceptorC.o .obj/PortableInterceptorC.o .obj/PortableInterceptorC.o .obj/PortableInterceptorC.o: PortableInterceptorC.cpp \
+.obj/PortableInterceptorC.o .obj/PortableInterceptorC.so .shobj/PortableInterceptorC.o .shobj/PortableInterceptorC.so: PortableInterceptorC.cpp \
  PortableInterceptorC.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -19398,19 +15673,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -19490,7 +15759,6 @@ realclean:
  Sequence_T.i \
  Sequence_T.cpp \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -19505,188 +15773,9 @@ realclean:
  PolicyC.i \
  PollableC.h \
  PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- corba.h \
- ORB.h \
- IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- LocalObject.i \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptor.i \
- ORB.i \
- NVList.h \
- NVList.i \
- Principal.h \
- Principal.i \
- Request.h \
- Context.h \
- Context.i \
- Request.i \
- Server_Request.h \
- Object_KeyC.h \
- Object_KeyC.i \
- Server_Request.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- PortableServerC.h \
- PortableServerC.i \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Servant_Base.h \
- Servant_Base.i \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- POAManager.h \
- POAManager.i \
- POA.i \
- Stub.h \
- Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Pluggable.i \
- MProfile.h \
- Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
- CONV_FRAMEC.i \
- Tagged_Components.i \
- Profile.i \
- MProfile.i \
- Stub.i \
- params.h \
- params.i \
- ORB_Core.h \
- Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Policy_Manager.i \
- Resource_Factory.h \
- Protocol_Factory.h \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- Operation_Table.h \
- debug.h \
- Client_Strategy_Factory.h \
- Invocation.h \
- Synch_Reply_Dispatcher.h \
- Reply_Dispatcher.h \
- Reply_Dispatcher.i \
- GIOP_Message_State.h \
- Pluggable_Messaging.h \
- Pluggable_Messaging_Utils.h \
- Pluggable_Messaging_Utils.i \
- Pluggable_Messaging.i \
- GIOP_Message_State.i \
- Synch_Reply_Dispatcher.i \
- TAOC.h \
- Priority_Mapping_Manager.h \
- Priority_Mapping.h \
- Priority_Mapping.i \
- Priority_Mapping_Manager.i \
- TAOC.i \
- operation_details.h \
- target_specification.h \
- target_specification.i \
- operation_details.i \
- Invocation.i \
- ObjectIDList.h \
- ObjectIDList.i \
- WrongTransactionC.h \
- InterfaceC.h \
- ifrfwd.h \
- BoundsC.h \
- BoundsC.i \
- MessagingS.h \
- TimeBaseS.h \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- MessagingS_T.h \
- MessagingS_T.i \
- MessagingS_T.cpp \
- MessagingS.i
+ MessagingC.i
 
-.obj/DynamicC.o .obj/DynamicC.o .obj/DynamicC.o .obj/DynamicC.o: DynamicC.cpp DynamicC.h \
+.obj/DynamicC.o .obj/DynamicC.so .shobj/DynamicC.o .shobj/DynamicC.so: DynamicC.cpp DynamicC.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -19712,19 +15801,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -19802,206 +15885,9 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
- IOPC.i \
- DynamicC.i \
- ORB.h \
- IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- LocalObject.i \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Encodable.h \
- PolicyC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i \
- corba.h \
- NVList.h \
- NVList.i \
- Principal.h \
- Principal.i \
- Request.h \
- Context.h \
- Context.i \
- Request.i \
- Server_Request.h \
- Object_KeyC.h \
- Object_KeyC.i \
- Server_Request.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- PortableServerC.h \
- PortableServerC.i \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Servant_Base.h \
- Servant_Base.i \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- POAManager.h \
- POAManager.i \
- POA.i \
- Stub.h \
- Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Pluggable.i \
- MProfile.h \
- Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
- CONV_FRAMEC.i \
- Tagged_Components.i \
- Profile.i \
- MProfile.i \
- Stub.i \
- params.h \
- params.i \
- ORB_Core.h \
- Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Policy_Manager.i \
- Resource_Factory.h \
- Protocol_Factory.h \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- Operation_Table.h \
- debug.h \
- Client_Strategy_Factory.h \
- Invocation.h \
- Synch_Reply_Dispatcher.h \
- Reply_Dispatcher.h \
- Reply_Dispatcher.i \
- GIOP_Message_State.h \
- Pluggable_Messaging.h \
- Pluggable_Messaging_Utils.h \
- Pluggable_Messaging_Utils.i \
- Pluggable_Messaging.i \
- GIOP_Message_State.i \
- Synch_Reply_Dispatcher.i \
- TAOC.h \
- Priority_Mapping_Manager.h \
- Priority_Mapping.h \
- Priority_Mapping.i \
- Priority_Mapping_Manager.i \
- TAOC.i \
- operation_details.h \
- target_specification.h \
- target_specification.i \
- operation_details.i \
- Invocation.i \
- ObjectIDList.h \
- ObjectIDList.i \
- WrongTransactionC.h \
- InterfaceC.h \
- ifrfwd.h \
- BoundsC.h \
- BoundsC.i \
- MessagingS.h \
- TimeBaseS.h \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- MessagingS_T.h \
- MessagingS_T.i \
- MessagingS_T.cpp \
- MessagingS.i
+ IOPC.i
 
-.obj/Smart_Proxies.o .obj/Smart_Proxies.o .obj/Smart_Proxies.o .obj/Smart_Proxies.o: Smart_Proxies.cpp \
+.obj/Smart_Proxies.o .obj/Smart_Proxies.so .shobj/Smart_Proxies.o .shobj/Smart_Proxies.so: Smart_Proxies.cpp \
  Smart_Proxies.h \
  $(ACE_ROOT)/ace/pre.h \
  Object.h \
@@ -20029,19 +15915,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -20102,7 +15982,7 @@ realclean:
  Object.i \
  Smart_Proxies.i
 
-.obj/ORB_Core.o .obj/ORB_Core.o .obj/ORB_Core.o .obj/ORB_Core.o: ORB_Core.cpp \
+.obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp \
  ORB_Core.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -20129,19 +16009,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -20258,7 +16132,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -20274,17 +16147,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -20298,6 +16163,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -20318,6 +16185,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -20359,34 +16228,6 @@ realclean:
  Connector_Registry.i \
  Acceptor_Registry.h \
  Acceptor_Registry.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- Object_KeyC.h \
- Object_KeyC.i \
- POAManager.h \
- POAManager.i \
- POA.i \
  RT_ORB.h \
  RTCORBAS.h \
  IOPS.h \
@@ -20399,6 +16240,8 @@ realclean:
  TimeBaseS_T.i \
  TimeBaseS_T.cpp \
  TimeBaseS.i \
+ RTCORBAC.h \
+ RTCORBAC.i \
  RTCORBAS_T.h \
  RTCORBAS_T.i \
  RTCORBAS_T.cpp \
@@ -20419,7 +16262,7 @@ realclean:
  Object_Loader.h \
  Object_Loader.i
 
-.obj/Leader_Follower.o .obj/Leader_Follower.o .obj/Leader_Follower.o .obj/Leader_Follower.o: Leader_Follower.cpp \
+.obj/Leader_Follower.o .obj/Leader_Follower.so .shobj/Leader_Follower.o .shobj/Leader_Follower.so: Leader_Follower.cpp \
  Leader_Follower.h \
  $(ACE_ROOT)/ace/pre.h \
  ORB_Core.h \
@@ -20447,19 +16290,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -20576,7 +16413,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -20592,17 +16428,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -20616,6 +16444,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -20636,6 +16466,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -20644,7 +16476,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  Leader_Follower.i
 
-.obj/Reactor_Registry.o .obj/Reactor_Registry.o .obj/Reactor_Registry.o .obj/Reactor_Registry.o: Reactor_Registry.cpp \
+.obj/Reactor_Registry.o .obj/Reactor_Registry.so .shobj/Reactor_Registry.o .shobj/Reactor_Registry.so: Reactor_Registry.cpp \
  Reactor_Registry.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -20671,19 +16503,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -20743,7 +16569,7 @@ realclean:
  corbafwd.i \
  Reactor_Registry.i
 
-.obj/Single_Reactor.o .obj/Single_Reactor.o .obj/Single_Reactor.o .obj/Single_Reactor.o: Single_Reactor.cpp \
+.obj/Single_Reactor.o .obj/Single_Reactor.so .shobj/Single_Reactor.o .shobj/Single_Reactor.so: Single_Reactor.cpp \
  Single_Reactor.h \
  $(ACE_ROOT)/ace/pre.h \
  Reactor_Registry.h \
@@ -20771,19 +16597,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -20903,7 +16723,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -20919,17 +16738,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -20943,6 +16754,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -20963,6 +16776,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -20972,7 +16787,7 @@ realclean:
  Leader_Follower.h \
  Leader_Follower.i
 
-.obj/Reactor_Per_Priority.o .obj/Reactor_Per_Priority.o .obj/Reactor_Per_Priority.o .obj/Reactor_Per_Priority.o: Reactor_Per_Priority.cpp \
+.obj/Reactor_Per_Priority.o .obj/Reactor_Per_Priority.so .shobj/Reactor_Per_Priority.o .shobj/Reactor_Per_Priority.so: Reactor_Per_Priority.cpp \
  Reactor_Per_Priority.h \
  $(ACE_ROOT)/ace/pre.h \
  Reactor_Registry.h \
@@ -21000,19 +16815,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -21135,7 +16944,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -21151,17 +16959,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -21175,6 +16975,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -21195,6 +16997,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -21202,7 +17006,7 @@ realclean:
  Leader_Follower.i \
  debug.h
 
-.obj/params.o .obj/params.o .obj/params.o .obj/params.o: params.cpp \
+.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp \
  params.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -21229,19 +17033,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -21327,7 +17125,7 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  params.i
 
-.obj/Resource_Factory.o .obj/Resource_Factory.o .obj/Resource_Factory.o .obj/Resource_Factory.o: Resource_Factory.cpp \
+.obj/Resource_Factory.o .obj/Resource_Factory.so .shobj/Resource_Factory.o .shobj/Resource_Factory.so: Resource_Factory.cpp \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -21350,16 +17148,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -21386,6 +17174,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -21469,6 +17261,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -21513,7 +17307,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -21529,17 +17322,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  params.h \
  params.i \
@@ -21548,13 +17333,15 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  ORB_Core.i \
  Client_Strategy_Factory.h
 
-.obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.o: Server_Strategy_Factory.cpp \
+.obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.so .shobj/Server_Strategy_Factory.o .shobj/Server_Strategy_Factory.so: Server_Strategy_Factory.cpp \
  Server_Strategy_Factory.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -21581,19 +17368,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -21656,7 +17437,7 @@ realclean:
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i
 
-.obj/Sync_Strategies.o .obj/Sync_Strategies.o .obj/Sync_Strategies.o .obj/Sync_Strategies.o: Sync_Strategies.cpp \
+.obj/Sync_Strategies.o .obj/Sync_Strategies.so .shobj/Sync_Strategies.o .shobj/Sync_Strategies.so: Sync_Strategies.cpp \
  Sync_Strategies.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -21683,19 +17464,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -21780,6 +17555,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -21862,7 +17639,6 @@ realclean:
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -21871,19 +17647,11 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -21894,6 +17662,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -21901,7 +17671,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/TAO_Internal.o .obj/TAO_Internal.o .obj/TAO_Internal.o .obj/TAO_Internal.o: TAO_Internal.cpp \
+.obj/TAO_Internal.o .obj/TAO_Internal.so .shobj/TAO_Internal.o .shobj/TAO_Internal.so: TAO_Internal.cpp \
  TAO_Internal.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -21928,19 +17698,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -22046,6 +17810,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -22075,7 +17841,7 @@ realclean:
  UIOP_Factory.h \
  SHMIOP_Factory.h
 
-.obj/Typecode_Constants.o .obj/Typecode_Constants.o .obj/Typecode_Constants.o .obj/Typecode_Constants.o: Typecode_Constants.cpp \
+.obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.cpp \
  Typecode.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -22100,16 +17866,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -22124,6 +17880,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -22230,7 +17990,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -22246,7 +18005,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Object_KeyC.h \
@@ -22259,7 +18017,7 @@ realclean:
  BoundsC.h \
  BoundsC.i
 
-.obj/IOR_LookupTable.o .obj/IOR_LookupTable.o .obj/IOR_LookupTable.o .obj/IOR_LookupTable.o: IOR_LookupTable.cpp \
+.obj/IOR_LookupTable.o .obj/IOR_LookupTable.so .shobj/IOR_LookupTable.o .shobj/IOR_LookupTable.so: IOR_LookupTable.cpp \
  IOR_LookupTable.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Synch_T.h \
@@ -22285,16 +18043,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch.h \
@@ -22308,6 +18056,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -22396,8 +18148,8 @@ realclean:
  Environment.i \
  debug.h
 
-.obj/TAO.o .obj/TAO.o .obj/TAO.o .obj/TAO.o: TAO.cpp \
- TAO.h \
+.obj/Wait_Strategy.o .obj/Wait_Strategy.so .shobj/Wait_Strategy.o .shobj/Wait_Strategy.so: Wait_Strategy.cpp \
+ Wait_Strategy.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -22423,197 +18175,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- PortableServerC.h \
- CurrentC.h \
- Object.h \
- Object.i \
- CurrentC.i \
- PolicyC.h \
- Encodable.h \
- Exception.h \
- Exception.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- CDR.h \
- CDR.i \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- Any.h \
- Any.i \
- PortableServerC.i \
- ORB.h \
- IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- LocalObject.i \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- IOPC.h \
- IOPC.i \
- DynamicC.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i
-
-.obj/Wait_Strategy.o .obj/Wait_Strategy.o .obj/Wait_Strategy.o .obj/Wait_Strategy.o: Wait_Strategy.cpp \
- Wait_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -22672,7 +18240,7 @@ realclean:
  TAO_Export.h \
  corbafwd.i
 
-.obj/Wait_On_Read.o .obj/Wait_On_Read.o .obj/Wait_On_Read.o .obj/Wait_On_Read.o: Wait_On_Read.cpp \
+.obj/Wait_On_Read.o .obj/Wait_On_Read.so .shobj/Wait_On_Read.o .shobj/Wait_On_Read.so: Wait_On_Read.cpp \
  Wait_On_Read.h \
  $(ACE_ROOT)/ace/pre.h \
  Wait_Strategy.h \
@@ -22700,19 +18268,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -22797,6 +18359,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -22834,7 +18398,7 @@ realclean:
  IOPC.i \
  Pluggable.i
 
-.obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.o: Wait_On_Reactor.cpp \
+.obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.so .shobj/Wait_On_Reactor.o .shobj/Wait_On_Reactor.so: Wait_On_Reactor.cpp \
  Wait_On_Reactor.h \
  $(ACE_ROOT)/ace/pre.h \
  Wait_Strategy.h \
@@ -22862,19 +18426,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -22959,6 +18517,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -23015,7 +18575,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -23031,17 +18590,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -23052,6 +18603,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -23059,7 +18612,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.o: Wait_On_Leader_Follower.cpp \
+.obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.so .shobj/Wait_On_Leader_Follower.o .shobj/Wait_On_Leader_Follower.so: Wait_On_Leader_Follower.cpp \
  Wait_On_Leader_Follower.h \
  $(ACE_ROOT)/ace/pre.h \
  Wait_Strategy.h \
@@ -23087,19 +18640,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -23184,6 +18731,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -23240,7 +18789,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -23256,17 +18804,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -23277,6 +18817,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -23287,7 +18829,7 @@ realclean:
  Leader_Follower.i \
  debug.h
 
-.obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.o: Transport_Mux_Strategy.cpp \
+.obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.so .shobj/Transport_Mux_Strategy.o .shobj/Transport_Mux_Strategy.so: Transport_Mux_Strategy.cpp \
  Transport_Mux_Strategy.h \
  $(ACE_ROOT)/ace/pre.h \
  IOPC.h \
@@ -23316,19 +18858,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -23398,7 +18934,7 @@ realclean:
  Reply_Dispatcher.h \
  Reply_Dispatcher.i
 
-.obj/Exclusive_TMS.o .obj/Exclusive_TMS.o .obj/Exclusive_TMS.o .obj/Exclusive_TMS.o: Exclusive_TMS.cpp \
+.obj/Exclusive_TMS.o .obj/Exclusive_TMS.so .shobj/Exclusive_TMS.o .shobj/Exclusive_TMS.so: Exclusive_TMS.cpp \
  Exclusive_TMS.h \
  $(ACE_ROOT)/ace/pre.h \
  Transport_Mux_Strategy.h \
@@ -23428,19 +18964,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -23544,6 +19074,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -23569,7 +19101,7 @@ realclean:
  Pluggable.i \
  debug.h
 
-.obj/Muxed_TMS.o .obj/Muxed_TMS.o .obj/Muxed_TMS.o .obj/Muxed_TMS.o: Muxed_TMS.cpp \
+.obj/Muxed_TMS.o .obj/Muxed_TMS.so .shobj/Muxed_TMS.o .shobj/Muxed_TMS.so: Muxed_TMS.cpp \
  Muxed_TMS.h \
  $(ACE_ROOT)/ace/pre.h \
  Transport_Mux_Strategy.h \
@@ -23599,19 +19131,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -23716,6 +19242,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -23740,7 +19268,7 @@ realclean:
  GIOP_Message_State.i \
  debug.h
 
-.obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.o: Reply_Dispatcher.cpp \
+.obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.so .shobj/Reply_Dispatcher.o .shobj/Reply_Dispatcher.so: Reply_Dispatcher.cpp \
  Reply_Dispatcher.h \
  $(ACE_ROOT)/ace/pre.h \
  IOPC.h \
@@ -23769,19 +19297,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -23850,7 +19372,7 @@ realclean:
  IOPC.i \
  Reply_Dispatcher.i
 
-.obj/Synch_Reply_Dispatcher.o .obj/Synch_Reply_Dispatcher.o .obj/Synch_Reply_Dispatcher.o .obj/Synch_Reply_Dispatcher.o: Synch_Reply_Dispatcher.cpp \
+.obj/Synch_Reply_Dispatcher.o .obj/Synch_Reply_Dispatcher.so .shobj/Synch_Reply_Dispatcher.o .shobj/Synch_Reply_Dispatcher.so: Synch_Reply_Dispatcher.cpp \
  Synch_Reply_Dispatcher.h \
  $(ACE_ROOT)/ace/pre.h \
  Reply_Dispatcher.h \
@@ -23880,19 +19402,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -24016,7 +19532,6 @@ realclean:
  Typecode.h \
  Typecode.i \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -24032,17 +19547,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -24056,6 +19563,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -24076,6 +19585,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -24084,7 +19595,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  Wait_Strategy.h
 
-.obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.o: Asynch_Reply_Dispatcher.cpp \
+.obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.so .shobj/Asynch_Reply_Dispatcher.o .shobj/Asynch_Reply_Dispatcher.so: Asynch_Reply_Dispatcher.cpp \
  Asynch_Reply_Dispatcher.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -24108,16 +19619,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  Reply_Dispatcher.h \
  IOPC.h \
  CDR.h \
@@ -24128,6 +19629,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -24265,18 +19770,9 @@ realclean:
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
- DynamicC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -24290,6 +19786,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -24310,6 +19808,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -24320,7 +19820,7 @@ realclean:
  Leader_Follower.i \
  debug.h
 
-.obj/DII_Reply_Dispatcher.o .obj/DII_Reply_Dispatcher.o .obj/DII_Reply_Dispatcher.o .obj/DII_Reply_Dispatcher.o: DII_Reply_Dispatcher.cpp \
+.obj/DII_Reply_Dispatcher.o .obj/DII_Reply_Dispatcher.so .shobj/DII_Reply_Dispatcher.o .shobj/DII_Reply_Dispatcher.so: DII_Reply_Dispatcher.cpp \
  DII_Reply_Dispatcher.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -24344,16 +19844,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  Reply_Dispatcher.h \
  IOPC.h \
  CDR.h \
@@ -24364,6 +19854,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -24458,6 +19952,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -24509,7 +20005,6 @@ realclean:
  DynamicC.h \
  Any.h \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -24525,7 +20020,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  NVList.h \
@@ -24535,7 +20029,7 @@ realclean:
  Request.i \
  debug.h
 
-.obj/IOPC.o .obj/IOPC.o .obj/IOPC.o .obj/IOPC.o: IOPC.cpp \
+.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp \
  IOPC.h \
  $(ACE_ROOT)/ace/pre.h \
  CDR.h \
@@ -24563,19 +20057,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -24653,7 +20141,7 @@ realclean:
  Typecode.i \
  Any.i
 
-.obj/IOPS.o .obj/IOPS.o .obj/IOPS.o .obj/IOPS.o: IOPS.cpp \
+.obj/IOPS.o .obj/IOPS.so .shobj/IOPS.o .shobj/IOPS.so: IOPS.cpp \
  IOPS.h \
  $(ACE_ROOT)/ace/pre.h \
  IOPC.h \
@@ -24682,19 +20170,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -24766,7 +20248,7 @@ realclean:
  IOPS_T.cpp \
  IOPS.i
 
-.obj/PollableC.o .obj/PollableC.o .obj/PollableC.o .obj/PollableC.o: PollableC.cpp PollableC.h \
+.obj/PollableC.o .obj/PollableC.so .shobj/PollableC.o .shobj/PollableC.so: PollableC.cpp PollableC.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -24792,19 +20274,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -24869,31 +20345,6 @@ realclean:
  CDR.h \
  CDR.i \
  PollableC.i \
- POA_CORBA.h \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Encodable.h \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- Typecode.h \
- Typecode.i \
- Environment.h \
- Environment.i \
- PolicyC.i \
- DomainC.h \
- Any.h \
- Any.i \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Stub.h \
  Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -24922,6 +20373,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -24942,6 +20395,15 @@ realclean:
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
+ Typecode.h \
+ Typecode.i \
  IOPC.h \
  IOPC.i \
  Pluggable.i \
@@ -24951,6 +20413,13 @@ realclean:
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
+ PolicyC.h \
+ CurrentC.h \
+ CurrentC.i \
+ Encodable.h \
+ Environment.h \
+ Environment.i \
+ PolicyC.i \
  Profile.i \
  MProfile.i \
  ORB.h \
@@ -24966,7 +20435,8 @@ realclean:
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
- DynamicC.i \
+ Any.h \
+ Any.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -24976,7 +20446,6 @@ realclean:
  TimeBaseC.i \
  PollableC.h \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
@@ -24993,6 +20462,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -25025,7 +20496,7 @@ realclean:
  operation_details.i \
  Invocation.i
 
-.obj/PollableS.o .obj/PollableS.o .obj/PollableS.o .obj/PollableS.o: PollableS.cpp PollableS.h PollableC.h \
+.obj/PollableS.o .obj/PollableS.so .shobj/PollableS.o .shobj/PollableS.so: PollableS.cpp PollableS.h PollableC.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -25051,19 +20522,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -25129,7 +20594,7 @@ realclean:
  CDR.i \
  PollableC.i PollableS_T.h PollableS_T.i PollableS_T.cpp PollableS.i
 
-.obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.o: CONV_FRAMEC.cpp \
+.obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp \
  CONV_FRAMEC.h \
  $(ACE_ROOT)/ace/pre.h \
  CDR.h \
@@ -25157,19 +20622,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -25247,7 +20706,7 @@ realclean:
  Typecode.i \
  Any.i
 
-.obj/CONV_FRAMES.o .obj/CONV_FRAMES.o .obj/CONV_FRAMES.o .obj/CONV_FRAMES.o: CONV_FRAMES.cpp \
+.obj/CONV_FRAMES.o .obj/CONV_FRAMES.so .shobj/CONV_FRAMES.o .shobj/CONV_FRAMES.so: CONV_FRAMES.cpp \
  CONV_FRAMES.h \
  $(ACE_ROOT)/ace/pre.h \
  CONV_FRAMEC.h \
@@ -25276,19 +20735,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -25360,7 +20813,7 @@ realclean:
  CONV_FRAMES_T.cpp \
  CONV_FRAMES.i
 
-.obj/Tagged_Components.o .obj/Tagged_Components.o .obj/Tagged_Components.o .obj/Tagged_Components.o: Tagged_Components.cpp \
+.obj/Tagged_Components.o .obj/Tagged_Components.so .shobj/Tagged_Components.o .shobj/Tagged_Components.so: Tagged_Components.cpp \
  Tagged_Components.h \
  $(ACE_ROOT)/ace/pre.h \
  IOPC.h \
@@ -25389,19 +20842,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -25472,7 +20919,7 @@ realclean:
  CONV_FRAMEC.i \
  Tagged_Components.i
 
-.obj/GIOPC.o .obj/GIOPC.o .obj/GIOPC.o .obj/GIOPC.o: GIOPC.cpp \
+.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp \
  GIOPC.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -25499,19 +20946,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -25594,7 +21035,7 @@ realclean:
  Typecode.i \
  Any.i
 
-.obj/BoundsC.o .obj/BoundsC.o .obj/BoundsC.o .obj/BoundsC.o: BoundsC.cpp \
+.obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp \
  BoundsC.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -25621,19 +21062,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -25705,7 +21140,7 @@ realclean:
  Any.i \
  BoundsC.i
 
-.obj/TAOC.o .obj/TAOC.o .obj/TAOC.o .obj/TAOC.o: TAOC.cpp TAOC.h \
+.obj/TAOC.o .obj/TAOC.so .shobj/TAOC.o .shobj/TAOC.so: TAOC.cpp TAOC.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -25731,19 +21166,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -25844,7 +21273,7 @@ realclean:
  TAOS_T.cpp \
  TAOS.i
 
-.obj/TAOS.o .obj/TAOS.o .obj/TAOS.o .obj/TAOS.o: TAOS.cpp TAOS.h \
+.obj/TAOS.o .obj/TAOS.so .shobj/TAOS.o .shobj/TAOS.so: TAOS.cpp TAOS.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -25870,19 +21299,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -25942,7 +21365,7 @@ realclean:
  corbafwd.i \
  TAOS_T.h TAOS_T.i TAOS_T.cpp TAOS.i
 
-.obj/Object_Loader.o .obj/Object_Loader.o .obj/Object_Loader.o .obj/Object_Loader.o: Object_Loader.cpp \
+.obj/Object_Loader.o .obj/Object_Loader.so .shobj/Object_Loader.o .shobj/Object_Loader.so: Object_Loader.cpp \
  Object_Loader.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -25969,19 +21392,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -26063,7 +21480,7 @@ realclean:
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i
 
-.obj/TAO_Singleton_Manager.o .obj/TAO_Singleton_Manager.o .obj/TAO_Singleton_Manager.o .obj/TAO_Singleton_Manager.o: TAO_Singleton_Manager.cpp \
+.obj/TAO_Singleton_Manager.o .obj/TAO_Singleton_Manager.so .shobj/TAO_Singleton_Manager.o .shobj/TAO_Singleton_Manager.so: TAO_Singleton_Manager.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -26086,20 +21503,14 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -26166,7 +21577,7 @@ realclean:
  Typecode.h \
  Typecode.i
 
-.obj/DLL_ORB.o .obj/DLL_ORB.o .obj/DLL_ORB.o .obj/DLL_ORB.o: DLL_ORB.cpp \
+.obj/DLL_ORB.o .obj/DLL_ORB.so .shobj/DLL_ORB.o .shobj/DLL_ORB.so: DLL_ORB.cpp \
  $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -26190,16 +21601,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
@@ -26208,6 +21609,10 @@ realclean:
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -26275,6 +21680,8 @@ realclean:
  DLL_ORB.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -26357,7 +21764,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -26373,15 +21779,14 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  DLL_ORB.inl \
  TAO_Singleton_Manager.h \
  TAO_Singleton_Manager.inl
 
-.obj/Context.o .obj/Context.o .obj/Context.o .obj/Context.o: Context.cpp \
- Context.h \
+.obj/Adapter.o .obj/Adapter.so .shobj/Adapter.o .shobj/Adapter.so: Adapter.cpp \
+ Adapter.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -26407,19 +21812,227 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ Adapter.i \
+ Exception.h \
+ Exception.i \
+ Object.h \
+ Object.i \
+ Object_KeyC.h \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
+ Object_KeyC.i \
+ ORB_Core.h \
+ ORB.h \
+ IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ Services.h \
+ Services.i \
+ IORManipulation.h \
+ LocalObject.h \
+ LocalObject.i \
+ IORC.h \
+ Environment.h \
+ Environment.i \
+ IORC.i \
+ PortableInterceptor.h \
+ Request_Info.h \
+ PortableInterceptorC.h \
+ DynamicC.h \
+ Any.h \
+ CDR.h \
+ CDR.i \
+ Typecode.h \
+ Typecode.i \
+ Any.i \
+ IOPC.h \
+ IOPC.i \
+ MessagingC.h \
+ ValueBase.h \
+ ValueBase.i \
+ ValueFactory.h \
+ ValueFactory.i \
+ TimeBaseC.h \
+ TimeBaseC.i \
+ PolicyC.h \
+ CurrentC.h \
+ CurrentC.i \
+ Encodable.h \
+ PolicyC.i \
+ PollableC.h \
+ PollableC.i \
+ MessagingC.i \
+ PortableInterceptor.i \
+ ORB.i \
+ Policy_Manager.h \
+ Policy_Manager.i \
+ Resource_Factory.h \
+ Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Adapter.h \
  $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ Pluggable.i \
+ Protocol_Factory.h \
+ params.h \
+ params.i \
+ TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h \
+ TAO_Singleton.inl \
+ TAO_Singleton.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+.obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp \
+ Context.h \
+ $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -26539,7 +22152,6 @@ realclean:
  DynamicC.h \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -26555,11 +22167,10 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i
 
-.obj/Request.o .obj/Request.o .obj/Request.o .obj/Request.o: Request.cpp \
+.obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp \
  Request.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -26583,16 +22194,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -26600,6 +22201,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -26715,7 +22320,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -26731,7 +22335,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  NVList.h \
@@ -26751,6 +22354,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -26775,7 +22380,7 @@ realclean:
  Pluggable_Messaging_Utils.h \
  Pluggable_Messaging_Utils.i
 
-.obj/Services.o .obj/Services.o .obj/Services.o .obj/Services.o: Services.cpp \
+.obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \
  Services.h \
  $(ACE_ROOT)/ace/pre.h \
  Sequence.h \
@@ -26803,19 +22408,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -26893,7 +22492,7 @@ realclean:
  Typecode.i \
  Any.i
 
-.obj/NVList.o .obj/NVList.o .obj/NVList.o .obj/NVList.o: NVList.cpp \
+.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp \
  NVList.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -26917,16 +22516,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -26936,6 +22525,10 @@ realclean:
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -27050,7 +22643,6 @@ realclean:
  DynamicC.h \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -27066,7 +22658,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  BoundsC.h \
@@ -27080,7 +22671,7 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/MessagingC.o .obj/MessagingC.o .obj/MessagingC.o .obj/MessagingC.o: MessagingC.cpp MessagingC.h \
+.obj/MessagingC.o .obj/MessagingC.so .shobj/MessagingC.o .shobj/MessagingC.so: MessagingC.cpp MessagingC.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -27103,16 +22694,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  ValueBase.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -27121,6 +22702,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -27211,21 +22796,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- MessagingS.h \
- TimeBaseS.h \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- MessagingC.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.h \
- Servant_Base.i \
- MessagingS_T.h \
- MessagingS_T.i \
- MessagingS_T.cpp \
- MessagingS.i \
  Stub.h \
  Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
@@ -27254,6 +22824,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -27296,17 +22868,13 @@ realclean:
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
- DynamicC.i \
- PortableInterceptorC.i \
+ MessagingC.h \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
  Invocation.h \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -27317,6 +22885,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -27349,9 +22919,10 @@ realclean:
  operation_details.i \
  Invocation.i
 
-.obj/MessagingS.o .obj/MessagingS.o .obj/MessagingS.o .obj/MessagingS.o: MessagingS.cpp \
- orbconf.h \
+.obj/Policy_Manager.o .obj/Policy_Manager.so .shobj/Policy_Manager.o .shobj/Policy_Manager.so: Policy_Manager.cpp \
+ Policy_Manager.h \
  $(ACE_ROOT)/ace/pre.h \
+ orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -27372,20 +22943,7 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- MessagingS.h orbconf.h TimeBaseS.h \
- TimeBaseC.h \
- Any.h \
- CDR.h \
+ LocalObject.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -27393,271 +22951,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Object.i \
- Typecode.h \
- Exception.h \
- Exception.i \
- Typecode.i \
- Any.i \
- TimeBaseC.i \
- TimeBaseS_T.h \
- TimeBaseS_T.i \
- TimeBaseS_T.cpp \
- TimeBaseS.i \
- MessagingC.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Encodable.h \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- PolicyC.i \
- IOPC.h \
- IOPC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i PortableServerC.h PortableServerC.i Servant_Base.h \
- PortableServerC.h \
- Servant_Base.i \
- MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \
- Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- TAO_Singleton.h \
- TAO_Singleton.inl \
- TAO_Singleton.cpp \
- TAO_Singleton_Manager.h \
- TAO_Singleton_Manager.inl \
- Server_Request.h \
- Object_KeyC.h \
- Object_KeyC.i \
- Server_Request.i \
- Stub.h \
- Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Pluggable.i \
- MProfile.h \
- Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
- CONV_FRAMEC.i \
- Tagged_Components.i \
- Profile.i \
- MProfile.i \
- ORB.h \
- IOR_LookupTable.h \
- Services.h \
- Services.i \
- IORManipulation.h \
- LocalObject.h \
- LocalObject.i \
- IORC.h \
- IORC.i \
- PortableInterceptor.h \
- Request_Info.h \
- PortableInterceptorC.h \
- DynamicC.h \
- DynamicC.i \
- MessagingC.h \
- PortableInterceptorC.i \
- PortableInterceptor.i \
- ORB.i \
- Stub.i \
- ORB_Core.h \
- Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- Policy_Manager.i \
- Resource_Factory.h \
- Protocol_Factory.h \
- params.h \
- params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i
-
-.obj/Policy_Manager.o .obj/Policy_Manager.o .obj/Policy_Manager.o .obj/Policy_Manager.o: Policy_Manager.cpp \
- Policy_Manager.h \
- $(ACE_ROOT)/ace/pre.h \
- orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- POA_CORBA.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -27714,10 +23011,11 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i \
- PolicyC.h \
- CurrentC.h \
  Object.h \
  Object.i \
+ LocalObject.i \
+ PolicyC.h \
+ CurrentC.h \
  CurrentC.i \
  Encodable.h \
  Exception.h \
@@ -27736,16 +23034,6 @@ realclean:
  Environment.h \
  Environment.i \
  PolicyC.i \
- DomainC.h \
- Any.h \
- Any.i \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
- LocalObject.h \
- LocalObject.i \
  Policy_Manager.i \
  ORB_Core.h \
  ORB.h \
@@ -27784,9 +23072,10 @@ realclean:
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -27797,7 +23086,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Resource_Factory.h \
@@ -27812,6 +23100,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -27832,6 +23122,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -27870,7 +23162,7 @@ realclean:
  RTCORBAS.i \
  RT_Policy_i.i
 
-.obj/Messaging_Policy_i.o .obj/Messaging_Policy_i.o .obj/Messaging_Policy_i.o .obj/Messaging_Policy_i.o: Messaging_Policy_i.cpp \
+.obj/Messaging_Policy_i.o .obj/Messaging_Policy_i.so .shobj/Messaging_Policy_i.o .shobj/Messaging_Policy_i.so: Messaging_Policy_i.cpp \
  Messaging_Policy_i.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -27894,16 +23186,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  MessagingC.h \
  ValueBase.h \
  corbafwd.h \
@@ -27913,6 +23195,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -28008,7 +23294,7 @@ realclean:
  Messaging_Policy_i.i \
  debug.h
 
-.obj/Client_Priority_Policy.o .obj/Client_Priority_Policy.o .obj/Client_Priority_Policy.o .obj/Client_Priority_Policy.o: Client_Priority_Policy.cpp \
+.obj/Client_Priority_Policy.o .obj/Client_Priority_Policy.so .shobj/Client_Priority_Policy.o .shobj/Client_Priority_Policy.so: Client_Priority_Policy.cpp \
  Client_Priority_Policy.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -28032,16 +23318,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  TAOC.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -28050,6 +23326,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -28145,7 +23425,7 @@ realclean:
  TAOC.i \
  Client_Priority_Policy.i
 
-.obj/Buffering_Constraint_Policy.o .obj/Buffering_Constraint_Policy.o .obj/Buffering_Constraint_Policy.o .obj/Buffering_Constraint_Policy.o: Buffering_Constraint_Policy.cpp \
+.obj/Buffering_Constraint_Policy.o .obj/Buffering_Constraint_Policy.so .shobj/Buffering_Constraint_Policy.o .shobj/Buffering_Constraint_Policy.so: Buffering_Constraint_Policy.cpp \
  Buffering_Constraint_Policy.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -28169,16 +23449,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  TAOC.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -28187,6 +23457,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -28282,7 +23556,7 @@ realclean:
  TAOC.i \
  Buffering_Constraint_Policy.i
 
-.obj/Priority_Mapping.o .obj/Priority_Mapping.o .obj/Priority_Mapping.o .obj/Priority_Mapping.o: Priority_Mapping.cpp \
+.obj/Priority_Mapping.o .obj/Priority_Mapping.so .shobj/Priority_Mapping.o .shobj/Priority_Mapping.so: Priority_Mapping.cpp \
  orbconf.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -28305,16 +23579,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  Priority_Mapping.h \
  RTCORBAC.h \
  corbafwd.h \
@@ -28324,6 +23588,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -28411,7 +23679,7 @@ realclean:
  RTCORBAC.i \
  Priority_Mapping.i
 
-.obj/Priority_Mapping_Manager.o .obj/Priority_Mapping_Manager.o .obj/Priority_Mapping_Manager.o .obj/Priority_Mapping_Manager.o: Priority_Mapping_Manager.cpp \
+.obj/Priority_Mapping_Manager.o .obj/Priority_Mapping_Manager.so .shobj/Priority_Mapping_Manager.o .shobj/Priority_Mapping_Manager.so: Priority_Mapping_Manager.cpp \
  Priority_Mapping_Manager.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -28438,19 +23706,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -28544,7 +23806,7 @@ realclean:
  LocalObject.i \
  Priority_Mapping_Manager.i
 
-.obj/Linear_Priority_Mapping.o .obj/Linear_Priority_Mapping.o .obj/Linear_Priority_Mapping.o .obj/Linear_Priority_Mapping.o: Linear_Priority_Mapping.cpp \
+.obj/Linear_Priority_Mapping.o .obj/Linear_Priority_Mapping.so .shobj/Linear_Priority_Mapping.o .shobj/Linear_Priority_Mapping.so: Linear_Priority_Mapping.cpp \
  orbconf.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -28567,16 +23829,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  Linear_Priority_Mapping.h \
  Priority_Mapping.h \
  RTCORBAC.h \
@@ -28587,6 +23839,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -28678,7 +23934,7 @@ realclean:
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/Direct_Priority_Mapping.o .obj/Direct_Priority_Mapping.o .obj/Direct_Priority_Mapping.o .obj/Direct_Priority_Mapping.o: Direct_Priority_Mapping.cpp \
+.obj/Direct_Priority_Mapping.o .obj/Direct_Priority_Mapping.so .shobj/Direct_Priority_Mapping.o .shobj/Direct_Priority_Mapping.so: Direct_Priority_Mapping.cpp \
  orbconf.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -28701,16 +23957,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  Direct_Priority_Mapping.h \
  Priority_Mapping.h \
  RTCORBAC.h \
@@ -28721,6 +23967,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -28812,7 +24062,7 @@ realclean:
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/RT_Current.o .obj/RT_Current.o .obj/RT_Current.o .obj/RT_Current.o: RT_Current.cpp \
+.obj/RT_Current.o .obj/RT_Current.so .shobj/RT_Current.o .shobj/RT_Current.so: RT_Current.cpp \
  RT_Current.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -28836,16 +24086,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  RTCORBAS.h \
  IOPS.h \
  IOPC.h \
@@ -28857,6 +24097,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -28985,6 +24229,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -29025,7 +24271,6 @@ realclean:
  Request_Info.h \
  PortableInterceptorC.h \
  DynamicC.h \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -29034,19 +24279,11 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Stub.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Protocol_Factory.h \
@@ -29057,6 +24294,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -29066,7 +24305,7 @@ realclean:
  Priority_Mapping.h \
  Priority_Mapping.i
 
-.obj/RT_Mutex.o .obj/RT_Mutex.o .obj/RT_Mutex.o .obj/RT_Mutex.o: RT_Mutex.cpp \
+.obj/RT_Mutex.o .obj/RT_Mutex.so .shobj/RT_Mutex.o .shobj/RT_Mutex.so: RT_Mutex.cpp \
  RT_Mutex.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -29090,16 +24329,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  RTCORBAS.h \
  IOPS.h \
  IOPC.h \
@@ -29111,6 +24340,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -29212,7 +24445,7 @@ realclean:
  LocalObject.i \
  RT_Mutex.i
 
-.obj/RT_Policy_i.o .obj/RT_Policy_i.o .obj/RT_Policy_i.o .obj/RT_Policy_i.o: RT_Policy_i.cpp \
+.obj/RT_Policy_i.o .obj/RT_Policy_i.so .shobj/RT_Policy_i.o .shobj/RT_Policy_i.so: RT_Policy_i.cpp \
  RT_Policy_i.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -29236,16 +24469,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  RTCORBAS.h \
  IOPS.h \
  IOPC.h \
@@ -29257,6 +24480,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -29358,7 +24585,7 @@ realclean:
  LocalObject.i \
  RT_Policy_i.i
 
-.obj/RT_ORB.o .obj/RT_ORB.o .obj/RT_ORB.o .obj/RT_ORB.o: RT_ORB.cpp \
+.obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp \
  RT_ORB.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
@@ -29382,16 +24609,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  RTCORBAS.h \
  IOPS.h \
  IOPC.h \
@@ -29403,6 +24620,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -29508,7 +24729,7 @@ realclean:
  RT_Mutex.h \
  RT_Mutex.i
 
-.obj/Pool_Per_Endpoint.o .obj/Pool_Per_Endpoint.o .obj/Pool_Per_Endpoint.o .obj/Pool_Per_Endpoint.o: Pool_Per_Endpoint.cpp \
+.obj/Pool_Per_Endpoint.o .obj/Pool_Per_Endpoint.so .shobj/Pool_Per_Endpoint.o .shobj/Pool_Per_Endpoint.so: Pool_Per_Endpoint.cpp \
  Pool_Per_Endpoint.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -29535,19 +24756,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -29664,7 +24879,6 @@ realclean:
  Any.i \
  IOPC.h \
  IOPC.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -29680,11 +24894,12 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -29717,13 +24932,6 @@ realclean:
  Pool_Per_Endpoint.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -29736,6 +24944,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -29754,7 +24964,7 @@ realclean:
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/RTCORBAC.o .obj/RTCORBAC.o .obj/RTCORBAC.o .obj/RTCORBAC.o: RTCORBAC.cpp RTCORBAC.h \
+.obj/RTCORBAC.o .obj/RTCORBAC.so .shobj/RTCORBAC.o .shobj/RTCORBAC.so: RTCORBAC.cpp RTCORBAC.h \
  $(ACE_ROOT)/ace/pre.h \
  orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -29777,16 +24987,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -29794,6 +24994,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -29886,7 +25090,7 @@ realclean:
  TAOS_T.cpp \
  TAOS.i
 
-.obj/RTCORBAS.o .obj/RTCORBAS.o .obj/RTCORBAS.o .obj/RTCORBAS.o: RTCORBAS.cpp \
+.obj/RTCORBAS.o .obj/RTCORBAS.so .shobj/RTCORBAS.o .shobj/RTCORBAS.so: RTCORBAS.cpp \
  orbconf.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -29909,16 +25113,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  RTCORBAS.h orbconf.h IOPS.h \
  IOPC.h \
  CDR.h \
@@ -29929,6 +25123,10 @@ realclean:
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -30024,7 +25222,7 @@ realclean:
  TimeBaseC.h RTCORBAC.i RTCORBAS_T.h RTCORBAS_T.i RTCORBAS_T.cpp \
  RTCORBAS.i
 
-.obj/InterfaceC.o .obj/InterfaceC.o .obj/InterfaceC.o .obj/InterfaceC.o: InterfaceC.cpp InterfaceC.h \
+.obj/InterfaceC.o .obj/InterfaceC.so .shobj/InterfaceC.o .shobj/InterfaceC.so: InterfaceC.cpp InterfaceC.h \
  $(ACE_ROOT)/ace/pre.h \
  TAO_Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -30049,16 +25247,6 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -30073,6 +25261,10 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
@@ -30144,9 +25336,145 @@ realclean:
  Sequence.i \
  Sequence_T.h \
  Sequence_T.i \
- Sequence_T.cpp
+ Sequence_T.cpp \
+ InterfaceC.i \
+ Stub.h \
+ Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ IOPC.h \
+ IOPC.i \
+ Pluggable.i \
+ MProfile.h \
+ Profile.h \
+ Tagged_Components.h \
+ CONV_FRAMEC.h \
+ CONV_FRAMEC.i \
+ Tagged_Components.i \
+ PolicyC.h \
+ CurrentC.h \
+ CurrentC.i \
+ Encodable.h \
+ PolicyC.i \
+ Profile.i \
+ MProfile.i \
+ ORB.h \
+ IOR_LookupTable.h \
+ Services.h \
+ Services.i \
+ IORManipulation.h \
+ LocalObject.h \
+ LocalObject.i \
+ IORC.h \
+ IORC.i \
+ PortableInterceptor.h \
+ Request_Info.h \
+ PortableInterceptorC.h \
+ DynamicC.h \
+ MessagingC.h \
+ ValueBase.h \
+ ValueBase.i \
+ ValueFactory.h \
+ ValueFactory.i \
+ TimeBaseC.h \
+ TimeBaseC.i \
+ PollableC.h \
+ PollableC.i \
+ MessagingC.i \
+ PortableInterceptor.i \
+ ORB.i \
+ Stub.i \
+ Invocation.h \
+ ORB_Core.h \
+ Policy_Manager.h \
+ Policy_Manager.i \
+ Resource_Factory.h \
+ Protocol_Factory.h \
+ params.h \
+ params.i \
+ Adapter.h \
+ Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ Synch_Reply_Dispatcher.h \
+ Reply_Dispatcher.h \
+ Reply_Dispatcher.i \
+ GIOP_Message_State.h \
+ Pluggable_Messaging.h \
+ Pluggable_Messaging_Utils.h \
+ Pluggable_Messaging_Utils.i \
+ Pluggable_Messaging.i \
+ GIOP_Message_State.i \
+ Synch_Reply_Dispatcher.i \
+ TAOC.h \
+ Priority_Mapping_Manager.h \
+ Priority_Mapping.h \
+ RTCORBAC.h \
+ RTCORBAC.i \
+ Priority_Mapping.i \
+ Priority_Mapping_Manager.i \
+ TAOC.i \
+ operation_details.h \
+ target_specification.h \
+ Object_KeyC.h \
+ Object_KeyC.i \
+ target_specification.i \
+ operation_details.i \
+ Invocation.i \
+ NVList.h \
+ NVList.i
 
-.obj/Pluggable_Messaging.o .obj/Pluggable_Messaging.o .obj/Pluggable_Messaging.o .obj/Pluggable_Messaging.o: Pluggable_Messaging.cpp \
+.obj/Pluggable_Messaging.o .obj/Pluggable_Messaging.so .shobj/Pluggable_Messaging.o .shobj/Pluggable_Messaging.so: Pluggable_Messaging.cpp \
  Pluggable_Messaging.h \
  $(ACE_ROOT)/ace/pre.h \
  Pluggable_Messaging_Utils.h \
@@ -30176,19 +25504,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -30287,6 +25609,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -30311,7 +25635,7 @@ realclean:
  Typecode.i \
  Pluggable.i
 
-.obj/Pluggable_Messaging_Utils.o .obj/Pluggable_Messaging_Utils.o .obj/Pluggable_Messaging_Utils.o .obj/Pluggable_Messaging_Utils.o: Pluggable_Messaging_Utils.cpp \
+.obj/Pluggable_Messaging_Utils.o .obj/Pluggable_Messaging_Utils.so .shobj/Pluggable_Messaging_Utils.o .shobj/Pluggable_Messaging_Utils.so: Pluggable_Messaging_Utils.cpp \
  Pluggable_Messaging_Utils.h \
  $(ACE_ROOT)/ace/pre.h \
  IOPC.h \
@@ -30340,19 +25664,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -30421,7 +25739,7 @@ realclean:
  IOPC.i \
  Pluggable_Messaging_Utils.i
 
-.obj/GIOP_Message_Base.o .obj/GIOP_Message_Base.o .obj/GIOP_Message_Base.o .obj/GIOP_Message_Base.o: GIOP_Message_Base.cpp \
+.obj/GIOP_Message_Base.o .obj/GIOP_Message_Base.so .shobj/GIOP_Message_Base.o .shobj/GIOP_Message_Base.so: GIOP_Message_Base.cpp \
  GIOP_Message_Base.h \
  $(ACE_ROOT)/ace/pre.h \
  GIOP_Message_State.h \
@@ -30453,19 +25771,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -30575,6 +25887,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -30600,7 +25914,7 @@ realclean:
  Pluggable.i \
  debug.h
 
-.obj/GIOP_Message_Connectors.o .obj/GIOP_Message_Connectors.o .obj/GIOP_Message_Connectors.o .obj/GIOP_Message_Connectors.o: GIOP_Message_Connectors.cpp \
+.obj/GIOP_Message_Connectors.o .obj/GIOP_Message_Connectors.so .shobj/GIOP_Message_Connectors.o .shobj/GIOP_Message_Connectors.so: GIOP_Message_Connectors.cpp \
  GIOP_Message_Connectors.h \
  $(ACE_ROOT)/ace/pre.h \
  GIOP_Message_Base.h \
@@ -30633,19 +25947,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -30758,7 +26066,7 @@ realclean:
  GIOPC.h \
  GIOPC.i
 
-.obj/GIOP_Message_Acceptors.o .obj/GIOP_Message_Acceptors.o .obj/GIOP_Message_Acceptors.o .obj/GIOP_Message_Acceptors.o: GIOP_Message_Acceptors.cpp \
+.obj/GIOP_Message_Acceptors.o .obj/GIOP_Message_Acceptors.so .shobj/GIOP_Message_Acceptors.o .shobj/GIOP_Message_Acceptors.so: GIOP_Message_Acceptors.cpp \
  GIOP_Message_Acceptors.h \
  $(ACE_ROOT)/ace/pre.h \
  GIOP_Message_Base.h \
@@ -30791,19 +26099,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -30933,7 +26235,6 @@ realclean:
  Typecode.h \
  Typecode.i \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -30949,17 +26250,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -30973,6 +26266,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -30993,6 +26288,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -31000,33 +26297,6 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  GIOP_Message_Acceptors.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- POAManager.h \
- POAManager.i \
- POA.i \
  debug.h \
  GIOP_Utils.h \
  GIOP_Utils.i \
@@ -31039,7 +26309,7 @@ realclean:
  Leader_Follower.h \
  Leader_Follower.i
 
-.obj/GIOP_Message_Accept_State.o .obj/GIOP_Message_Accept_State.o .obj/GIOP_Message_Accept_State.o .obj/GIOP_Message_Accept_State.o: GIOP_Message_Accept_State.cpp \
+.obj/GIOP_Message_Accept_State.o .obj/GIOP_Message_Accept_State.so .shobj/GIOP_Message_Accept_State.o .shobj/GIOP_Message_Accept_State.so: GIOP_Message_Accept_State.cpp \
  GIOP_Message_Accept_State.h \
  $(ACE_ROOT)/ace/pre.h \
  GIOP_Message_Headers.h \
@@ -31070,19 +26340,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -31208,7 +26472,6 @@ realclean:
  Typecode.h \
  Typecode.i \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -31224,7 +26487,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Principal.h \
@@ -31243,7 +26505,7 @@ realclean:
  NVList.h \
  NVList.i
 
-.obj/GIOP_Utils.o .obj/GIOP_Utils.o .obj/GIOP_Utils.o .obj/GIOP_Utils.o: GIOP_Utils.cpp \
+.obj/GIOP_Utils.o .obj/GIOP_Utils.so .shobj/GIOP_Utils.o .shobj/GIOP_Utils.so: GIOP_Utils.cpp \
  debug.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -31270,19 +26532,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -31406,7 +26662,6 @@ realclean:
  Typecode.h \
  Typecode.i \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -31422,17 +26677,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -31446,6 +26693,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -31466,6 +26715,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -31473,7 +26724,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/GIOP_Message_Headers.o .obj/GIOP_Message_Headers.o .obj/GIOP_Message_Headers.o .obj/GIOP_Message_Headers.o: GIOP_Message_Headers.cpp \
+.obj/GIOP_Message_Headers.o .obj/GIOP_Message_Headers.so .shobj/GIOP_Message_Headers.o .shobj/GIOP_Message_Headers.so: GIOP_Message_Headers.cpp \
  GIOP_Message_Headers.h \
  $(ACE_ROOT)/ace/pre.h \
  Tagged_Profile.h \
@@ -31503,19 +26754,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -31589,7 +26834,7 @@ realclean:
  Tagged_Profile.i \
  GIOP_Message_Headers.i
 
-.obj/target_specification.o .obj/target_specification.o .obj/target_specification.o .obj/target_specification.o: target_specification.cpp \
+.obj/target_specification.o .obj/target_specification.so .shobj/target_specification.o .shobj/target_specification.so: target_specification.cpp \
  target_specification.h \
  $(ACE_ROOT)/ace/pre.h \
  Object_KeyC.h \
@@ -31617,19 +26862,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -31701,7 +26940,7 @@ realclean:
  IOPC.i \
  target_specification.i
 
-.obj/GIOP_Server_Request.o .obj/GIOP_Server_Request.o .obj/GIOP_Server_Request.o .obj/GIOP_Server_Request.o: GIOP_Server_Request.cpp \
+.obj/GIOP_Server_Request.o .obj/GIOP_Server_Request.so .shobj/GIOP_Server_Request.o .shobj/GIOP_Server_Request.so: GIOP_Server_Request.cpp \
  GIOP_Server_Request.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -31728,19 +26967,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -31861,7 +27094,6 @@ realclean:
  Typecode.h \
  Typecode.i \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -31877,7 +27109,6 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Principal.h \
@@ -31902,13 +27133,6 @@ realclean:
  GIOP_Message_Accept_State.i \
  ORB_Core.h \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -31922,6 +27146,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -31942,6 +27168,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -31957,36 +27185,9 @@ realclean:
  Marshal.i \
  debug.h \
  GIOP_Utils.h \
- GIOP_Utils.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- RTCORBAC.h \
- RTCORBAC.i \
- Object_Adapter.i \
- POAManager.h \
- POAManager.i \
- POA.i
+ GIOP_Utils.i
 
-.obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.o: GIOP_Message_Lite.cpp \
+.obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.so .shobj/GIOP_Message_Lite.o .shobj/GIOP_Message_Lite.so: GIOP_Message_Lite.cpp \
  GIOP_Message_Lite.h \
  $(ACE_ROOT)/ace/pre.h \
  CDR.h \
@@ -32014,19 +27215,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -32151,7 +27346,6 @@ realclean:
  Typecode.h \
  Typecode.i \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -32167,17 +27361,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -32191,6 +27377,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -32211,6 +27399,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -32227,35 +27417,10 @@ realclean:
  Priority_Mapping.i \
  Priority_Mapping_Manager.i \
  TAOC.i \
- POA.h \
- Object_Adapter.h \
- Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- Key_Adapters.i \
- Server_Strategy_Factory.h \
- poa_macros.h \
- Active_Object_Map.h \
- Active_Object_Map.i \
- Object_Adapter.i \
- Object_KeyC.h \
- Object_KeyC.i \
- POAManager.h \
- POAManager.i \
- POA.i \
  operation_details.h \
  target_specification.h \
+ Object_KeyC.h \
+ Object_KeyC.i \
  target_specification.i \
  operation_details.i \
  GIOP_Server_Request.h \
@@ -32273,7 +27438,7 @@ realclean:
  GIOP_Message_Headers.h \
  GIOP_Message_Headers.i
 
-.obj/GIOP_Message_State.o .obj/GIOP_Message_State.o .obj/GIOP_Message_State.o .obj/GIOP_Message_State.o: GIOP_Message_State.cpp \
+.obj/GIOP_Message_State.o .obj/GIOP_Message_State.so .shobj/GIOP_Message_State.o .shobj/GIOP_Message_State.so: GIOP_Message_State.cpp \
  GIOP_Message_State.h \
  $(ACE_ROOT)/ace/pre.h \
  Pluggable_Messaging.h \
@@ -32304,19 +27469,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -32437,7 +27596,6 @@ realclean:
  Typecode.h \
  Typecode.i \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -32453,17 +27611,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -32477,6 +27627,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -32497,6 +27649,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -32504,7 +27658,7 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Tagged_Profile.o .obj/Tagged_Profile.o .obj/Tagged_Profile.o .obj/Tagged_Profile.o: Tagged_Profile.cpp \
+.obj/Tagged_Profile.o .obj/Tagged_Profile.so .shobj/Tagged_Profile.o .shobj/Tagged_Profile.so: Tagged_Profile.cpp \
  Tagged_Profile.h \
  $(ACE_ROOT)/ace/pre.h \
  IOPC.h \
@@ -32533,19 +27687,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -32666,7 +27814,6 @@ realclean:
  Typecode.h \
  Typecode.i \
  Any.i \
- DynamicC.i \
  MessagingC.h \
  ValueBase.h \
  ValueBase.i \
@@ -32682,17 +27829,9 @@ realclean:
  PollableC.h \
  PollableC.i \
  MessagingC.i \
- PortableInterceptorC.i \
  PortableInterceptor.i \
  ORB.i \
  Policy_Manager.h \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
@@ -32706,6 +27845,8 @@ realclean:
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
@@ -32726,6 +27867,8 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
+ Adapter.h \
+ Adapter.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -32736,7 +27879,7 @@ realclean:
  Acceptor_Registry.i \
  debug.h
 
-.obj/FT_CORBAC.o .obj/FT_CORBAC.o .obj/FT_CORBAC.o .obj/FT_CORBAC.o: FT_CORBAC.cpp FT_CORBAC.h \
+.obj/FT_CORBAC.o .obj/FT_CORBAC.so .shobj/FT_CORBAC.o .shobj/FT_CORBAC.so: FT_CORBAC.cpp FT_CORBAC.h \
  $(ACE_ROOT)/ace/pre.h \
  ftcorbafwd.h \
  TimeBaseC.h \
@@ -32766,151 +27909,13 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Object.i \
- Typecode.h \
- Exception.h \
- Exception.i \
- Typecode.i \
- Any.i \
- TimeBaseC.i \
- GIOPC.h \
- IOPC.h \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- IOPC.i \
- Object_KeyC.h \
- Object_KeyC.i \
- GIOPC.i \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Encodable.h \
- PolicyC.i
-
-.obj/FT_CORBAS.o .obj/FT_CORBAS.o .obj/FT_CORBAS.o .obj/FT_CORBAS.o: FT_CORBAS.cpp \
- FT_CORBAS.h \
- $(ACE_ROOT)/ace/pre.h \
- ftpoafwd.h \
- ftcorbafwd.h \
- TimeBaseC.h \
- Any.h \
- CDR.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread_Hook.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Exit.h \
- $(ACE_ROOT)/ace/Thread_Control.h \
- $(ACE_ROOT)/ace/Thread_Control.inl \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.h \
  $(ACE_ROOT)/ace/Based_Pointer_T.i \
  $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
@@ -32979,7 +27984,6 @@ realclean:
  Typecode.i \
  Any.i \
  TimeBaseC.i \
- FT_CORBAC.h \
  GIOPC.h \
  IOPC.h \
  Sequence.h \
@@ -32997,13 +28001,6 @@ realclean:
  CurrentC.h \
  CurrentC.i \
  Encodable.h \
- PolicyC.i \
- POA_CORBA.h \
- DomainC.h \
- DomainC.i \
- Servant_Base.h \
- PortableServerC.h \
- PortableServerC.i \
- Servant_Base.i
+ PolicyC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index ed0fca74ade..a9a900af377 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -11,7 +11,6 @@
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
-#include "tao/MessagingS.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 7f0a8eecc56..24df0cbb898 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -2554,7 +2554,6 @@ class TAO_Export ReplyHandler : public virtual CORBA_Object
   protected:
     ReplyHandler (void);
     ReplyHandler (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
         CORBA::Boolean _tao_collocated = 0
       );
     virtual ~ReplyHandler (void);
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
index e4c35daa025..1c4b33e33a6 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -3199,7 +3199,7 @@ Messaging::PolicyValue::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -3857,8 +3857,8 @@ Messaging::ReplyHandler::ReplyHandler (void) // default constructor
 {}
 
 ACE_INLINE
-Messaging::ReplyHandler::ReplyHandler (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+Messaging::ReplyHandler::ReplyHandler (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 1c9d9febd0c..096067dc402 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -23,8 +23,6 @@
 #include "tao/TAO_Internal.h"
 #include "tao/CDR.h"
 #include "tao/IOR_LookupTable.h"
-#include "tao/Object_Adapter.h"
-#include "tao/POA.h"
 #include "tao/Request.h"
 #include "tao/MProfile.h"
 #include "tao/Object_Loader.h"
@@ -40,6 +38,7 @@
 #include "tao/Messaging_Policy_i.h"
 #include "tao/Client_Priority_Policy.h"
 #include "tao/Buffering_Constraint_Policy.h"
+#include "Object_KeyC.h"
 
 #if defined (ACE_HAS_EXCEPTIONS)
 # if defined (ACE_MVS)
@@ -449,22 +448,30 @@ CORBA_ORB::poll_next_response (CORBA_Environment &ACE_TRY_ENV)
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_root_poa (CORBA::Environment &ACE_TRY_ENV,
+CORBA_ORB::resolve_root_poa (CORBA::Environment &ACE_TRY_ENV
+#if 0 // PPOA
+,
                              const char *adapter_name,
                              TAO_POA_Manager *poa_manager,
-                             const TAO_POA_Policies *policies)
+                             const TAO_POA_Policies *policies
+#endif /* 0 PPOA */
+                             )
 {
+  return this->orb_core_->root_poa (ACE_TRY_ENV);
+
+#if 0 // PPOA
   return this->orb_core_->root_poa_reference (ACE_TRY_ENV,
                                               adapter_name,
                                               poa_manager,
                                               policies);
+#endif /* 0 PPOA */
 }
 
 CORBA_Object_ptr
 CORBA_ORB::resolve_poa_current (CORBA::Environment &)
 {
-  // Return the pointer to the POA Current.
-  return CORBA_Object::_duplicate (&this->orb_core_->poa_current ());
+  // @@ PPOA return CORBA_Object::_duplicate (&this->orb_core_->poa_current ());
+  return this->orb_core_->poa_current ();
 }
 
 CORBA_Object_ptr
@@ -1027,7 +1034,7 @@ TAO_Stub *
 CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
                                const char *type_id,
                                CORBA::PolicyList *policy_list,
-                               TAO_POA *poa,
+                               TAO_Acceptor_Filter *filter,
                                CORBA::Environment &ACE_TRY_ENV)
 {
   this->check_shutdown (ACE_TRY_ENV);
@@ -1036,10 +1043,11 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
   return this->orb_core_->create_stub_object (key,
                                               type_id,
                                               policy_list,
-                                              poa,
+                                              filter,
                                               ACE_TRY_ENV);
 }
 
+#if 0 // PPOA
 // Create an objref
 
 CORBA::Object_ptr
@@ -1048,7 +1056,7 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
                           CORBA::PolicyList *policy_list,
                           TAO_ServantBase *servant,
                           CORBA::Boolean collocated,
-                          TAO_POA *poa,
+                          TAO_Acceptor_Filter *filter,
                           CORBA::Environment &ACE_TRY_ENV)
 {
   this->check_shutdown (ACE_TRY_ENV);
@@ -1057,7 +1065,7 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
   TAO_Stub *data = this->create_stub_object (key,
                                              type_id,
                                              policy_list,
-                                             poa,
+                                             filter,
                                              ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
@@ -1082,6 +1090,7 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
 
   return new_obj._retn ();
 }
+#endif /* 0 PPOA */
 
 void
 CORBA_ORB::check_shutdown (CORBA_Environment &ACE_TRY_ENV)
@@ -1818,35 +1827,16 @@ CORBA_ORB::url_ior_string_to_object (const char* str,
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  TAO_Stub_Auto_Ptr safe_data (data);
+  TAO_Stub_Auto_Ptr safe_objdata (data);
 
   // Figure out if the servant is collocated.
-  TAO_ServantBase *servant = 0;
-  TAO_SERVANT_LOCATION servant_location =
-    this->_get_collocated_servant (safe_data.get (),
-                                   servant);
-
-  int collocated = 0;
-  if (servant_location != TAO_SERVANT_NOT_FOUND)
-    collocated = 1;
-
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  // Create the CORBA level proxy.  This will increase the ref_count
-  // on data by one
-  ACE_NEW_THROW_EX (obj,
-                    CORBA_Object (safe_data.get (),
-                                  servant,
-                                  (CORBA::Boolean) collocated),
-                    CORBA::NO_MEMORY (
-                      CORBA_SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  CORBA::Object_ptr obj =
+    this->orb_core_->create_object (safe_objdata.get ());
+  if (CORBA::is_nil (obj))
+    return CORBA::Object::_nil ();
 
-  // All is well, so release the stub object from its auto_ptr.
-  data = safe_data.release ();
+  // Transfer ownership to the CORBA::Object
+  (void) safe_objdata.release ();
 
   return obj;
 }
@@ -1869,103 +1859,6 @@ CORBA_ORB::_optimize_collocation_objects (void) const
     return 0; // Need to return something
 }
 
-TAO_SERVANT_LOCATION
-CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj,
-                                    TAO_ServantBase *&servant)
-{
-  if (sobj == 0)
-    return TAO_SERVANT_NOT_FOUND;
-
-  // @@ What about forwarding.  With this approach we are never forwarded
-  //    when we use collocation!
-  const TAO_MProfile &mprofile = sobj->base_profiles ();
-
-  {
-    // @@ Ossama: maybe we need another lock for the table, to
-    //    reduce contention on the Static_Object_Lock below, if so
-    //    then we need to use that lock in the ORB_init() function.
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                              *ACE_Static_Object_Lock::instance (),
-                              TAO_SERVANT_NOT_FOUND));
-
-    TAO_ORB_Table *table = TAO_ORB_Table::instance ();
-    TAO_ORB_Table::Iterator end = table->end ();
-    for (TAO_ORB_Table::Iterator i = table->begin ();
-         i != end;
-         ++i)
-      {
-        TAO_SERVANT_LOCATION servant_location =
-          this->_find_collocated_servant (sobj,
-                                          (*i).int_id_,
-                                          servant,
-                                          mprofile);
-        if (servant_location != TAO_SERVANT_NOT_FOUND)
-          return servant_location;
-      }
-  }
-  // If we don't find one by this point, we return 0.
-  return TAO_SERVANT_NOT_FOUND;
-}
-
-TAO_SERVANT_LOCATION
-CORBA_ORB::_find_collocated_servant (TAO_Stub *sobj,
-                                     TAO_ORB_Core *orb_core,
-                                     TAO_ServantBase *&servant,
-                                     const TAO_MProfile &mprofile)
-{
-  if (!orb_core->optimize_collocation_objects ())
-    return TAO_SERVANT_NOT_FOUND;
-
-  if (!orb_core->use_global_collocation () && orb_core != this->orb_core_)
-    return TAO_SERVANT_NOT_FOUND;
-
-  if (!orb_core->is_collocated (mprofile))
-    return TAO_SERVANT_NOT_FOUND;
-
-  TAO_Object_Adapter *oa = orb_core->object_adapter ();
-
-  for (TAO_PHandle j = 0;
-       j != mprofile.profile_count ();
-       ++j)
-    {
-      const TAO_Profile *profile = mprofile.get_profile (j);
-      TAO_ObjectKey_var objkey = profile->_key ();
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          TAO_SERVANT_LOCATION servant_location =
-            oa->find_servant (objkey.in (),
-                              servant,
-                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          if (servant_location != TAO_SERVANT_NOT_FOUND)
-            {
-              // Found collocated object.  Perhaps we can get around
-              // by simply setting the servant_orb, but let get this
-              // to work first.
-
-              // There could only be one ORB which is us.
-
-              // @@ Do not duplicate the ORB here!
-              //    TAO_Stub::servant_orb()  duplicates it.
-              //       -Ossama
-              sobj->servant_orb (orb_core->orb ());
-
-              return servant_location;
-            }
-        }
-      ACE_CATCHANY
-        {
-          // Ignore the exception and continue with the next one.
-        }
-      ACE_ENDTRY;
-    }
-
-  return TAO_SERVANT_NOT_FOUND;
-}
-
 // ****************************************************************
 
 // Add a mapping ObjectID->IOR to the table.
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index f0f480950d4..a3668d17ab0 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -58,19 +58,23 @@ typedef enum
 
 // = Forward declarations.
 class TAO_MProfile;
-class TAO_POA_Manager;
-class TAO_POA_Policies;
-class TAO_POA;
 struct TAO_Dispatch_Context;
-class TAO_Operation_Table;
 class TAO_Client_Strategy_Factory;
 class TAO_Server_Strategy_Factory;
 class TAO_InputCDR;
 class TAO_OutputCDR;
 class CORBA_ORB_InconsistentTypeCode;
-class TAO_ServantBase;
 class TAO_Stub;
 
+#if 0 // PPOA
+class TAO_POA_Manager;
+class TAO_POA_Policies;
+class TAO_ServantBase;
+class TAO_POA;
+#endif /* 0 */
+
+class TAO_Acceptor_Filter;
+
 #ifdef TAO_HAS_VALUETYPE
 class TAO_ValueFactory_Map;
 #endif /* TAO_HAS_VALUETYPE */
@@ -572,13 +576,6 @@ public:
   // = TAO-specific extensions to the CORBA specification.
   // ----------------------------------------------------------------
 
-  TAO_SERVANT_LOCATION _get_collocated_servant (TAO_Stub *p,
-                                                TAO_ServantBase *&servant);
-  // Return the object pointer of an collocated object it there is
-  // one, otherwise, return 0.  Each type of ORB, e. g., IIOP ORB,
-  // must implement this and determine what is a collocated object
-  // based on information provided in the TAO_Stub.
-
   int _tao_add_to_IOR_table (const ACE_CString &object_id,
                              CORBA::Object_ptr obj);
   // Add a mapping ObjectID->IOR to the table.
@@ -594,21 +591,24 @@ public:
                                          int delete_callback);
   // Registers a new callback class with the table
 
-  CORBA_Object_ptr resolve_root_poa (CORBA_Environment &ACE_TRY_ENV,
+  CORBA_Object_ptr resolve_root_poa (CORBA_Environment &ACE_TRY_ENV);
+#if 0 // PPOA
                                      const char *adapter_name =
                                          TAO_DEFAULT_ROOTPOA_NAME,
                                      TAO_POA_Manager *poa_manager = 0,
                                      const TAO_POA_Policies *policies = 0);
+#endif /* 0 */
   // Resolve the POA.
 
   TAO_Stub *create_stub_object (const TAO_ObjectKey &key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
-                                TAO_POA *poa,
+                                TAO_Acceptor_Filter *acceptor_filter,
                                 CORBA_Environment &ACE_TRY_ENV);
   // Delegates on the ORB_Core to create a TAO_Stub.
 
 
+#if 0 // PPOA
   CORBA_Object_ptr key_to_object (const TAO_ObjectKey &key,
                                   const char *type_id,
                                   CORBA::PolicyList *policy_list,
@@ -638,6 +638,7 @@ public:
   // reported by the ORB.  If the POA is a "Named POA" the client's
   // ORB will not normally return OBJECT_NOT_EXIST unless the POA
   // reports that fault.
+#endif /* 0 */
 
   static void init_orb_globals (CORBA_Environment &ACE_TRY_ENV =
                                     TAO_default_environment ());
@@ -676,12 +677,6 @@ protected:
   CORBA_ORB (TAO_ORB_Core *orb_core);
   ~CORBA_ORB (void);
 
-  TAO_SERVANT_LOCATION _find_collocated_servant (TAO_Stub *sobj,
-                                                 TAO_ORB_Core *orb_core,
-                                                 TAO_ServantBase *& servant,
-                                                 const TAO_MProfile &mprofile);
-  // Check if local servant exists for <mprofile> in <orb_core>.
-
   CORBA_Object_ptr resolve_poa_current (CORBA_Environment &ACE_TRY_ENV);
   // Resolve the POA current.
 
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 55b848a50d2..4e81fe4c769 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -20,8 +20,6 @@
 #include "tao/Connector_Registry.h"
 #include "tao/Acceptor_Registry.h"
 
-#include "tao/POA.h"
-
 #include "tao/RT_ORB.h"
 #include "tao/Priority_Mapping_Manager.h"
 #include "tao/RT_Current.h"
@@ -66,7 +64,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     typecode_factory_ (CORBA::Object::_nil ()),
     dynany_factory_ (CORBA::Object::_nil ()),
     orb_ (),
-    root_poa_ (0),
+    // PPOA root_poa_ (0),
     orb_params_ (),
     orbid_ (ACE_OS::strdup (orbid ? orbid : "")),
     resource_factory_ (0),
@@ -94,7 +92,9 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
     poa_current_ (0),
-    object_adapter_ (0),
+    // PPOA: object_adapter_ (0),
+    adapter_registry_ (this), // PPOA
+    poa_adapter_ (0), // PPOA
     tm_ (),
     from_iso8859_ (0),
     to_iso8859_ (0),
@@ -128,8 +128,8 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     refcount_ (1),
     handle_set_ ()
 {
-  ACE_NEW (this->poa_current_,
-           TAO_POA_Current);
+  // @@ PPOA ACE_NEW (this->poa_current_,
+  //                  TAO_POA_Current);
 
 #if defined(ACE_MVS)
   ACE_NEW (this->from_iso8859_, ACE_IBM1047_ISO8859);
@@ -220,6 +220,7 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
       delete [] this->svc_config_argv_;
     }
 
+#if 0  // PPOA
   // Make sure these two objects are deleted last (other objects may
   // depend on this).
 #if !defined (__Lynx__)  ||  !defined (__powerpc__)
@@ -244,6 +245,9 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
   ACE_ENDTRY;
 
   delete this->object_adapter_;
+#else
+  // @@ this->adapter_registry_.close ();
+#endif /* 0 */
 }
 
 int
@@ -1506,6 +1510,7 @@ TAO_ORB_Core::inherit_from_parent_thread (
   return 0;
 }
 
+#if 0 // PPOA
 PortableServer::POA_ptr
 TAO_ORB_Core::root_poa_reference (CORBA::Environment &ACE_TRY_ENV,
                                   const char *adapter_name,
@@ -1607,6 +1612,60 @@ TAO_ORB_Core::object_adapter_i (void)
     }
   return this->object_adapter_;
 }
+#else
+
+CORBA::Object_ptr
+TAO_ORB_Core::root_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  if (!CORBA::is_nil (this->root_poa_.in ()))
+    return CORBA::Object::_duplicate (this->root_poa_.in ());
+
+  TAO_Adapter_Factory *factory =
+    ACE_Dynamic_Service<TAO_Adapter_Factory>::instance ("TAO_POA");
+  if (factory == 0)
+    {
+      // Try again, using the default directive...
+      ACE_Service_Config::process_directive (
+          "dynamic TAO_POA Service_Object * TAO_POA_DLL:_make_TAO_POA()"
+      );
+      factory =
+        ACE_Dynamic_Service<TAO_Adapter_Factory>::instance ("TAO_POA");
+    }
+
+  if (factory == 0)
+    {
+      // It really failed, raise an exception!
+      ACE_THROW_RETURN (CORBA::ORB::InvalidName (),
+                        CORBA::Object::_nil ());
+    }
+
+  // @@ Not exception safe
+  TAO_Adapter *poa_adapter = factory->create (this);
+  poa_adapter->open (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+  this->root_poa_ = poa_adapter->root ();
+
+  this->adapter_registry_.insert (poa_adapter, ACE_TRY_ENV);
+
+  return CORBA::Object::_duplicate (this->root_poa_.in ());
+}
+
+TAO_Adapter *
+TAO_ORB_Core::poa_adapter (void)
+{
+  if (this->poa_adapter_ == 0)
+    {
+      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+      if (this->poa_adapter_ == 0)
+        {
+          this->poa_adapter_ =
+            this->adapter_registry_.find_adapter ("RootPOA");
+        }
+    }
+  return this->poa_adapter_;
+}
+#endif /* 0 PPOA */
 
 ACE_SYNCH_CONDITION *
 TAO_ORB_Core::leader_follower_condition_variable (void)
@@ -1631,7 +1690,7 @@ TAO_Stub *
 TAO_ORB_Core::create_stub_object (const TAO_ObjectKey &key,
                                   const char *type_id,
                                   CORBA::PolicyList *policy_list,
-                                  TAO_POA *poa,
+                                  TAO_Acceptor_Filter *filter,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
   (void) this->open (ACE_TRY_ENV);
@@ -1643,11 +1702,10 @@ TAO_ORB_Core::create_stub_object (const TAO_ObjectKey &key,
     id = CORBA::string_dup (type_id);
 
   TAO_Stub *stub = 0;
-
   // Create a profile container and have Acceptor_Registry populate it
   // with profiles as appropriate.
   TAO_MProfile mp (0);
-  if (this->acceptor_registry ()->make_mprofile (key, mp, poa) == -1)
+  if (this->acceptor_registry ()->make_mprofile (key, mp, filter) == -1)
   {
     ACE_THROW_RETURN (CORBA::INTERNAL (
                         CORBA::SystemException::_tao_minor_code (
@@ -1691,6 +1749,67 @@ TAO_ORB_Core::create_stub_object (const TAO_ObjectKey &key,
   return stub;
 }
 
+CORBA::Object_ptr
+TAO_ORB_Core::create_object (TAO_Stub *stub)
+{
+  // @@ What about forwarding.  With this approach we are never forwarded
+  //    when we use collocation!
+  const TAO_MProfile &mprofile = stub->base_profiles ();
+
+  {
+    // @@ Ossama: maybe we need another lock for the table, to
+    //    reduce contention on the Static_Object_Lock below, if so
+    //    then we need to use that lock in the ORB_init() function.
+    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
+                              *ACE_Static_Object_Lock::instance (),
+                              0));
+
+    TAO_ORB_Table *table = TAO_ORB_Table::instance ();
+    TAO_ORB_Table::Iterator end = table->end ();
+    for (TAO_ORB_Table::Iterator i = table->begin ();
+         i != end;
+         ++i)
+      {
+        TAO_ORB_Core *other_core = (*i).int_id_;
+        CORBA::Object_ptr x =
+          this->create_collocated_object (stub,
+                                          other_core,
+                                          mprofile);
+        if (x != 0)
+          return x;
+      }
+  }
+
+  // @@ We should thow CORBA::NO_MEMORY in platforms with exceptions,
+  // but we are stuck in platforms without exceptions!
+  CORBA::Object_ptr x;
+  ACE_NEW_RETURN (x,
+                  CORBA_Object (stub, 0),
+                  0);
+  return x;
+}
+
+CORBA::Object_ptr
+TAO_ORB_Core::create_collocated_object (TAO_Stub *stub,
+                                        TAO_ORB_Core *orb_core,
+                                        const TAO_MProfile &mprofile)
+{
+  if (!orb_core->optimize_collocation_objects ())
+    return 0;
+
+  if (!orb_core->use_global_collocation () && orb_core != this)
+    return 0;
+
+  if (!orb_core->is_collocated (mprofile))
+    return 0;
+
+  // OK, the target ORB and the mprofile match, use the Adapter
+  // Registry of each ORB to find the right one.
+
+  return orb_core->adapter_registry ()->create_collocated_object (stub,
+                                                                  mprofile);
+}
+
 int
 TAO_ORB_Core::is_collocated (const TAO_MProfile& mprofile)
 {
@@ -1815,6 +1934,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
   return result;
 }
 
+#if 0 // PPOA
 void
 TAO_ORB_Core::destroy_root_poa (CORBA::Boolean wait_for_completion,
                                 CORBA::Environment &ACE_TRY_ENV)
@@ -1842,11 +1962,13 @@ TAO_ORB_Core::destroy_root_poa (CORBA::Boolean wait_for_completion,
       this->root_poa_ = 0;
     }
 }
+#endif /* 0 PPOA */
 
 void
 TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion,
                         CORBA::Environment &ACE_TRY_ENV)
 {
+#if 0 // PPOA
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_POA::check_for_valid_wait_for_completions (wait_for_completion,
                                                  ACE_TRY_ENV);
@@ -1855,6 +1977,12 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion,
   this->destroy_root_poa (wait_for_completion,
                           ACE_TRY_ENV);
   ACE_CHECK;
+#else
+  this->adapter_registry_.check_close (wait_for_completion,
+                                       ACE_TRY_ENV);
+  this->adapter_registry_.close (wait_for_completion,
+                                 ACE_TRY_ENV);
+#endif /* 0 PPOA */
 
   // Set the shutdown flag
   this->has_shutdown_ = 1;
@@ -2630,6 +2758,12 @@ TAO_ORB_Core_instance (void)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
+template class ACE_Lock_Adapter<ACE_Null_Mutex>;
+#if defined (ACE_HAS_THREADS)
+template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>;
+template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
+#endif /* ACE_HAS_THREADS */
+
 template class ACE_Reverse_Lock<ACE_SYNCH_MUTEX>;
 template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_MUTEX> >;
 
@@ -2649,6 +2783,12 @@ template class ACE_Map_Reverse_Iterator<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+#pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex>
+#if defined (ACE_HAS_THREADS)
+#pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>
+#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
+#endif /* ACE_HAS_THREADS */
+
 #pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_MUTEX> >
 
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index faff9464f69..fd12632fc7d 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -28,18 +28,13 @@
 #include "tao/Policy_Manager.h"
 #include "tao/Resource_Factory.h"
 #include "tao/params.h"
-#include "tao/PortableServerC.h"
 #include "tao/TAO_Singleton_Manager.h"
 #include "tao/TAO_Singleton.h"
+#include "tao/Adapter.h"
 
 #include "ace/Map_Manager.h"
 
 // Forward declarations
-class TAO_POA;
-class TAO_POA_Current;
-class TAO_POA_Current_Impl;
-class TAO_POA_Manager;
-class TAO_POA_Policies;
 class TAO_Acceptor;
 class TAO_Connector;
 class TAO_Acceptor_Registry;
@@ -49,7 +44,7 @@ class TAO_Resource_Factory;
 class TAO_Client_Strategy_Factory;
 class TAO_Server_Strategy_Factory;
 class TAO_Connection_Cache;
-class TAO_Object_Adapter;
+
 class TAO_TSS_Resources;
 class TAO_Reactor_Registry;
 class TAO_Leader_Follower;
@@ -164,7 +159,16 @@ public:
   TAO_ORB_Parameters *orb_params (void);
   // Accessor for the ORB parameters.
 
-  TAO_POA_Current &poa_current (void) const;
+  // @@ PPOA: TAO_POA_Current &poa_current (void) const;
+  // @@ In the future this hook should change, instead of hardcoding
+  //    the object we should add a "Resolver" to the ORB, so the
+  //    "POACurrent" object returns a per-ORB object.
+  //    Similarly, each ORB should implement the TSS pattern to put
+  //    the POA_Current_Impl in a void* slot.
+  //    The current approach *does* decouple the POA from the ORB, but
+  //    it cannot add new adapters or other components transparently.
+  CORBA::Object_ptr poa_current (void);
+  void poa_current (CORBA::Object_ptr poa_current);
   // Accessor to the POA current.
 
   // = Get the connector registry
@@ -186,6 +190,7 @@ public:
   // = Get the ACE_Thread_Manager
   ACE_Thread_Manager *thr_mgr (void);
 
+#if 0 // PPOA
   // = Get the rootPOA
   TAO_POA *root_poa (CORBA::Environment &ACE_TRY_ENV =
                            TAO_default_environment (),
@@ -198,6 +203,14 @@ public:
       const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
       TAO_POA_Manager *poa_manager = 0,
       const TAO_POA_Policies *policies = 0);
+#else
+  CORBA::Object_ptr root_poa (CORBA::Environment &ACE_TRY_ENV);
+  // Return the RootPOA, or try to load it if not initialized already.
+
+  TAO_Adapter_Registry *adapter_registry (void); // PPOA
+  // Get the adapter registry
+
+#endif /* 0 PPOA */
 
   // = Collocation strategies.
   enum
@@ -253,8 +266,13 @@ public:
 
   CORBA::ULong get_collocation_strategy (void) const;
 
-  TAO_Object_Adapter *object_adapter (void);
+  // @@ PPOA: Should go away!  But leave it here to remove the other
+  // bugs first!
+  // @@ TAO_Object_Adapter *object_adapter (void);
   // Get <Object Adapter>.
+  TAO_Adapter *poa_adapter (void);
+  // Get the adapter named "RootPOA" and cache the result, this is an
+  // optimization for the POA.
 
   int inherit_from_parent_thread (TAO_ORB_Core_TSS_Resources *tss_resources);
   // A spawned thread needs to inherit some properties/objects from
@@ -464,11 +482,15 @@ public:
   TAO_Stub *create_stub_object (const TAO_ObjectKey &key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
-                                TAO_POA *poa,
+                                TAO_Acceptor_Filter *filter,
                                 CORBA::Environment &ACE_TRY_ENV);
   // Makes sure that the ORB is open and then creates a TAO_Stub
   // based on the endpoint.
 
+  CORBA::Object_ptr create_object (TAO_Stub *the_stub);
+  // Create a new object, use the adapter registry to create a
+  // collocated object, if not possible then create a regular object.
+
   const char *orbid (void) const;
   // Return ORBid string.
 
@@ -506,6 +528,7 @@ protected:
   int fini (void);
   // Final termination hook, typically called by CORBA::ORB's DTOR.
 
+#if 0
   void create_and_set_root_poa (const char *adapter_name,
                                 TAO_POA_Manager *poa_manager,
                                 const TAO_POA_Policies *policies,
@@ -518,6 +541,7 @@ protected:
 
   TAO_Object_Adapter *object_adapter_i (void);
   // Get <Object Adapter>, assume the lock is held...
+#endif /* PPOA */
 
   ACE_Allocator *input_cdr_dblock_allocator_i (TAO_ORB_Core_TSS_Resources *);
   ACE_Allocator *input_cdr_buffer_allocator_i (TAO_ORB_Core_TSS_Resources *);
@@ -540,6 +564,12 @@ private:
   ACE_UNIMPLEMENTED_FUNC (TAO_ORB_Core(const TAO_ORB_Core&))
   ACE_UNIMPLEMENTED_FUNC (void operator=(const TAO_ORB_Core&))
 
+  CORBA::Object_ptr create_collocated_object (TAO_Stub *the_stub,
+                                              TAO_ORB_Core *other_orb,
+                                              const TAO_MProfile &mprofile);
+  // Try to create a new collocated object, using <other_orb> as the
+  // target ORB.  If not possible return 0.
+
 protected:
   ACE_SYNCH_MUTEX lock_;
   // Synchronize internal state...
@@ -576,7 +606,8 @@ protected:
   //    same object, but maybe don't want so much coupling.
   // Pointer to the ORB.
 
-  TAO_POA *root_poa_;
+  CORBA::Object_var root_poa_;
+  // PPOA: TAO_POA *root_poa_;
   // Pointer to the root POA.  It will eventually be the pointer
   // returned by calls to <CORBA::ORB::resolve_initial_references
   // ("RootPOA")>.
@@ -638,16 +669,23 @@ protected:
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
-  TAO_POA_Current *poa_current_;
+  // PPOA: TAO_POA_Current *poa_current_;
+  CORBA::Object_var poa_current_;
   // POA current.
   //
   // Note that this is a pointer in order to reduce the include file
   // dependencies.
   //
 
-  TAO_Object_Adapter *object_adapter_;
+  // PPOA: TAO_Object_Adapter *object_adapter_;
   // Object Adapter.
 
+  TAO_Adapter_Registry adapter_registry_; // PPOA
+  // The list of Adapters used in this ORB
+
+  TAO_Adapter *poa_adapter_;
+  // An optimization for the POA
+
   ACE_Thread_Manager tm_;
   // The Thread Manager
 
@@ -786,7 +824,8 @@ private:
 
 public:
 
-  TAO_POA_Current_Impl *poa_current_impl_;
+  // PPOA: TAO_POA_Current_Impl *poa_current_impl_;
+  void *poa_current_impl_;
   // Points to structure containing state for the current upcall
   // context in this thread.  Note that it does not come from the
   // resource factory because it must always be held in
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index fefb4baa96d..041dca1eed1 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -71,6 +71,7 @@ TAO_ORB_Core::orb (void)
   return this->orb_.in ();
 }
 
+#if 0 // PPOA
 ACE_INLINE TAO_POA *
 TAO_ORB_Core::root_poa (CORBA::Environment &ACE_TRY_ENV,
                         const char *adapter_name,
@@ -87,6 +88,15 @@ TAO_ORB_Core::root_poa (CORBA::Environment &ACE_TRY_ENV,
   return this->root_poa_;
 }
 
+#else
+
+ACE_INLINE TAO_Adapter_Registry *
+TAO_ORB_Core::adapter_registry (void)
+{
+  return &this->adapter_registry_;
+}
+#endif /* 0 PPOA */
+
 ACE_INLINE void
 TAO_ORB_Core::optimize_collocation_objects (CORBA::Boolean opt)
 {
@@ -372,12 +382,28 @@ TAO_ORB_Core::policy_current (void)
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
-
+#if 0 // PPOA
 ACE_INLINE TAO_POA_Current &
 TAO_ORB_Core::poa_current (void) const
 {
   return *this->poa_current_;
 }
+#else
+ACE_INLINE CORBA::Object_ptr
+TAO_ORB_Core::poa_current (void)
+{
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0);
+  return CORBA::Object::_duplicate (this->poa_current_.in ());
+}
+
+ACE_INLINE void
+TAO_ORB_Core::poa_current (CORBA::Object_ptr current)
+{
+  ACE_GUARD (ACE_SYNCH_MUTEX, mon, this->lock_);
+  this->poa_current_ =
+    CORBA::Object::_duplicate (current);
+}
+#endif /* 0 PPOA */
 
 ACE_INLINE CORBA_Environment *
 TAO_ORB_Core::default_environment (void) const
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 032941fb309..12ed33094a7 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -6,9 +6,7 @@
 // ORB:         CORBA_Object operations
 
 #include "tao/Object.h"
-#include "tao/Object_Adapter.h"
 #include "tao/Stub.h"
-#include "tao/Servant_Base.h"
 #include "tao/Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/Invocation.h"
@@ -32,10 +30,8 @@ CORBA_Object::~CORBA_Object (void)
 }
 
 CORBA_Object::CORBA_Object (TAO_Stub *protocol_proxy,
-                            TAO_ServantBase *servant,
                             CORBA::Boolean collocated)
-  : servant_ (servant),
-    is_collocated_ (collocated),
+  : is_collocated_ (collocated),
     is_local_ (0),
     protocol_proxy_ (protocol_proxy),
     refcount_ (1),
@@ -96,29 +92,6 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
                          this->_stubobj ()->type_id.in ()) == 0)
     return 1;
 
-  // If the object is collocated then try locally....
-  if (this->is_collocated_)
-    {
-      // Which collocation strategy should we use?
-      if (this->protocol_proxy_ != 0 &&
-          this->protocol_proxy_->servant_orb_var ()->orb_core ()
-          ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
-        {
-          TAO_Object_Adapter::Servant_Upcall servant_upcall
-            (*this->_stubobj ()->servant_orb_var ()->orb_core ()
-             ->object_adapter ());
-          servant_upcall.prepare_for_upcall (this->_object_key (),
-                                             "_is_a",
-                                             ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-          return servant_upcall.servant ()->_is_a (type_id, ACE_TRY_ENV);
-        }
-
-      // Direct collocation strategy is used.
-      if (this->servant_ != 0)
-        return this->servant_->_is_a (type_id, ACE_TRY_ENV);
-    }
-
   CORBA::Boolean _tao_retval = 0;
 
   TAO_Stub *istub = this->_stubobj ();
@@ -190,12 +163,6 @@ CORBA_Object::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Object:1.0";
 }
 
-TAO_ServantBase *
-CORBA_Object::_servant (void) const
-{
-  return this->servant_;
-}
-
 CORBA::Boolean
 CORBA_Object::_is_collocated (void) const
 {
@@ -241,8 +208,8 @@ CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj,
 
   if (this->protocol_proxy_ != 0)
     return this->protocol_proxy_->is_equivalent (other_obj);
-  else
-    return this->servant_ == other_obj->servant_;
+
+  return 0;
 }
 
 // TAO's extensions
@@ -310,28 +277,6 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      // If the object is collocated then try locally....
-      if (this->is_collocated_)
-        {
-          // Which collocation strategy should we use?
-          if (this->protocol_proxy_ != 0 &&
-              this->protocol_proxy_->servant_orb_var ()->orb_core ()
-              ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
-            {
-              TAO_Object_Adapter::Servant_Upcall servant_upcall
-                (*this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ());
-              servant_upcall.prepare_for_upcall (this->_object_key (),
-                                                 "_non_existent",
-                                                 ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-              return servant_upcall.servant ()->_non_existent (ACE_TRY_ENV);
-            }
-
-          // Direct collocation strategy is used.
-          if (this->servant_ != 0)
-            return this->servant_->_non_existent (ACE_TRY_ENV);
-        }
-
       // Must catch exceptions, if the server raises a
       // CORBA::OBJECT_NOT_EXIST then we must return 1, instead of
       // propagating the exception.
@@ -610,7 +555,6 @@ CORBA_Object::_set_policy_overrides (
 
   ACE_NEW_THROW_EX (obj,
                     CORBA_Object (stub,
-                                  this->servant_,
                                   this->is_collocated_),
                     CORBA::NO_MEMORY (
                       CORBA_SystemException::_tao_minor_code (
@@ -763,34 +707,17 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
   TAO_Stub *objdata = 0;
   ACE_NEW_RETURN (objdata, TAO_Stub (type_hint._retn (),
                                      mp,
-                                     cdr.orb_core ()), 0);
+                                     orb_core),
+                  0);
 
   TAO_Stub_Auto_Ptr safe_objdata (objdata);
 
-  // Figure out if the servant is collocated.
-  TAO_ServantBase *servant = 0;
-  TAO_SERVANT_LOCATION servant_location =
-    objdata->orb_core ()->orb ()->_get_collocated_servant (safe_objdata.get (),
-                                                           servant);
-
-  int collocated = 0;
-  if (servant_location != TAO_SERVANT_NOT_FOUND)
-    collocated = 1;
-
-  // Create a new CORBA_Object and give it the TAO_Stub just created.
-  ACE_NEW_RETURN (x,
-                  CORBA_Object (safe_objdata.get (),
-                                servant,
-                                (CORBA::Boolean) collocated),
-                  0);
-
-  // It is now safe to release the TAO_Stub from the TAO_Stub_Auto_Ptr.
-  objdata = safe_objdata.release ();
+  x = orb_core->create_object (safe_objdata.get ());
+  if (x == 0)
+    return 0;
 
-  // the corba proxy would have already incremented the reference count on
-  // the objdata. So we decrement it here by 1 so that the objdata is now
-  // fully owned by the corba_proxy that was created.
-  // objdata->_decr_refcnt ();
+  // Transfer ownership to the CORBA::Object
+  (void) safe_objdata.release ();
 
   return (CORBA::Boolean) cdr.good_bit ();
 }
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index ef135b5a2b9..8241cfcada7 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -36,7 +36,6 @@
   class IR_InterfaceDef;
 #endif  /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
 
-class TAO_ServantBase;
 class TAO_Stub;
 
 class TAO_Export CORBA_Object
@@ -78,9 +77,6 @@ public:
   // The repository ID for the most derived class, this is an
   // implementation method and does no remote invocations!
 
-  virtual TAO_ServantBase *_servant (void) const;
-  // return the associated servant (if one exists)
-
   virtual CORBA::Boolean _is_collocated (void) const;
   // Is this object collocated with the servant?
 
@@ -223,7 +219,6 @@ public:
   // = TAO extensions
 
   CORBA_Object (TAO_Stub *p = 0,
-                TAO_ServantBase *servant = 0,
                 CORBA::Boolean collocated = 0);
   // constructor
 
@@ -245,9 +240,6 @@ protected:
   CORBA::ULong _decr_refcnt (void);
   // Decrement the reference count.
 
-  TAO_ServantBase *servant_;
-  // Servant pointer.  It is 0 except for collocated objects.
-
   CORBA::Boolean is_collocated_;
   // Flag to indicate collocation.  It is 0 except for collocated
   // objects.
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index dd1f0351da5..21a1eaade3c 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -4,8 +4,7 @@
 
 ACE_INLINE
 CORBA_Object::CORBA_Object (int)
-  : servant_ (0),
-    is_collocated_ (0),
+  : is_collocated_ (0),
     is_local_ (1),
     protocol_proxy_ (0),
     refcount_ (1),
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 7b6d0db4b97..22ec4287bc6 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -48,4 +48,83 @@ CORBA::TypeCode _tc_TAO_tc_TAO_ObjectKey (CORBA::tk_alias, sizeof
 CORBA::TypeCode_ptr TAO_tc_ObjectKey = &_tc_TAO_tc_TAO_ObjectKey;
 
 
+void
+TAO_ObjectKey::encode_sequence_to_string (char * &str,
+                                          const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
+{
+  // We must allocate a buffer which is (gag) 3 times the length
+  // of the sequence, which is the length required in the worst-case
+  // scenario of all non-printable characters.
+  //
+  // There are two strategies here...we could allocate all that space here,
+  // fill it up, then copy-allocate new space of just the right length.
+  // OR, we could just return this space.  The classic time-space tradeoff,
+  // and for now we'll let time win out, which means that we only do the
+  // allocation once.
+  u_int len = 3 * seq.length (); /* space for zero termination not needed */;
+  str = CORBA::string_alloc (len);
+
+  char *cp = str;
+
+  for (u_int i = 0;
+       cp < (cp + len) && i < seq.length();
+       ++i)
+    {
+      u_char byte = seq[i];
+      if (isprint (byte) && byte != '\\')
+        {
+          *cp++ = (char) byte;
+          continue;
+        }
+
+      *cp++ = '\\';
+      *cp++ = ACE::nibble2hex ((byte >> 4) & 0x0f);
+      *cp++ = ACE::nibble2hex (byte & 0x0f);
+    }
+  // Zero terminate
+  *cp = '\0';
+}
+
+void
+TAO_ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+                                          const char *str)
+{
+  if (str == 0)
+    {
+      seq.length (0);
+      return;
+    }
+
+  u_int length = ACE_OS::strlen (str);
+  const char *eos = str + length;
+  const char *cp = str;
+
+  // Set the length of the sequence to be as long as
+  // we'll possibly need...we'll reset it to the actual
+  // length later.
+  seq.length (length);
+
+  u_int i = 0;
+  for (;
+       cp < eos && i < seq.length ();
+       i++)
+    {
+      if (*cp == '\\')
+        {
+          // This is an escaped non-printable,
+          // so we decode the hex values into
+          // the sequence's octet
+          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
+          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
+          cp += 3;
+        }
+      else
+        // Copy it in
+        seq[i] = *cp++;
+    }
+
+  // Set the length appropriately
+  seq.length (i);
+}
+
 // ****************************************************************
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 49948171bd0..e4d16dffe25 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -45,6 +45,11 @@ public:
                   CORBA::Boolean release = 0);
   TAO_ObjectKey (const TAO_ObjectKey &);
   TAO_ObjectKey& operator= (const TAO_ObjectKey &);
+
+  static void encode_sequence_to_string (char * &str,
+                                         const TAO_Unbounded_Sequence<CORBA::Octet> &seq);
+  static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
+                                         const char *str);
 };
 
 class TAO_Export TAO_ObjectKey_var
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 8f5c30ae0c8..918b535d633 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -99,7 +99,7 @@ public:
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_
 
@@ -107,9 +107,9 @@ public:
   {
   public:
     // = Initialization and termination methods.
-    
+
     _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum);
     _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum,
       CORBA::ULong length,
       CORBA::UShort *data,
@@ -126,7 +126,7 @@ public:
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
+
     CORBA::UShort *get_buffer (CORBA::Boolean orphan = 0);
     const CORBA::UShort *get_buffer (void) const;
     void replace (CORBA::ULong max,
@@ -138,7 +138,7 @@ public:
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_)
 #define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_
@@ -150,20 +150,20 @@ class _tao_seq_UShort_var;
 // _tao_seq_UShort
 // *************************************************************
 
-class TAO_Export _tao_seq_UShort : public 
+class TAO_Export _tao_seq_UShort : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::UShort>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 {
 public:
   _tao_seq_UShort (void); // default ctor
   _tao_seq_UShort (CORBA::ULong max); // uses max size
   _tao_seq_UShort (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA::UShort *buffer, 
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::UShort *buffer,
     CORBA::Boolean release=0
   );
   _tao_seq_UShort (const _tao_seq_UShort &); // copy ctor
@@ -194,19 +194,19 @@ public:
   _tao_seq_UShort_var (const _tao_seq_UShort_var &); // copy constructor
   _tao_seq_UShort_var (const _tao_seq_UShort &); // fixed-size base types only
   ~_tao_seq_UShort_var (void); // destructor
-  
+
   _tao_seq_UShort_var &operator= (_tao_seq_UShort *);
   _tao_seq_UShort_var &operator= (const _tao_seq_UShort_var &);
   _tao_seq_UShort_var &operator= (const _tao_seq_UShort &); // fixed-size base types only
   _tao_seq_UShort *operator-> (void);
   const _tao_seq_UShort *operator-> (void) const;
-  
+
   operator const _tao_seq_UShort &() const;
   operator _tao_seq_UShort &();
   operator _tao_seq_UShort &() const;
-  
+
   CORBA::UShort &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   const _tao_seq_UShort &in (void) const;
   _tao_seq_UShort &inout (void);
   _tao_seq_UShort *&out (void);
@@ -236,7 +236,7 @@ public:
   _tao_seq_UShort *&ptr (void);
   _tao_seq_UShort *operator-> (void);
   CORBA::UShort &operator[] (CORBA::ULong index);
-  
+
 private:
   _tao_seq_UShort *&ptr_;
   // assignment from T_var not allowed
@@ -302,17 +302,17 @@ class TAO_Export CORBA_Policy_var : public TAO_Base_var
 {
 public:
   CORBA_Policy_var (void); // default constructor
-  CORBA_Policy_var (CORBA_Policy_ptr p) : ptr_ (p) {} 
+  CORBA_Policy_var (CORBA_Policy_ptr p) : ptr_ (p) {}
   CORBA_Policy_var (const CORBA_Policy_var &); // copy constructor
   ~CORBA_Policy_var (void); // destructor
-  
+
   CORBA_Policy_var &operator= (CORBA_Policy_ptr);
   CORBA_Policy_var &operator= (const CORBA_Policy_var &);
   CORBA_Policy_ptr operator-> (void) const;
-  
+
   operator const CORBA_Policy_ptr &() const;
   operator CORBA_Policy_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_Policy_ptr in (void) const;
   CORBA_Policy_ptr &inout (void);
   CORBA_Policy_ptr &out (void);
@@ -345,7 +345,7 @@ public:
   operator CORBA_Policy_ptr &();
   CORBA_Policy_ptr &ptr (void);
   CORBA_Policy_ptr operator-> (void);
-  
+
 private:
   CORBA_Policy_ptr &ptr_;
 };
@@ -369,12 +369,12 @@ public:
   static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj);
   static CORBA_Policy_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static CORBA_Policy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static CORBA_Policy_ptr _nil (void)
@@ -385,7 +385,7 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual CORBA::PolicyType policy_type (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -393,7 +393,7 @@ public:
     ));
 
   virtual CORBA_Policy_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -401,7 +401,7 @@ public:
     ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -409,12 +409,12 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
@@ -427,8 +427,7 @@ public:
 
 protected:
   CORBA_Policy (void);
-  CORBA_Policy (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  CORBA_Policy (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~CORBA_Policy (void);
@@ -444,7 +443,7 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_Policy;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_
 
@@ -452,7 +451,7 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_Policy;
   {
   public:
     // = Initialization and termination methods.
-    
+
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void);
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum);
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum,
@@ -474,17 +473,17 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_Policy;
     virtual void _downcast (
         void* target,
         CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
+        CORBA_Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     virtual CORBA_Object* _upcast (void *src) const;
-    
+
   };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICYLIST_CH_)
 #define _CORBA_POLICYLIST_CH_
@@ -496,20 +495,20 @@ class CORBA_PolicyList_var;
 // CORBA_PolicyList
 // *************************************************************
 
-class TAO_Export CORBA_PolicyList : public 
+class TAO_Export CORBA_PolicyList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 {
 public:
   CORBA_PolicyList (void); // default ctor
   CORBA_PolicyList (CORBA::ULong max); // uses max size
   CORBA_PolicyList (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_Policy_ptr *buffer, 
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA_Policy_ptr *buffer,
     CORBA::Boolean release=0
   );
   CORBA_PolicyList (const CORBA_PolicyList &); // copy ctor
@@ -539,19 +538,19 @@ public:
   CORBA_PolicyList_var (CORBA_PolicyList *);
   CORBA_PolicyList_var (const CORBA_PolicyList_var &); // copy constructor
   ~CORBA_PolicyList_var (void); // destructor
-  
+
   CORBA_PolicyList_var &operator= (CORBA_PolicyList *);
   CORBA_PolicyList_var &operator= (const CORBA_PolicyList_var &);
   CORBA_PolicyList *operator-> (void);
   const CORBA_PolicyList *operator-> (void) const;
-  
+
   operator const CORBA_PolicyList &() const;
   operator CORBA_PolicyList &();
   operator CORBA_PolicyList &() const;
   operator CORBA_PolicyList *&(); // variable-size base types only
-  
+
   TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var> operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   const CORBA_PolicyList &in (void) const;
   CORBA_PolicyList &inout (void);
   CORBA_PolicyList *&out (void);
@@ -581,7 +580,7 @@ public:
   CORBA_PolicyList *&ptr (void);
   CORBA_PolicyList *operator-> (void);
   TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var> operator[] (CORBA::ULong index);
-  
+
 private:
   CORBA_PolicyList *&ptr_;
   // assignment from T_var not allowed
@@ -595,7 +594,7 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyList;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_
 
@@ -603,9 +602,9 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyList;
   {
   public:
     // = Initialization and termination methods.
-    
+
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void); // Default constructor.
-    _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum);
     _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum,
       CORBA::ULong length,
       CORBA::ULong *data,
@@ -622,7 +621,7 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyList;
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
+
     CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
     const CORBA::ULong *get_buffer (void) const;
     void replace (CORBA::ULong max,
@@ -634,7 +633,7 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_PolicyList;
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICYTYPESEQ_CH_)
 #define _CORBA_POLICYTYPESEQ_CH_
@@ -646,20 +645,20 @@ class CORBA_PolicyTypeSeq_var;
 // CORBA_PolicyTypeSeq
 // *************************************************************
 
-class TAO_Export CORBA_PolicyTypeSeq : public 
+class TAO_Export CORBA_PolicyTypeSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 {
 public:
   CORBA_PolicyTypeSeq (void); // default ctor
   CORBA_PolicyTypeSeq (CORBA::ULong max); // uses max size
   CORBA_PolicyTypeSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA::ULong *buffer, 
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ULong *buffer,
     CORBA::Boolean release=0
   );
   CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &); // copy ctor
@@ -690,19 +689,19 @@ public:
   CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &); // copy constructor
   CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq &); // fixed-size base types only
   ~CORBA_PolicyTypeSeq_var (void); // destructor
-  
+
   CORBA_PolicyTypeSeq_var &operator= (CORBA_PolicyTypeSeq *);
   CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq_var &);
   CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq &); // fixed-size base types only
   CORBA_PolicyTypeSeq *operator-> (void);
   const CORBA_PolicyTypeSeq *operator-> (void) const;
-  
+
   operator const CORBA_PolicyTypeSeq &() const;
   operator CORBA_PolicyTypeSeq &();
   operator CORBA_PolicyTypeSeq &() const;
-  
+
   CORBA::PolicyType &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   const CORBA_PolicyTypeSeq &in (void) const;
   CORBA_PolicyTypeSeq &inout (void);
   CORBA_PolicyTypeSeq *&out (void);
@@ -732,7 +731,7 @@ public:
   CORBA_PolicyTypeSeq *&ptr (void);
   CORBA_PolicyTypeSeq *operator-> (void);
   CORBA::PolicyType &operator[] (CORBA::ULong index);
-  
+
 private:
   CORBA_PolicyTypeSeq *&ptr_;
   // assignment from T_var not allowed
@@ -761,17 +760,17 @@ class TAO_Export CORBA_PolicyManager_var : public TAO_Base_var
 {
 public:
   CORBA_PolicyManager_var (void); // default constructor
-  CORBA_PolicyManager_var (CORBA_PolicyManager_ptr p) : ptr_ (p) {} 
+  CORBA_PolicyManager_var (CORBA_PolicyManager_ptr p) : ptr_ (p) {}
   CORBA_PolicyManager_var (const CORBA_PolicyManager_var &); // copy constructor
   ~CORBA_PolicyManager_var (void); // destructor
-  
+
   CORBA_PolicyManager_var &operator= (CORBA_PolicyManager_ptr);
   CORBA_PolicyManager_var &operator= (const CORBA_PolicyManager_var &);
   CORBA_PolicyManager_ptr operator-> (void) const;
-  
+
   operator const CORBA_PolicyManager_ptr &() const;
   operator CORBA_PolicyManager_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_PolicyManager_ptr in (void) const;
   CORBA_PolicyManager_ptr &inout (void);
   CORBA_PolicyManager_ptr &out (void);
@@ -804,7 +803,7 @@ public:
   operator CORBA_PolicyManager_ptr &();
   CORBA_PolicyManager_ptr &ptr (void);
   CORBA_PolicyManager_ptr operator-> (void);
-  
+
 private:
   CORBA_PolicyManager_ptr &ptr_;
 };
@@ -828,12 +827,12 @@ public:
   static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj);
   static CORBA_PolicyManager_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static CORBA_PolicyManager_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static CORBA_PolicyManager_ptr _nil (void)
@@ -843,7 +842,7 @@ public:
 
   virtual CORBA_PolicyList * get_policy_overrides (
       const CORBA_PolicyTypeSeq & ts,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -853,7 +852,7 @@ public:
   virtual void set_policy_overrides (
       const CORBA_PolicyList & policies,
       CORBA::SetOverrideType set_add,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -862,7 +861,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -893,17 +892,17 @@ class TAO_Export CORBA_PolicyCurrent_var : public TAO_Base_var
 {
 public:
   CORBA_PolicyCurrent_var (void); // default constructor
-  CORBA_PolicyCurrent_var (CORBA_PolicyCurrent_ptr p) : ptr_ (p) {} 
+  CORBA_PolicyCurrent_var (CORBA_PolicyCurrent_ptr p) : ptr_ (p) {}
   CORBA_PolicyCurrent_var (const CORBA_PolicyCurrent_var &); // copy constructor
   ~CORBA_PolicyCurrent_var (void); // destructor
-  
+
   CORBA_PolicyCurrent_var &operator= (CORBA_PolicyCurrent_ptr);
   CORBA_PolicyCurrent_var &operator= (const CORBA_PolicyCurrent_var &);
   CORBA_PolicyCurrent_ptr operator-> (void) const;
-  
+
   operator const CORBA_PolicyCurrent_ptr &() const;
   operator CORBA_PolicyCurrent_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_PolicyCurrent_ptr in (void) const;
   CORBA_PolicyCurrent_ptr &inout (void);
   CORBA_PolicyCurrent_ptr &out (void);
@@ -936,7 +935,7 @@ public:
   operator CORBA_PolicyCurrent_ptr &();
   CORBA_PolicyCurrent_ptr &ptr (void);
   CORBA_PolicyCurrent_ptr operator-> (void);
-  
+
 private:
   CORBA_PolicyCurrent_ptr &ptr_;
 };
@@ -960,12 +959,12 @@ public:
   static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj);
   static CORBA_PolicyCurrent_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static CORBA_PolicyCurrent_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static CORBA_PolicyCurrent_ptr _nil (void)
@@ -974,7 +973,7 @@ public:
     }
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -1015,7 +1014,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_PolicyTyp
 
 #ifndef __ACE_INLINE__
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &); // 
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &); //
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_PolicyError &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PolicyError &);
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
index 1368b43fc9a..91a5da00563 100644
--- a/TAO/tao/PolicyC.i
+++ b/TAO/tao/PolicyC.i
@@ -17,7 +17,7 @@
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_
 
@@ -30,24 +30,24 @@
     ACE_NEW_RETURN (retval, CORBA::UShort[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -56,7 +56,7 @@
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs)
   // Copy constructor.
@@ -66,10 +66,10 @@
     {
       CORBA::UShort *tmp1 = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->maximum_);
       CORBA::UShort * const tmp2 = ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -77,14 +77,14 @@
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -97,18 +97,18 @@
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     CORBA::UShort *tmp1 = ACE_reinterpret_cast (CORBA::UShort *, this->buffer_);
     CORBA::UShort * const tmp2 = ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE CORBA::UShort &
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i)
@@ -118,7 +118,7 @@
     CORBA::UShort* tmp = ACE_reinterpret_cast(CORBA::UShort*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const CORBA::UShort &
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) const
   // operator []
@@ -127,9 +127,9 @@
     CORBA::UShort * const tmp = ACE_reinterpret_cast (CORBA::UShort* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE CORBA::UShort *
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (CORBA::Boolean orphan)
   {
@@ -141,7 +141,7 @@
       {
         result = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -163,13 +163,13 @@
     }
     return result;
   }
-  
+
   ACE_INLINE const CORBA::UShort *
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const CORBA::UShort * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   CORBA_InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -186,11 +186,11 @@
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_)
 #define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_
@@ -274,20 +274,20 @@ CORBA_InvalidPolicies::_tao_seq_UShort_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_InvalidPolicies::_tao_seq_UShort_var::operator const ::CORBA_InvalidPolicies::_tao_seq_UShort &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_InvalidPolicies::_tao_seq_UShort_var::operator ::CORBA_InvalidPolicies::_tao_seq_UShort &() // cast 
+ACE_INLINE
+CORBA_InvalidPolicies::_tao_seq_UShort_var::operator ::CORBA_InvalidPolicies::_tao_seq_UShort &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_InvalidPolicies::_tao_seq_UShort_var::operator ::CORBA_InvalidPolicies::_tao_seq_UShort &() const // cast 
+ACE_INLINE
+CORBA_InvalidPolicies::_tao_seq_UShort_var::operator ::CORBA_InvalidPolicies::_tao_seq_UShort &() const // cast
 {
   return *this->ptr_;
 }
@@ -310,7 +310,7 @@ CORBA_InvalidPolicies::_tao_seq_UShort_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::CORBA_InvalidPolicies::_tao_seq_UShort *&
 CORBA_InvalidPolicies::_tao_seq_UShort_var::out (void)
 {
@@ -371,7 +371,7 @@ CORBA_InvalidPolicies::_tao_seq_UShort_out::operator= (_tao_seq_UShort *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_InvalidPolicies::_tao_seq_UShort_out::operator ::CORBA_InvalidPolicies::_tao_seq_UShort *&() // cast
 {
   return this->ptr_;
@@ -399,8 +399,8 @@ CORBA_InvalidPolicies::_tao_seq_UShort_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 ACE_INLINE
-CORBA_Policy::CORBA_Policy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+CORBA_Policy::CORBA_Policy (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 
@@ -453,14 +453,14 @@ CORBA_Policy_var::operator= (const ::CORBA_Policy_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_Policy_var::operator const ::CORBA_Policy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_Policy_var::operator ::CORBA_Policy_ptr &() // cast 
+ACE_INLINE
+CORBA_Policy_var::operator ::CORBA_Policy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -552,7 +552,7 @@ CORBA_Policy_out::operator= (CORBA_Policy_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_Policy_out::operator ::CORBA_Policy_ptr &() // cast
 {
   return this->ptr_;
@@ -575,7 +575,7 @@ CORBA_Policy_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_
 
@@ -583,34 +583,34 @@ CORBA_Policy_out::operator-> (void)
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (CORBA::ULong nelems)
   {
     CORBA_Policy **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, CORBA_Policy*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = CORBA_Policy::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (CORBA_Policy **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -619,7 +619,7 @@ CORBA_Policy_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList(const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -628,10 +628,10 @@ CORBA_Policy_out::operator-> (void)
     {
       CORBA_Policy **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
       CORBA_Policy ** const tmp2 = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = CORBA_Policy::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -639,17 +639,17 @@ CORBA_Policy_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       CORBA_Policy **tmp = ACE_reinterpret_cast (CORBA_Policy **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -663,18 +663,18 @@ CORBA_Policy_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     CORBA_Policy **tmp1 = ACE_reinterpret_cast (CORBA_Policy **, this->buffer_);
     CORBA_Policy ** const tmp2 = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = CORBA_Policy::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -683,7 +683,7 @@ CORBA_Policy_out::operator-> (void)
     CORBA_Policy ** const tmp = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE CORBA_Policy* *
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (CORBA::Boolean orphan)
   {
@@ -695,7 +695,7 @@ CORBA_Policy_out::operator-> (void)
       {
         result = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -717,18 +717,18 @@ CORBA_Policy_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const CORBA_Policy* *
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const CORBA_Policy ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICYLIST_CI_)
 #define _CORBA_POLICYLIST_CI_
@@ -793,32 +793,32 @@ CORBA_PolicyList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_PolicyList_var::operator const ::CORBA_PolicyList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyList_var::operator ::CORBA_PolicyList &() // cast 
+ACE_INLINE
+CORBA_PolicyList_var::operator ::CORBA_PolicyList &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyList_var::operator ::CORBA_PolicyList &() const // cast 
+ACE_INLINE
+CORBA_PolicyList_var::operator ::CORBA_PolicyList &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA_PolicyList_var::operator ::CORBA_PolicyList *&() // cast 
+CORBA_PolicyList_var::operator ::CORBA_PolicyList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var> 
+ACE_INLINE TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var>
 CORBA_PolicyList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -836,7 +836,7 @@ CORBA_PolicyList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::CORBA_PolicyList *&
 CORBA_PolicyList_var::out (void)
 {
@@ -897,7 +897,7 @@ CORBA_PolicyList_out::operator= (CORBA_PolicyList *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_PolicyList_out::operator ::CORBA_PolicyList *&() // cast
 {
   return this->ptr_;
@@ -915,7 +915,7 @@ CORBA_PolicyList_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var> 
+ACE_INLINE TAO_Object_Manager<CORBA_Policy, CORBA_Policy_var>
 CORBA_PolicyList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -926,7 +926,7 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_
 
@@ -939,24 +939,24 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (CORBA::ULong *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -965,7 +965,7 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs)
   // Copy constructor.
@@ -975,10 +975,10 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     {
       CORBA::ULong *tmp1 = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->maximum_);
       CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -986,14 +986,14 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -1006,18 +1006,18 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     CORBA::ULong *tmp1 = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
     CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE CORBA::ULong &
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i)
@@ -1027,7 +1027,7 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const CORBA::ULong &
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -1036,9 +1036,9 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE CORBA::ULong *
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -1050,7 +1050,7 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
       {
         result = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -1072,13 +1072,13 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const CORBA::ULong *
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -1095,11 +1095,11 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_POLICYTYPESEQ_CI_)
 #define _CORBA_POLICYTYPESEQ_CI_
@@ -1183,20 +1183,20 @@ CORBA_PolicyTypeSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_PolicyTypeSeq_var::operator const ::CORBA_PolicyTypeSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyTypeSeq_var::operator ::CORBA_PolicyTypeSeq &() // cast 
+ACE_INLINE
+CORBA_PolicyTypeSeq_var::operator ::CORBA_PolicyTypeSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyTypeSeq_var::operator ::CORBA_PolicyTypeSeq &() const // cast 
+ACE_INLINE
+CORBA_PolicyTypeSeq_var::operator ::CORBA_PolicyTypeSeq &() const // cast
 {
   return *this->ptr_;
 }
@@ -1219,7 +1219,7 @@ CORBA_PolicyTypeSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::CORBA_PolicyTypeSeq *&
 CORBA_PolicyTypeSeq_var::out (void)
 {
@@ -1280,7 +1280,7 @@ CORBA_PolicyTypeSeq_out::operator= (CORBA_PolicyTypeSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_PolicyTypeSeq_out::operator ::CORBA_PolicyTypeSeq *&() // cast
 {
   return this->ptr_;
@@ -1357,14 +1357,14 @@ CORBA_PolicyManager_var::operator= (const ::CORBA_PolicyManager_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_PolicyManager_var::operator const ::CORBA_PolicyManager_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyManager_var::operator ::CORBA_PolicyManager_ptr &() // cast 
+ACE_INLINE
+CORBA_PolicyManager_var::operator ::CORBA_PolicyManager_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1456,7 +1456,7 @@ CORBA_PolicyManager_out::operator= (CORBA_PolicyManager_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_PolicyManager_out::operator ::CORBA_PolicyManager_ptr &() // cast
 {
   return this->ptr_;
@@ -1527,14 +1527,14 @@ CORBA_PolicyCurrent_var::operator= (const ::CORBA_PolicyCurrent_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_PolicyCurrent_var::operator const ::CORBA_PolicyCurrent_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_PolicyCurrent_var::operator ::CORBA_PolicyCurrent_ptr &() // cast 
+ACE_INLINE
+CORBA_PolicyCurrent_var::operator ::CORBA_PolicyCurrent_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1626,7 +1626,7 @@ CORBA_PolicyCurrent_out::operator= (CORBA_PolicyCurrent_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA_PolicyCurrent_out::operator ::CORBA_PolicyCurrent_ptr &() // cast
 {
   return this->ptr_;
@@ -1853,4 +1853,3 @@ CORBA::Boolean TAO_Export operator>> (
   );
 
 #endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ */
-
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 774e1a72321..ff9767f47ee 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -25,8 +25,8 @@
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
-#include "tao/POA_CORBA.h"
 #include "tao/LocalObject.h"
+#include "tao/PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index e85807188e6..f1a644b7493 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -11,7 +11,6 @@
 
 #if (TAO_HAS_AMI_POLLER == 1)
 
-#include "tao/POA_CORBA.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/Any.h"
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index bec540f18e7..ebb02c1b868 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -58,25 +58,25 @@ TAO_NAMESPACE  PortableInterceptor
 
   class OctetSeq;
   class OctetSeq_var;
-  
+
   // *************************************************************
   // OctetSeq
   // *************************************************************
-  
-  class TAO_Export OctetSeq : public 
+
+  class TAO_Export OctetSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     OctetSeq (void); // default ctor
     OctetSeq (CORBA::ULong max); // uses max size
     OctetSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA::Octet *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      CORBA::Octet *buffer,
       CORBA::Boolean release=0
     );
     OctetSeq (const OctetSeq &); // copy ctor
@@ -97,7 +97,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -116,19 +116,19 @@ TAO_NAMESPACE  PortableInterceptor
     OctetSeq_var (const OctetSeq_var &); // copy constructor
     OctetSeq_var (const OctetSeq &); // fixed-size base types only
     ~OctetSeq_var (void); // destructor
-    
+
     OctetSeq_var &operator= (OctetSeq *);
     OctetSeq_var &operator= (const OctetSeq_var &);
     OctetSeq_var &operator= (const OctetSeq &); // fixed-size base types only
     OctetSeq *operator-> (void);
     const OctetSeq *operator-> (void) const;
-    
+
     operator const OctetSeq &() const;
     operator OctetSeq &();
     operator OctetSeq &() const;
-    
+
     CORBA::Octet &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     const OctetSeq &in (void) const;
     OctetSeq &inout (void);
     OctetSeq *&out (void);
@@ -158,7 +158,7 @@ TAO_NAMESPACE  PortableInterceptor
     OctetSeq *&ptr (void);
     OctetSeq *operator-> (void);
     CORBA::Octet &operator[] (CORBA::ULong index);
-    
+
   private:
     OctetSeq *&ptr_;
     // assignment from T_var not allowed
@@ -176,25 +176,25 @@ TAO_NAMESPACE  PortableInterceptor
 
   class StringSeq;
   class StringSeq_var;
-  
+
   // *************************************************************
   // StringSeq
   // *************************************************************
-  
-  class TAO_Export StringSeq : public 
+
+  class TAO_Export StringSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     StringSeq (void); // default ctor
     StringSeq (CORBA::ULong max); // uses max size
     StringSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      char * *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      char * *buffer,
       CORBA::Boolean release=0
     );
     StringSeq (const StringSeq &); // copy ctor
@@ -206,7 +206,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -224,19 +224,19 @@ TAO_NAMESPACE  PortableInterceptor
     StringSeq_var (StringSeq *);
     StringSeq_var (const StringSeq_var &); // copy constructor
     ~StringSeq_var (void); // destructor
-    
+
     StringSeq_var &operator= (StringSeq *);
     StringSeq_var &operator= (const StringSeq_var &);
     StringSeq *operator-> (void);
     const StringSeq *operator-> (void) const;
-    
+
     operator const StringSeq &() const;
     operator StringSeq &();
     operator StringSeq &() const;
     operator StringSeq *&(); // variable-size base types only
-    
+
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     const StringSeq &in (void) const;
     StringSeq &inout (void);
     StringSeq *&out (void);
@@ -266,7 +266,7 @@ TAO_NAMESPACE  PortableInterceptor
     StringSeq *&ptr (void);
     StringSeq *operator-> (void);
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
+
   private:
     StringSeq *&ptr_;
     // assignment from T_var not allowed
@@ -284,7 +284,7 @@ TAO_NAMESPACE  PortableInterceptor
 
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -295,17 +295,17 @@ TAO_NAMESPACE  PortableInterceptor
   {
   public:
     Interceptor_var (void); // default constructor
-    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {} 
+    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {}
     Interceptor_var (const Interceptor_var &); // copy constructor
     ~Interceptor_var (void); // destructor
-    
+
     Interceptor_var &operator= (Interceptor_ptr);
     Interceptor_var &operator= (const Interceptor_var &);
     Interceptor_ptr operator-> (void) const;
-    
+
     operator const Interceptor_ptr &() const;
     operator Interceptor_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     Interceptor_ptr in (void) const;
     Interceptor_ptr &inout (void);
     Interceptor_ptr &out (void);
@@ -338,7 +338,7 @@ TAO_NAMESPACE  PortableInterceptor
     operator Interceptor_ptr &();
     Interceptor_ptr &ptr (void);
     Interceptor_ptr operator-> (void);
-    
+
   private:
     Interceptor_ptr &ptr_;
   };
@@ -362,12 +362,12 @@ class TAO_Export Interceptor : public virtual CORBA_Object
     static Interceptor_ptr _duplicate (Interceptor_ptr obj);
     static Interceptor_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static Interceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     static Interceptor_ptr _nil (void)
@@ -378,7 +378,7 @@ class TAO_Export Interceptor : public virtual CORBA_Object
     static void _tao_any_destructor (void*);
 
     virtual char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -386,24 +386,23 @@ class TAO_Export Interceptor : public virtual CORBA_Object
       ));
 
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        const CORBA::Char *type_id,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     Interceptor (void);
-    Interceptor (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
+    Interceptor (TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0
       );
     virtual ~Interceptor (void);
   private:
     Interceptor (const Interceptor &);
-    void operator= (const Interceptor &);    
+    void operator= (const Interceptor &);
 
 };
 
@@ -482,7 +481,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SlotId;
 class TAO_Export InvalidSlot : public CORBA::UserException
 {
 public:
-  
+
   InvalidSlot (void); // default ctor
   InvalidSlot (const InvalidSlot &); // copy ctor
   ~InvalidSlot (void);
@@ -529,17 +528,17 @@ class TAO_Export Current_var : public TAO_Base_var
 {
 public:
   Current_var (void); // default constructor
-  Current_var (Current_ptr p) : ptr_ (p) {} 
+  Current_var (Current_ptr p) : ptr_ (p) {}
   Current_var (const Current_var &); // copy constructor
   ~Current_var (void); // destructor
-  
+
   Current_var &operator= (Current_ptr);
   Current_var &operator= (const Current_var &);
   Current_ptr operator-> (void) const;
-  
+
   operator const Current_ptr &() const;
   operator Current_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   Current_ptr in (void) const;
   Current_ptr &inout (void);
   Current_ptr &out (void);
@@ -572,7 +571,7 @@ public:
   operator Current_ptr &();
   Current_ptr &ptr (void);
   Current_ptr operator-> (void);
-  
+
 private:
   Current_ptr &ptr_;
 };
@@ -596,12 +595,12 @@ public:
   static Current_ptr _duplicate (Current_ptr obj);
   static Current_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static Current_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static Current_ptr _nil (void)
@@ -613,7 +612,7 @@ public:
 
   virtual CORBA::Any * get_slot (
       PortableInterceptor::SlotId id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -624,7 +623,7 @@ public:
   virtual void set_slot (
       PortableInterceptor::SlotId id,
       const CORBA::Any & data,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -633,24 +632,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   Current (void);
-  Current (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  Current (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~Current (void);
 private:
   Current (const Current &);
-  void operator= (const Current &);  
+  void operator= (const Current &);
 
 };
 
@@ -676,17 +674,17 @@ class TAO_Export RequestInfo_var : public TAO_Base_var
 {
 public:
   RequestInfo_var (void); // default constructor
-  RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {} 
+  RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {}
   RequestInfo_var (const RequestInfo_var &); // copy constructor
   ~RequestInfo_var (void); // destructor
-  
+
   RequestInfo_var &operator= (RequestInfo_ptr);
   RequestInfo_var &operator= (const RequestInfo_var &);
   RequestInfo_ptr operator-> (void) const;
-  
+
   operator const RequestInfo_ptr &() const;
   operator RequestInfo_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   RequestInfo_ptr in (void) const;
   RequestInfo_ptr &inout (void);
   RequestInfo_ptr &out (void);
@@ -719,7 +717,7 @@ public:
   operator RequestInfo_ptr &();
   RequestInfo_ptr &ptr (void);
   RequestInfo_ptr operator-> (void);
-  
+
 private:
   RequestInfo_ptr &ptr_;
 };
@@ -743,12 +741,12 @@ public:
   static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
   static RequestInfo_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static RequestInfo_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static RequestInfo_ptr _nil (void)
@@ -759,7 +757,7 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual CORBA::ULong request_id (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -767,7 +765,7 @@ public:
     ));
 
   virtual char * operation (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -775,7 +773,7 @@ public:
     ));
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -783,7 +781,7 @@ public:
     ));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -791,7 +789,7 @@ public:
     ));
 
   virtual Dynamic::ContextList * contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -799,7 +797,7 @@ public:
     ));
 
   virtual Dynamic::RequestContext * operation_context (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -807,7 +805,7 @@ public:
     ));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -815,7 +813,7 @@ public:
     ));
 
   virtual CORBA::Boolean response_expected (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -823,7 +821,7 @@ public:
     ));
 # if (TAO_HAS_CORBA_MESSAGING == 1)
   virtual Messaging::SyncScope sync_scope (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -831,7 +829,7 @@ public:
     ));
 #endif  /* TAO_HAS_CORBA_MESSAGING */
   virtual PortableInterceptor::ReplyStatus reply_status (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -839,7 +837,7 @@ public:
     ));
 
   virtual CORBA::Object_ptr forward_reference (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -848,7 +846,7 @@ public:
 
   virtual CORBA::Any * get_slot (
       PortableInterceptor::SlotId id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -858,7 +856,7 @@ public:
 
   virtual IOP::ServiceContext * get_request_service_context (
       IOP::ServiceId id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -867,7 +865,7 @@ public:
 
   virtual IOP::ServiceContext * get_reply_service_context (
       IOP::ServiceId id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -875,24 +873,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   RequestInfo (void);
-  RequestInfo (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  RequestInfo (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~RequestInfo (void);
 private:
   RequestInfo (const RequestInfo &);
-  void operator= (const RequestInfo &);  
+  void operator= (const RequestInfo &);
 
 };
 
@@ -918,17 +915,17 @@ class TAO_Export ClientRequestInfo_var : public TAO_Base_var
 {
 public:
   ClientRequestInfo_var (void); // default constructor
-  ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {} 
+  ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {}
   ClientRequestInfo_var (const ClientRequestInfo_var &); // copy constructor
   ~ClientRequestInfo_var (void); // destructor
-  
+
   ClientRequestInfo_var &operator= (ClientRequestInfo_ptr);
   ClientRequestInfo_var &operator= (const ClientRequestInfo_var &);
   ClientRequestInfo_ptr operator-> (void) const;
-  
+
   operator const ClientRequestInfo_ptr &() const;
   operator ClientRequestInfo_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ClientRequestInfo_ptr in (void) const;
   ClientRequestInfo_ptr &inout (void);
   ClientRequestInfo_ptr &out (void);
@@ -961,7 +958,7 @@ public:
   operator ClientRequestInfo_ptr &();
   ClientRequestInfo_ptr &ptr (void);
   ClientRequestInfo_ptr operator-> (void);
-  
+
 private:
   ClientRequestInfo_ptr &ptr_;
 };
@@ -985,12 +982,12 @@ public:
   static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
   static ClientRequestInfo_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ClientRequestInfo_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ClientRequestInfo_ptr _nil (void)
@@ -1001,7 +998,7 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual CORBA::Object_ptr target (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1009,7 +1006,7 @@ public:
     ));
 
   virtual CORBA::Object_ptr effective_target (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1017,7 +1014,7 @@ public:
     ));
 
   virtual IOP::TaggedProfile * effective_profile (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1025,7 +1022,7 @@ public:
     ));
 
   virtual CORBA::Any * received_exception (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1033,7 +1030,7 @@ public:
     ));
 
   virtual char * received_exception_id (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1042,7 +1039,7 @@ public:
 
   virtual IOP::TaggedComponent * get_effective_component (
       IOP::ComponentId id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1051,7 +1048,7 @@ public:
 
   virtual CORBA::Policy_ptr get_request_policy (
       CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1061,7 +1058,7 @@ public:
   virtual void add_request_service_context (
       const IOP::ServiceContext & service_context,
       CORBA::Boolean replace,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1069,24 +1066,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   ClientRequestInfo (void);
-  ClientRequestInfo (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  ClientRequestInfo (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~ClientRequestInfo (void);
 private:
   ClientRequestInfo (const ClientRequestInfo &);
-  void operator= (const ClientRequestInfo &);  
+  void operator= (const ClientRequestInfo &);
 
 };
 
@@ -1112,17 +1108,17 @@ class TAO_Export ServerRequestInfo_var : public TAO_Base_var
 {
 public:
   ServerRequestInfo_var (void); // default constructor
-  ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {} 
+  ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {}
   ServerRequestInfo_var (const ServerRequestInfo_var &); // copy constructor
   ~ServerRequestInfo_var (void); // destructor
-  
+
   ServerRequestInfo_var &operator= (ServerRequestInfo_ptr);
   ServerRequestInfo_var &operator= (const ServerRequestInfo_var &);
   ServerRequestInfo_ptr operator-> (void) const;
-  
+
   operator const ServerRequestInfo_ptr &() const;
   operator ServerRequestInfo_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ServerRequestInfo_ptr in (void) const;
   ServerRequestInfo_ptr &inout (void);
   ServerRequestInfo_ptr &out (void);
@@ -1155,7 +1151,7 @@ public:
   operator ServerRequestInfo_ptr &();
   ServerRequestInfo_ptr &ptr (void);
   ServerRequestInfo_ptr operator-> (void);
-  
+
 private:
   ServerRequestInfo_ptr &ptr_;
 };
@@ -1179,12 +1175,12 @@ public:
   static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
   static ServerRequestInfo_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServerRequestInfo_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServerRequestInfo_ptr _nil (void)
@@ -1195,7 +1191,7 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual CORBA::Any * sending_exception (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1203,7 +1199,7 @@ public:
     ));
 
   virtual PortableInterceptor::OctetSeq * object_id (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1211,7 +1207,7 @@ public:
     ));
 
   virtual PortableInterceptor::OctetSeq * adapter_id (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1219,7 +1215,7 @@ public:
     ));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1228,7 +1224,7 @@ public:
 
   virtual CORBA::Policy_ptr get_server_policy (
       CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1238,7 +1234,7 @@ public:
   virtual void set_slot (
       PortableInterceptor::SlotId id,
       const CORBA::Any & data,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1248,7 +1244,7 @@ public:
 
   virtual CORBA::Boolean target_is_a (
       const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1258,7 +1254,7 @@ public:
   virtual void add_reply_service_context (
       const IOP::ServiceContext & service_context,
       CORBA::Boolean replace,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1266,24 +1262,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   ServerRequestInfo (void);
-  ServerRequestInfo (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  ServerRequestInfo (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~ServerRequestInfo (void);
 private:
   ServerRequestInfo (const ServerRequestInfo &);
-  void operator= (const ServerRequestInfo &);  
+  void operator= (const ServerRequestInfo &);
 
 };
 
@@ -1309,17 +1304,17 @@ class TAO_Export ClientRequestInterceptor_var : public TAO_Base_var
 {
 public:
   ClientRequestInterceptor_var (void); // default constructor
-  ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {} 
+  ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {}
   ClientRequestInterceptor_var (const ClientRequestInterceptor_var &); // copy constructor
   ~ClientRequestInterceptor_var (void); // destructor
-  
+
   ClientRequestInterceptor_var &operator= (ClientRequestInterceptor_ptr);
   ClientRequestInterceptor_var &operator= (const ClientRequestInterceptor_var &);
   ClientRequestInterceptor_ptr operator-> (void) const;
-  
+
   operator const ClientRequestInterceptor_ptr &() const;
   operator ClientRequestInterceptor_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ClientRequestInterceptor_ptr in (void) const;
   ClientRequestInterceptor_ptr &inout (void);
   ClientRequestInterceptor_ptr &out (void);
@@ -1352,7 +1347,7 @@ public:
   operator ClientRequestInterceptor_ptr &();
   ClientRequestInterceptor_ptr &ptr (void);
   ClientRequestInterceptor_ptr operator-> (void);
-  
+
 private:
   ClientRequestInterceptor_ptr &ptr_;
 };
@@ -1376,12 +1371,12 @@ public:
   static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
   static ClientRequestInterceptor_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ClientRequestInterceptor_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ClientRequestInterceptor_ptr _nil (void)
@@ -1393,7 +1388,7 @@ public:
 
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1403,7 +1398,7 @@ public:
 
   virtual void send_poll (
       PortableInterceptor::ClientRequestInfo_ptr ri,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1412,7 +1407,7 @@ public:
 
   virtual void receive_reply (
       PortableInterceptor::ClientRequestInfo_ptr ri,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1421,7 +1416,7 @@ public:
 
   virtual void receive_exception (
       PortableInterceptor::ClientRequestInfo_ptr ri,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1431,7 +1426,7 @@ public:
 
   virtual void receive_other (
       PortableInterceptor::ClientRequestInfo_ptr ri,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1440,24 +1435,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   ClientRequestInterceptor (void);
-  ClientRequestInterceptor (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  ClientRequestInterceptor (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~ClientRequestInterceptor (void);
 private:
   ClientRequestInterceptor (const ClientRequestInterceptor &);
-  void operator= (const ClientRequestInterceptor &);  
+  void operator= (const ClientRequestInterceptor &);
 
 };
 
@@ -1483,17 +1477,17 @@ class TAO_Export ServerRequestInterceptor_var : public TAO_Base_var
 {
 public:
   ServerRequestInterceptor_var (void); // default constructor
-  ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {} 
+  ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {}
   ServerRequestInterceptor_var (const ServerRequestInterceptor_var &); // copy constructor
   ~ServerRequestInterceptor_var (void); // destructor
-  
+
   ServerRequestInterceptor_var &operator= (ServerRequestInterceptor_ptr);
   ServerRequestInterceptor_var &operator= (const ServerRequestInterceptor_var &);
   ServerRequestInterceptor_ptr operator-> (void) const;
-  
+
   operator const ServerRequestInterceptor_ptr &() const;
   operator ServerRequestInterceptor_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ServerRequestInterceptor_ptr in (void) const;
   ServerRequestInterceptor_ptr &inout (void);
   ServerRequestInterceptor_ptr &out (void);
@@ -1526,7 +1520,7 @@ public:
   operator ServerRequestInterceptor_ptr &();
   ServerRequestInterceptor_ptr &ptr (void);
   ServerRequestInterceptor_ptr operator-> (void);
-  
+
 private:
   ServerRequestInterceptor_ptr &ptr_;
 };
@@ -1550,12 +1544,12 @@ public:
   static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj);
   static ServerRequestInterceptor_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServerRequestInterceptor_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServerRequestInterceptor_ptr _nil (void)
@@ -1567,7 +1561,7 @@ public:
 
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1577,7 +1571,7 @@ public:
 
   virtual void receive_request (
       PortableInterceptor::ServerRequestInfo_ptr ri,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1587,7 +1581,7 @@ public:
 
   virtual void send_reply (
       PortableInterceptor::ServerRequestInfo_ptr ri,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1596,7 +1590,7 @@ public:
 
   virtual void send_exception (
       PortableInterceptor::ServerRequestInfo_ptr ri,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1606,7 +1600,7 @@ public:
 
   virtual void send_other (
       PortableInterceptor::ServerRequestInfo_ptr ri,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1615,24 +1609,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   ServerRequestInterceptor (void);
-  ServerRequestInterceptor (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  ServerRequestInterceptor (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~ServerRequestInterceptor (void);
 private:
   ServerRequestInterceptor (const ServerRequestInterceptor &);
-  void operator= (const ServerRequestInterceptor &);  
+  void operator= (const ServerRequestInterceptor &);
 
 };
 
@@ -1658,17 +1651,17 @@ class TAO_Export IORInfo_var : public TAO_Base_var
 {
 public:
   IORInfo_var (void); // default constructor
-  IORInfo_var (IORInfo_ptr p) : ptr_ (p) {} 
+  IORInfo_var (IORInfo_ptr p) : ptr_ (p) {}
   IORInfo_var (const IORInfo_var &); // copy constructor
   ~IORInfo_var (void); // destructor
-  
+
   IORInfo_var &operator= (IORInfo_ptr);
   IORInfo_var &operator= (const IORInfo_var &);
   IORInfo_ptr operator-> (void) const;
-  
+
   operator const IORInfo_ptr &() const;
   operator IORInfo_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   IORInfo_ptr in (void) const;
   IORInfo_ptr &inout (void);
   IORInfo_ptr &out (void);
@@ -1701,7 +1694,7 @@ public:
   operator IORInfo_ptr &();
   IORInfo_ptr &ptr (void);
   IORInfo_ptr operator-> (void);
-  
+
 private:
   IORInfo_ptr &ptr_;
 };
@@ -1725,12 +1718,12 @@ public:
   static IORInfo_ptr _duplicate (IORInfo_ptr obj);
   static IORInfo_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static IORInfo_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static IORInfo_ptr _nil (void)
@@ -1742,7 +1735,7 @@ public:
 
   virtual CORBA::Policy_ptr get_effective_policy (
       CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1751,7 +1744,7 @@ public:
 
   virtual void add_ior_component (
       const IOP::TaggedComponent & component,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1761,7 +1754,7 @@ public:
   virtual void add_ior_component_to_profile (
       const IOP::TaggedComponent & component,
       IOP::ProfileId profile_id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1769,24 +1762,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   IORInfo (void);
-  IORInfo (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  IORInfo (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IORInfo (void);
 private:
   IORInfo (const IORInfo &);
-  void operator= (const IORInfo &);  
+  void operator= (const IORInfo &);
 
 };
 
@@ -1812,17 +1804,17 @@ class TAO_Export IORInterceptor_var : public TAO_Base_var
 {
 public:
   IORInterceptor_var (void); // default constructor
-  IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {} 
+  IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {}
   IORInterceptor_var (const IORInterceptor_var &); // copy constructor
   ~IORInterceptor_var (void); // destructor
-  
+
   IORInterceptor_var &operator= (IORInterceptor_ptr);
   IORInterceptor_var &operator= (const IORInterceptor_var &);
   IORInterceptor_ptr operator-> (void) const;
-  
+
   operator const IORInterceptor_ptr &() const;
   operator IORInterceptor_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   IORInterceptor_ptr in (void) const;
   IORInterceptor_ptr &inout (void);
   IORInterceptor_ptr &out (void);
@@ -1855,7 +1847,7 @@ public:
   operator IORInterceptor_ptr &();
   IORInterceptor_ptr &ptr (void);
   IORInterceptor_ptr operator-> (void);
-  
+
 private:
   IORInterceptor_ptr &ptr_;
 };
@@ -1879,12 +1871,12 @@ public:
   static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
   static IORInterceptor_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static IORInterceptor_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static IORInterceptor_ptr _nil (void)
@@ -1896,7 +1888,7 @@ public:
 
   virtual void establish_components (
       PortableInterceptor::IORInfo_ptr info,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1904,24 +1896,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   IORInterceptor (void);
-  IORInterceptor (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  IORInterceptor (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~IORInterceptor (void);
 private:
   IORInterceptor (const IORInterceptor &);
-  void operator= (const IORInterceptor &);  
+  void operator= (const IORInterceptor &);
 
 };
 
@@ -1947,17 +1938,17 @@ class TAO_Export PolicyFactory_var : public TAO_Base_var
 {
 public:
   PolicyFactory_var (void); // default constructor
-  PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {} 
+  PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {}
   PolicyFactory_var (const PolicyFactory_var &); // copy constructor
   ~PolicyFactory_var (void); // destructor
-  
+
   PolicyFactory_var &operator= (PolicyFactory_ptr);
   PolicyFactory_var &operator= (const PolicyFactory_var &);
   PolicyFactory_ptr operator-> (void) const;
-  
+
   operator const PolicyFactory_ptr &() const;
   operator PolicyFactory_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   PolicyFactory_ptr in (void) const;
   PolicyFactory_ptr &inout (void);
   PolicyFactory_ptr &out (void);
@@ -1990,7 +1981,7 @@ public:
   operator PolicyFactory_ptr &();
   PolicyFactory_ptr &ptr (void);
   PolicyFactory_ptr operator-> (void);
-  
+
 private:
   PolicyFactory_ptr &ptr_;
 };
@@ -2014,12 +2005,12 @@ public:
   static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
   static PolicyFactory_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static PolicyFactory_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static PolicyFactory_ptr _nil (void)
@@ -2032,7 +2023,7 @@ public:
   virtual CORBA::Policy_ptr create_policy (
       CORBA::PolicyType type,
       const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2041,24 +2032,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   PolicyFactory (void);
-  PolicyFactory (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  PolicyFactory (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~PolicyFactory (void);
 private:
   PolicyFactory (const PolicyFactory &);
-  void operator= (const PolicyFactory &);  
+  void operator= (const PolicyFactory &);
 
 };
 
@@ -2084,17 +2074,17 @@ class TAO_Export ORBInitInfo_var : public TAO_Base_var
 {
 public:
   ORBInitInfo_var (void); // default constructor
-  ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {} 
+  ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {}
   ORBInitInfo_var (const ORBInitInfo_var &); // copy constructor
   ~ORBInitInfo_var (void); // destructor
-  
+
   ORBInitInfo_var &operator= (ORBInitInfo_ptr);
   ORBInitInfo_var &operator= (const ORBInitInfo_var &);
   ORBInitInfo_ptr operator-> (void) const;
-  
+
   operator const ORBInitInfo_ptr &() const;
   operator ORBInitInfo_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ORBInitInfo_ptr in (void) const;
   ORBInitInfo_ptr &inout (void);
   ORBInitInfo_ptr &out (void);
@@ -2127,7 +2117,7 @@ public:
   operator ORBInitInfo_ptr &();
   ORBInitInfo_ptr &ptr (void);
   ORBInitInfo_ptr operator-> (void);
-  
+
 private:
   ORBInitInfo_ptr &ptr_;
 };
@@ -2151,12 +2141,12 @@ public:
   static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
   static ORBInitInfo_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ORBInitInfo_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ORBInitInfo_ptr _nil (void)
@@ -2219,7 +2209,7 @@ public:
   class TAO_Export InvalidName : public CORBA::UserException
   {
   public:
-    
+
     InvalidName (void); // default ctor
     InvalidName (const InvalidName &); // copy ctor
     ~InvalidName (void);
@@ -2250,7 +2240,7 @@ public:
 #endif /* end #if !defined */
 
   virtual PortableInterceptor::StringSeq * arguments (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2258,7 +2248,7 @@ public:
     ));
 
   virtual char * orb_id (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2268,7 +2258,7 @@ public:
   virtual void register_initial_reference (
       const char * id,
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2278,7 +2268,7 @@ public:
 
   virtual void resolve_initial_references (
       const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2288,7 +2278,7 @@ public:
 
   virtual void add_client_request_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2298,7 +2288,7 @@ public:
 
   virtual void add_server_request_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2308,7 +2298,7 @@ public:
 
   virtual void add_ior_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2317,7 +2307,7 @@ public:
     ));
 
   virtual PortableInterceptor::SlotId allocate_slot_id (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2327,7 +2317,7 @@ public:
   virtual void register_policy_factory (
       CORBA::PolicyType type,
       PortableInterceptor::PolicyFactory_ptr policy_factory,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2335,24 +2325,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   ORBInitInfo (void);
-  ORBInitInfo (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  ORBInitInfo (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~ORBInitInfo (void);
 private:
   ORBInitInfo (const ORBInitInfo &);
-  void operator= (const ORBInitInfo &);  
+  void operator= (const ORBInitInfo &);
 
 };
 
@@ -2378,17 +2367,17 @@ class TAO_Export ORBInitializer_var : public TAO_Base_var
 {
 public:
   ORBInitializer_var (void); // default constructor
-  ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {} 
+  ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {}
   ORBInitializer_var (const ORBInitializer_var &); // copy constructor
   ~ORBInitializer_var (void); // destructor
-  
+
   ORBInitializer_var &operator= (ORBInitializer_ptr);
   ORBInitializer_var &operator= (const ORBInitializer_var &);
   ORBInitializer_ptr operator-> (void) const;
-  
+
   operator const ORBInitializer_ptr &() const;
   operator ORBInitializer_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ORBInitializer_ptr in (void) const;
   ORBInitializer_ptr &inout (void);
   ORBInitializer_ptr &out (void);
@@ -2421,7 +2410,7 @@ public:
   operator ORBInitializer_ptr &();
   ORBInitializer_ptr &ptr (void);
   ORBInitializer_ptr operator-> (void);
-  
+
 private:
   ORBInitializer_ptr &ptr_;
 };
@@ -2445,12 +2434,12 @@ public:
   static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj);
   static ORBInitializer_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ORBInitializer_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ORBInitializer_ptr _nil (void)
@@ -2462,7 +2451,7 @@ public:
 
   virtual void pre_init (
       PortableInterceptor::ORBInitInfo_ptr info,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2471,7 +2460,7 @@ public:
 
   virtual void post_init (
       PortableInterceptor::ORBInitInfo_ptr info,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2479,24 +2468,23 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &ACE_TRY_ENV = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   ORBInitializer (void);
-  ORBInitializer (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  ORBInitializer (TAO_Stub *objref,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~ORBInitializer (void);
 private:
   ORBInitializer (const ORBInitializer &);
-  void operator= (const ORBInitializer &);  
+  void operator= (const ORBInitializer &);
 
 };
 
diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i
index b8cbf31b611..cfaabc84271 100644
--- a/TAO/tao/PortableInterceptorC.i
+++ b/TAO/tao/PortableInterceptorC.i
@@ -90,20 +90,20 @@ PortableInterceptor::OctetSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::OctetSeq_var::operator const ::PortableInterceptor::OctetSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::OctetSeq_var::operator ::PortableInterceptor::OctetSeq &() // cast 
+ACE_INLINE
+PortableInterceptor::OctetSeq_var::operator ::PortableInterceptor::OctetSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::OctetSeq_var::operator ::PortableInterceptor::OctetSeq &() const // cast 
+ACE_INLINE
+PortableInterceptor::OctetSeq_var::operator ::PortableInterceptor::OctetSeq &() const // cast
 {
   return *this->ptr_;
 }
@@ -126,7 +126,7 @@ PortableInterceptor::OctetSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::PortableInterceptor::OctetSeq *&
 PortableInterceptor::OctetSeq_var::out (void)
 {
@@ -187,7 +187,7 @@ PortableInterceptor::OctetSeq_out::operator= (OctetSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::OctetSeq_out::operator ::PortableInterceptor::OctetSeq *&() // cast
 {
   return this->ptr_;
@@ -278,32 +278,32 @@ PortableInterceptor::StringSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::StringSeq_var::operator const ::PortableInterceptor::StringSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::StringSeq_var::operator ::PortableInterceptor::StringSeq &() // cast 
+ACE_INLINE
+PortableInterceptor::StringSeq_var::operator ::PortableInterceptor::StringSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::StringSeq_var::operator ::PortableInterceptor::StringSeq &() const // cast 
+ACE_INLINE
+PortableInterceptor::StringSeq_var::operator ::PortableInterceptor::StringSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-PortableInterceptor::StringSeq_var::operator ::PortableInterceptor::StringSeq *&() // cast 
+PortableInterceptor::StringSeq_var::operator ::PortableInterceptor::StringSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager 
+ACE_INLINE TAO_SeqElem_String_Manager
 PortableInterceptor::StringSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -321,7 +321,7 @@ PortableInterceptor::StringSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::PortableInterceptor::StringSeq *&
 PortableInterceptor::StringSeq_var::out (void)
 {
@@ -382,7 +382,7 @@ PortableInterceptor::StringSeq_out::operator= (StringSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::StringSeq_out::operator ::PortableInterceptor::StringSeq *&() // cast
 {
   return this->ptr_;
@@ -400,7 +400,7 @@ PortableInterceptor::StringSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_SeqElem_String_Manager 
+ACE_INLINE TAO_SeqElem_String_Manager
 PortableInterceptor::StringSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -414,8 +414,8 @@ PortableInterceptor::StringSeq_out::operator[] (CORBA::ULong index)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___CI_
 
 ACE_INLINE
-PortableInterceptor::Interceptor::Interceptor (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::Interceptor::Interceptor (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -470,14 +470,14 @@ PortableInterceptor::Interceptor_var::operator= (const ::PortableInterceptor::In
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Interceptor_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -569,7 +569,7 @@ PortableInterceptor::Interceptor_out::operator= (Interceptor_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::Interceptor_out::operator ::PortableInterceptor::Interceptor_ptr &() // cast
 {
   return this->ptr_;
@@ -603,8 +603,8 @@ PortableInterceptor::Interceptor_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_CURRENT___CI_
 
 ACE_INLINE
-PortableInterceptor::Current::Current (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::Current::Current (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -659,14 +659,14 @@ PortableInterceptor::Current_var::operator= (const ::PortableInterceptor::Curren
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -758,7 +758,7 @@ PortableInterceptor::Current_out::operator= (Current_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::Current_out::operator ::PortableInterceptor::Current_ptr &() // cast
 {
   return this->ptr_;
@@ -784,8 +784,8 @@ PortableInterceptor::Current_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___CI_
 
 ACE_INLINE
-PortableInterceptor::RequestInfo::RequestInfo (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::RequestInfo::RequestInfo (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -840,14 +840,14 @@ PortableInterceptor::RequestInfo_var::operator= (const ::PortableInterceptor::Re
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::RequestInfo_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -939,7 +939,7 @@ PortableInterceptor::RequestInfo_out::operator= (RequestInfo_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::RequestInfo_out::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
 {
   return this->ptr_;
@@ -965,8 +965,8 @@ PortableInterceptor::RequestInfo_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_
 
 ACE_INLINE
-PortableInterceptor::ClientRequestInfo::ClientRequestInfo (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::ClientRequestInfo::ClientRequestInfo (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -1021,14 +1021,14 @@ PortableInterceptor::ClientRequestInfo_var::operator= (const ::PortableIntercept
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor::ClientRequestInfo_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1120,7 +1120,7 @@ PortableInterceptor::ClientRequestInfo_out::operator= (ClientRequestInfo_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ClientRequestInfo_out::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
 {
   return this->ptr_;
@@ -1146,8 +1146,8 @@ PortableInterceptor::ClientRequestInfo_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_
 
 ACE_INLINE
-PortableInterceptor::ServerRequestInfo::ServerRequestInfo (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::ServerRequestInfo::ServerRequestInfo (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -1202,14 +1202,14 @@ PortableInterceptor::ServerRequestInfo_var::operator= (const ::PortableIntercept
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor::ServerRequestInfo_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1301,7 +1301,7 @@ PortableInterceptor::ServerRequestInfo_out::operator= (ServerRequestInfo_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ServerRequestInfo_out::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
 {
   return this->ptr_;
@@ -1327,8 +1327,8 @@ PortableInterceptor::ServerRequestInfo_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_
 
 ACE_INLINE
-PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -1383,14 +1383,14 @@ PortableInterceptor::ClientRequestInterceptor_var::operator= (const ::PortableIn
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInterceptor::ClientRequestInterceptor_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1482,7 +1482,7 @@ PortableInterceptor::ClientRequestInterceptor_out::operator= (ClientRequestInter
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ClientRequestInterceptor_out::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
 {
   return this->ptr_;
@@ -1508,8 +1508,8 @@ PortableInterceptor::ClientRequestInterceptor_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_
 
 ACE_INLINE
-PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -1564,14 +1564,14 @@ PortableInterceptor::ServerRequestInterceptor_var::operator= (const ::PortableIn
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInterceptor::ServerRequestInterceptor_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1663,7 +1663,7 @@ PortableInterceptor::ServerRequestInterceptor_out::operator= (ServerRequestInter
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ServerRequestInterceptor_out::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
 {
   return this->ptr_;
@@ -1689,8 +1689,8 @@ PortableInterceptor::ServerRequestInterceptor_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_IORINFO___CI_
 
 ACE_INLINE
-PortableInterceptor::IORInfo::IORInfo (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::IORInfo::IORInfo (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -1745,14 +1745,14 @@ PortableInterceptor::IORInfo_var::operator= (const ::PortableInterceptor::IORInf
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1844,7 +1844,7 @@ PortableInterceptor::IORInfo_out::operator= (IORInfo_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::IORInfo_out::operator ::PortableInterceptor::IORInfo_ptr &() // cast
 {
   return this->ptr_;
@@ -1870,8 +1870,8 @@ PortableInterceptor::IORInfo_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_
 
 ACE_INLINE
-PortableInterceptor::IORInterceptor::IORInterceptor (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::IORInterceptor::IORInterceptor (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -1926,14 +1926,14 @@ PortableInterceptor::IORInterceptor_var::operator= (const ::PortableInterceptor:
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::IORInterceptor_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2025,7 +2025,7 @@ PortableInterceptor::IORInterceptor_out::operator= (IORInterceptor_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::IORInterceptor_out::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
 {
   return this->ptr_;
@@ -2051,8 +2051,8 @@ PortableInterceptor::IORInterceptor_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___CI_
 
 ACE_INLINE
-PortableInterceptor::PolicyFactory::PolicyFactory (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::PolicyFactory::PolicyFactory (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -2107,14 +2107,14 @@ PortableInterceptor::PolicyFactory_var::operator= (const ::PortableInterceptor::
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::PolicyFactory_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2206,7 +2206,7 @@ PortableInterceptor::PolicyFactory_out::operator= (PolicyFactory_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::PolicyFactory_out::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
 {
   return this->ptr_;
@@ -2240,8 +2240,8 @@ PortableInterceptor::PolicyFactory_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___CI_
 
 ACE_INLINE
-PortableInterceptor::ORBInitInfo::ORBInitInfo (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::ORBInitInfo::ORBInitInfo (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -2296,14 +2296,14 @@ PortableInterceptor::ORBInitInfo_var::operator= (const ::PortableInterceptor::OR
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBInitInfo_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2395,7 +2395,7 @@ PortableInterceptor::ORBInitInfo_out::operator= (ORBInitInfo_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ORBInitInfo_out::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
 {
   return this->ptr_;
@@ -2421,8 +2421,8 @@ PortableInterceptor::ORBInitInfo_out::operator-> (void)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_
 
 ACE_INLINE
-PortableInterceptor::ORBInitializer::ORBInitializer (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+PortableInterceptor::ORBInitializer::ORBInitializer (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 #endif /* end #if !defined */
@@ -2477,14 +2477,14 @@ PortableInterceptor::ORBInitializer_var::operator= (const ::PortableInterceptor:
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::ORBInitializer_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast 
+ACE_INLINE
+PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2576,7 +2576,7 @@ PortableInterceptor::ORBInitializer_out::operator= (ORBInitializer_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableInterceptor::ORBInitializer_out::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
 {
   return this->ptr_;
diff --git a/TAO/tao/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 97c91795476..1a2143b1a30 100644
--- a/TAO/tao/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -1,8 +1,9 @@
 // $Id$
-#include "tao/Active_Object_Map.h"
+
+#include "Active_Object_Map.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Active_Object_Map.i"
+# include "Active_Object_Map.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Auto_Ptr.h"
diff --git a/TAO/tao/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index 2ca0bc87dfe..1e0a2fa4c91 100644
--- a/TAO/tao/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -18,9 +18,9 @@
 #define TAO_ACTIVE_OBJECT_MAP_H
 #include "ace/pre.h"
 
-#include "tao/Key_Adapters.h"
+#include "Key_Adapters.h"
+#include "Servant_Base.h"
 #include "tao/Server_Strategy_Factory.h"
-#include "tao/Servant_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,7 +32,7 @@ class TAO_Lifespan_Strategy;
 class TAO_Id_Assignment_Strategy;
 class TAO_Id_Hint_Strategy;
 
-class TAO_Export TAO_Active_Object_Map
+class TAO_PortableServer_Export TAO_Active_Object_Map
 {
   // = TITLE
   //     Map of object ids to servants.
@@ -609,7 +609,7 @@ public:
 };
 
 #if defined (__ACE_INLINE__)
-# include "tao/Active_Object_Map.i"
+# include "Active_Object_Map.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/TAO/tao/Active_Object_Map.i b/TAO/tao/PortableServer/Active_Object_Map.i
index b0275d474ee..b0275d474ee 100644
--- a/TAO/tao/Active_Object_Map.i
+++ b/TAO/tao/PortableServer/Active_Object_Map.i
diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp
new file mode 100644
index 00000000000..4e99c390aec
--- /dev/null
+++ b/TAO/tao/PortableServer/Collocated_Object.cpp
@@ -0,0 +1,167 @@
+// $Id$
+//
+
+#include "Collocated_Object.h"
+#include "Object_Adapter.h"
+
+#include "tao/ORB_Core.h"
+#include "tao/Stub.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Collocated_Object.i"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID(tao, Object, "$Id")
+
+TAO_Collocated_Object::~TAO_Collocated_Object (void)
+{
+}
+
+TAO_ServantBase *
+TAO_Collocated_Object::_servant (void) const
+{
+  return this->servant_;
+}
+
+TAO_Collocated_Object *
+TAO_Collocated_Object::_narrow (CORBA::Object_ptr object,
+                                CORBA::Environment &)
+{
+  if (object == 0)
+    return 0;
+
+  ptr_arith_t type =
+    ACE_reinterpret_cast(ptr_arith_t,TAO_Collocated_Object::_narrow);
+  void *downcast =
+    object->_tao_QueryInterface (type);
+
+  return ACE_static_cast(TAO_Collocated_Object*,downcast);
+}
+
+CORBA::Boolean
+TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id,
+                              CORBA_Environment &ACE_TRY_ENV)
+{
+  // If the object is collocated then try locally....
+  if (!this->_is_collocated ())
+    return this->CORBA_Object::_is_a (logical_type_id, ACE_TRY_ENV);
+
+  TAO_Stub *stub = this->_stubobj ();
+  // Which collocation strategy should we use?
+  if (stub != 0 &&
+      stub->servant_orb_var ()->orb_core ()
+      ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
+    {
+      TAO_Object_Adapter::Servant_Upcall servant_upcall (
+          stub->servant_orb_var ()->orb_core ()
+        );
+      servant_upcall.prepare_for_upcall (this->_object_key (),
+                                         "_is_a",
+                                         ACE_TRY_ENV);
+      ACE_CHECK_RETURN (0);
+      return servant_upcall.servant ()->_is_a (logical_type_id, ACE_TRY_ENV);
+    }
+
+  // Direct collocation strategy is used.
+  if (this->servant_ != 0)
+    return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV);
+
+  // @@ Maybe we want to change this exception...
+  ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
+}
+
+CORBA::Boolean
+TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj,
+                                       CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC (())
+{
+  CORBA::Boolean equivalent =
+    this->CORBA_Object::_is_equivalent (other_obj, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  if (equivalent)
+    return 1;
+
+  ptr_arith_t type =
+    ACE_reinterpret_cast(ptr_arith_t,TAO_Collocated_Object::_narrow);
+  void *down =
+    other_obj->_tao_QueryInterface (type);
+
+  if (down == 0)
+    return 0;
+
+  TAO_Collocated_Object *rhs =
+    ACE_static_cast(TAO_Collocated_Object*,down);
+
+  return this->servant_ == rhs->servant_;
+}
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+CORBA::Boolean
+TAO_Collocated_Object::_non_existent (CORBA_Environment &ACE_TRY_ENV)
+{
+  CORBA::Boolean _tao_retval = 0;
+
+  ACE_TRY
+    {
+      // If the object is collocated then try locally....
+      if (!this->_is_collocated ())
+        return this->CORBA_Object::_non_existent (ACE_TRY_ENV);
+
+      TAO_Stub *stub = this->_stubobj ();
+
+      // Which collocation strategy should we use?
+      if (stub != 0 &&
+          stub->servant_orb_var ()->orb_core ()
+          ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
+        {
+          TAO_Object_Adapter::Servant_Upcall servant_upcall (
+              stub->servant_orb_var ()->orb_core ()
+            );
+          servant_upcall.prepare_for_upcall (this->_object_key (),
+                                             "_non_existent",
+                                             ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          return servant_upcall.servant ()->_non_existent (ACE_TRY_ENV);
+        }
+
+      // Direct collocation strategy is used.
+      if (this->servant_ != 0)
+        return this->servant_->_non_existent (ACE_TRY_ENV);
+
+      // @@ Maybe we want to change this exception...
+      ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
+    }
+  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+    {
+      _tao_retval = 1;
+    }
+  ACE_CATCHANY
+    {
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+  return _tao_retval;
+}
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+void*
+TAO_Collocated_Object::_tao_QueryInterface (ptr_arith_t query_type)
+{
+  ptr_arith_t type =
+    ACE_reinterpret_cast(ptr_arith_t,TAO_Collocated_Object::_narrow);
+
+  if (query_type == type)
+    {
+      this->_add_ref ();
+      return this;
+    }
+
+  return this->CORBA_Object::_tao_QueryInterface (query_type);
+}
+
+#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/Collocated_Object.h b/TAO/tao/PortableServer/Collocated_Object.h
new file mode 100644
index 00000000000..e99a114d0eb
--- /dev/null
+++ b/TAO/tao/PortableServer/Collocated_Object.h
@@ -0,0 +1,76 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO
+//
+// = FILENAME
+//    Collocated_Object.h
+//
+// = DESCRIPTION
+//
+// ============================================================================
+
+#ifndef TAO_COLLOCATED_OBJECT_H
+#define TAO_COLLOCATED_OBJECT_H
+#include "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "tao/Object.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class TAO_ServantBase;
+
+class TAO_PortableServer_Export TAO_Collocated_Object : public virtual CORBA_Object
+{
+public:
+  TAO_Collocated_Object (TAO_Stub *p = 0,
+                         CORBA::Boolean collocated = 0,
+                         TAO_ServantBase *servant = 0);
+  // constructor
+
+  virtual ~TAO_Collocated_Object (void);
+  // destructor
+
+  virtual TAO_ServantBase *_servant (void) const;
+  // return the associated servant (if one exists)
+
+  static TAO_Collocated_Object *_narrow (CORBA::Object_ptr object,
+                                         CORBA_Environment &ACE_TRY_ENV =
+                                             TAO_default_environment ());
+  // Downcast operation
+
+  // = The CORBA_Object methods, check the tao/Object.h file for details
+  virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id,
+                                CORBA_Environment &ACE_TRY_ENV =
+                                  TAO_default_environment ());
+  virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj,
+                                         CORBA::Environment &)
+    ACE_THROW_SPEC (());
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV =
+                                          TAO_default_environment ());
+#endif /* TAO_HAS_MINIMUM_CORBA */
+  virtual void *_tao_QueryInterface(ptr_arith_t type);
+
+private:
+  // = Unimplemented methods
+  TAO_Collocated_Object (const TAO_Collocated_Object &);
+  TAO_Collocated_Object &operator = (const TAO_Collocated_Object &);
+
+private:
+  TAO_ServantBase *servant_;
+  // Servant pointer.  It is 0 except for collocated objects.
+};
+
+#if defined (__ACE_INLINE__)
+# include "Collocated_Object.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_COLLOCATED_OBJECT_H */
diff --git a/TAO/tao/PortableServer/Collocated_Object.i b/TAO/tao/PortableServer/Collocated_Object.i
new file mode 100644
index 00000000000..ac5a007d683
--- /dev/null
+++ b/TAO/tao/PortableServer/Collocated_Object.i
@@ -0,0 +1,10 @@
+// $Id$
+
+ACE_INLINE
+TAO_Collocated_Object::TAO_Collocated_Object (TAO_Stub *p,
+                                              CORBA::Boolean collocated,
+                                              TAO_ServantBase *servant)
+  :  CORBA_Object (p, collocated)
+  ,  servant_ (servant)
+{
+}
diff --git a/TAO/tao/PortableServer/DomainS.cpp b/TAO/tao/PortableServer/DomainS.cpp
new file mode 100644
index 00000000000..ccff7d1ac8c
--- /dev/null
+++ b/TAO/tao/PortableServer/DomainS.cpp
@@ -0,0 +1,1069 @@
+/* -*- C++ -*- $Id$ */
+
+// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
+// TAO and the TAO IDL Compiler have been developed by the Center for
+// Distributed Object Computing at Washington University, St. Louis.
+//
+// Information about TAO is available at:
+//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "DomainS.h"
+#include "Object_Adapter.h"
+#include "Operation_Table.h"
+
+#include "tao/ORB_Core.h"
+#include "tao/Server_Request.h"
+#include "tao/Stub.h"
+
+#if !defined (__ACE_INLINE__)
+#include "DomainS.i"
+#endif /* !defined INLINE */
+
+class TAO_CORBA_DomainManager_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+{
+private:
+  unsigned int hash (const char *str, unsigned int len);
+public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+};
+/* starting time is 18:29:02 */
+/* C++ code produced by gperf version 2.8 (ACE version) */
+/* Command-line: /export/kelvar/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 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)
+{
+  static const unsigned char asso_values[] =
+    {
+#if defined (ACE_MVS)
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18,  0,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18,  0,
+     18, 18, 18, 18, 18,  0, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18,  0, 18, 18, 18, 18,  0, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18,
+#else
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18,  0, 18,  0, 18, 18,
+     18, 18, 18,  0, 18, 18, 18, 18, 18, 18,
+     18, 18, 18, 18, 18, 18,  0, 18, 18, 18,
+     18,  0, 18, 18, 18, 18, 18, 18,
+#endif /* ACE_MVS */
+    };
+  return len + asso_values[str[len - 1]] + asso_values[str[0]];
+}
+
+const class TAO_operation_db_entry *
+TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 3,
+      MIN_WORD_LENGTH = 5,
+      MAX_WORD_LENGTH = 17,
+      MIN_HASH_VALUE = 5,
+      MAX_HASH_VALUE = 17,
+      HASH_VALUE_RANGE = 13,
+      DUPLICATES = 0
+    };
+
+  static const class TAO_operation_db_entry  wordlist[] =
+    {
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_is_a",  &POA_CORBA_DomainManager::_is_a_skel},
+      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_non_existent",  &POA_CORBA_DomainManager::_non_existent_skel},
+      {"",0},{"",0},{"",0},
+      {"get_domain_policy",     &POA_CORBA_DomainManager::get_domain_policy_skel},
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      unsigned int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
+        {
+          const char *s = wordlist[key].opname_;
+
+          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
+/* ending time is 18:29:02 */
+static TAO_CORBA_DomainManager_Perfect_Hash_OpTable tao_CORBA_DomainManager_optable;
+
+CORBA::DomainManager_ptr _TAO_collocation_POA_CORBA_DomainManager_Stub_Factory (
+    CORBA::Object_ptr obj
+  )
+{
+  TAO_Stub *stub = obj->_stubobj ();
+
+  switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
+    {
+    case TAO_ORB_Core::THRU_POA:
+      {
+      CORBA::DomainManager_ptr retval = 0;
+      ACE_NEW_RETURN (
+          retval,
+          POA_CORBA__tao_thru_poa_collocated_DomainManager (stub),
+          0
+        );
+      return retval;
+      }
+    case TAO_ORB_Core::DIRECT:
+      if (obj->_is_local () != 0)
+        {
+          TAO_Collocated_Object *local_object =
+            TAO_Collocated_Object::_narrow (obj);
+
+          POA_CORBA_DomainManager *servant = ACE_reinterpret_cast (POA_CORBA_DomainManager*, local_object->_servant ()->_downcast ("IDL:CORBA/DomainManager:1.0"));
+          if (servant != 0)
+            {
+              CORBA::DomainManager *retval = 0;
+              ACE_NEW_RETURN (
+                  retval,
+                  POA_CORBA__tao_direct_collocated_DomainManager (servant, stub),
+                  0
+                );
+              return retval;
+            }
+        }
+      break;
+    default:
+      break;
+    }
+  return 0;
+}
+
+int _TAO_collocation_POA_CORBA_DomainManager_Stub_Factory_Initializer (long dummy)
+{
+  ACE_UNUSED_ARG (dummy);
+
+  _TAO_collocation_CORBA_DomainManager_Stub_Factory_function_pointer =
+    _TAO_collocation_POA_CORBA_DomainManager_Stub_Factory;
+
+  return 0;
+}
+
+static int _TAO_collocation_POA_CORBA_DomainManager_Stub_Factory_Initializer_Scarecrow =
+  _TAO_collocation_POA_CORBA_DomainManager_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_CORBA_DomainManager_Stub_Factory_Initializer));
+
+// skeleton constructor
+POA_CORBA_DomainManager::POA_CORBA_DomainManager (void)
+{
+  this->optable_ = &tao_CORBA_DomainManager_optable;
+}
+
+// copy ctor
+POA_CORBA_DomainManager::POA_CORBA_DomainManager (const POA_CORBA_DomainManager& rhs)
+  :   TAO_ServantBase (rhs)
+{}
+
+// skeleton destructor
+POA_CORBA_DomainManager::~POA_CORBA_DomainManager (void)
+{
+}
+
+void POA_CORBA_DomainManager::get_domain_policy_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void *_tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+)
+{
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *)_tao_object_reference;
+
+  CORBA::Policy_var _tao_retval;
+  CORBA::PolicyType policy_type;
+  if (!(
+    (_tao_in >> policy_type)
+  ))
+    ACE_THROW (CORBA::MARSHAL());
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ServerRequestInterceptor_Adapter
+    _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV));
+  ACE_CHECK;
+  // @@ CORBA::Object_var _tao_objref;
+    POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy  ri ("get_domain_policy",
+_tao_server_request.service_info ()    ,  policy_type    ,
+    ACE_TRY_ENV);
+if (_tao_vfr.valid ())
+    {
+      // @@ _tao_objref = _tao_server_request.objref (ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+
+  ACE_TRY
+    {
+      ri.request_id (_tao_server_request.request_id ());
+      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+    TAO_INTERCEPTOR_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+    _tao_retval = _tao_impl->get_domain_policy (
+      policy_type,
+      ACE_TRY_ENV
+    );
+
+    CORBA::Policy_ptr  _tao_retval_info = _tao_retval._retn ();
+    #if (TAO_HAS_INTERCEPTORS == 1)
+
+     ri.result (_tao_retval_info);
+    _tao_retval = _tao_retval_info;
+    #endif /* TAO_HAS_INTERCEPTORS */
+
+TAO_INTERCEPTOR_CHECK;
+
+
+    #if (TAO_HAS_INTERCEPTORS == 1)
+
+   _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+  TAO_INTERCEPTOR_CHECK;
+}
+ACE_CATCHANY
+  {
+    ri.exception (&ACE_ANY_EXCEPTION);
+    _tao_vfr.send_exception (&ri,
+        ACE_TRY_ENV
+      );
+    ACE_RE_THROW;
+  }
+ACE_ENDTRY;
+ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+_tao_server_request.init_reply (ACE_TRY_ENV);
+ACE_CHECK;
+TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+if (!(
+  (_tao_out << _tao_retval.in ())
+))
+  ACE_THROW (CORBA::MARSHAL());
+
+}
+
+void POA_CORBA_DomainManager::_is_a_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference;
+  CORBA::Boolean _tao_retval = 0;
+  CORBA::String_var value;
+  if (!(_tao_in >> value.out ()))
+    ACE_THROW (CORBA::MARSHAL ());
+
+  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  ACE_CHECK;
+
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
+void POA_CORBA_DomainManager::_non_existent_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference;
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
+CORBA::Boolean POA_CORBA_DomainManager::_is_a (
+    const char* value,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  if (
+    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/DomainManager:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      return 1;
+    else
+      return 0;
+}
+
+void* POA_CORBA_DomainManager::_downcast (
+    const char* logical_type_id
+  )
+{
+if (ACE_OS::strcmp (logical_type_id, "IDL:CORBA/DomainManager:1.0") == 0)
+    return ACE_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 0;
+}
+
+void POA_CORBA_DomainManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+{
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+}
+
+const char* POA_CORBA_DomainManager::_interface_repository_id (void) const
+{
+  return "IDL:CORBA/DomainManager:1.0";
+}
+
+CORBA::DomainManager*
+POA_CORBA_DomainManager::_this (CORBA_Environment &ACE_TRY_ENV)
+{
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
+    switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
+      {
+      case TAO_ORB_Core::THRU_POA:
+        {
+          ::CORBA::DomainManager_ptr retval = 0;
+          ACE_NEW_RETURN (
+              retval,
+              POA_CORBA__tao_thru_poa_collocated_DomainManager (stub),
+              0
+            );
+          return retval;
+        }
+      case TAO_ORB_Core::DIRECT:
+        {
+          ::CORBA::DomainManager_ptr retval = 0;
+          ACE_NEW_RETURN (
+              retval,
+              POA_CORBA__tao_direct_collocated_DomainManager (this, stub),
+              0
+            );
+          return retval;
+        }
+      default:
+        ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      }
+  else
+    {
+      // stub->_incr_refcnt ();
+      CORBA::Object_ptr tmp = CORBA::Object::_nil ();
+      ACE_NEW_RETURN (tmp, CORBA::Object (stub), 0);
+      CORBA::Object_var obj = tmp;
+      return ::CORBA::DomainManager::_unchecked_narrow (obj.in ());
+    }
+}
+
+POA_CORBA__tao_thru_poa_collocated_DomainManager::POA_CORBA__tao_thru_poa_collocated_DomainManager (
+  TAO_Stub *stub
+)
+  :  CORBA_Object (stub, 1)
+{
+}
+
+CORBA::Boolean POA_CORBA__tao_thru_poa_collocated_DomainManager::_is_a(
+    const CORBA::Char *logical_type_id,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "_is_a",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN (0);
+  return ACE_reinterpret_cast (
+      POA_CORBA_DomainManager_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:CORBA/DomainManager:1.0"
+        )
+    )->_is_a (logical_type_id, ACE_TRY_ENV);
+}
+
+
+CORBA::Boolean POA_CORBA__tao_thru_poa_collocated_DomainManager::_non_existent(
+    CORBA_Environment &ACE_TRY_ENV
+  )
+
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "_non_existent",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN (0);
+  return ACE_reinterpret_cast (
+      POA_CORBA_DomainManager_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:CORBA/DomainManager:1.0"
+        )
+    )->_non_existent (ACE_TRY_ENV);
+}
+
+
+CORBA::Policy_ptr POA_CORBA__tao_thru_poa_collocated_DomainManager::get_domain_policy  (
+    CORBA::PolicyType policy_type,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::Policy_var _tao_retval;
+  ACE_UNUSED_ARG (_tao_retval);
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "get_domain_policy",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN (0);
+  return ACE_reinterpret_cast (
+      POA_CORBA_DomainManager_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:CORBA/DomainManager:1.0"
+        )
+    )->get_domain_policy (
+      policy_type,
+      ACE_TRY_ENV
+    );
+
+}
+
+POA_CORBA__tao_direct_collocated_DomainManager::POA_CORBA__tao_direct_collocated_DomainManager (
+    POA_CORBA_DomainManager_ptr  servant,
+    TAO_Stub *stub
+  )
+  : CORBA_DomainManager (stub, 1),
+    TAO_Collocated_Object (stub, 1, servant),
+    CORBA_Object (stub, 1),
+    servant_ (servant)
+{
+}
+
+CORBA::Boolean POA_CORBA__tao_direct_collocated_DomainManager::_is_a(
+    const CORBA::Char *logical_type_id,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+
+{
+  return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV);
+}
+
+void *
+POA_CORBA__tao_direct_collocated_DomainManager::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *value =
+    this->TAO_Collocated_Object::_tao_QueryInterface (type);
+  if (value != 0)
+    return value;
+  return this->CORBA_DomainManager::_tao_QueryInterface (type);
+}
+
+POA_CORBA_DomainManager_ptr POA_CORBA__tao_direct_collocated_DomainManager::_get_servant (void) const
+{
+  return this->servant_;
+}
+
+CORBA::Boolean POA_CORBA__tao_direct_collocated_DomainManager::_non_existent(
+    CORBA_Environment &ACE_TRY_ENV
+  )
+
+{
+  return this->servant_->_non_existent (ACE_TRY_ENV);
+}
+
+
+CORBA::Policy_ptr POA_CORBA__tao_direct_collocated_DomainManager::get_domain_policy  (
+    CORBA::PolicyType policy_type,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  return this->servant_->get_domain_policy (
+      policy_type,
+      ACE_TRY_ENV
+    );
+
+}
+
+
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy (const char *_tao_operation,
+IOP::ServiceContextList &_tao_service_context_list,CORBA::PolicyType policy_type,
+CORBA::Environment &)
+  : TAO_ServerRequest_Info (_tao_operation, _tao_service_context_list),policy_type_ (policy_type)
+{}
+
+Dynamic::ParameterList *
+POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::arguments (CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+   // Generate the arg list on demand
+  CORBA::ULong length = 0;
+        length = this->parameter_list_.length ();
+      this->parameter_list_.length (length + 1);
+      this->parameter_list_[length].argument <<=  this->policy_type_;
+
+    this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+
+    return &this->parameter_list_;
+}
+
+  Dynamic::ExceptionList *
+  POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::exceptions (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+ // Generate the exception list on demand
+  return 0;
+}
+
+
+  CORBA::Any *
+POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::result (CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+ // Generate the result on demand
+
+return &this->result_val_;
+}
+
+void
+POA_CORBA_DomainManager::TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy::result (CORBA::Policy_ptr  result)
+  {
+  // update the result
+   this->result_ = result;
+  }
+
+#endif /* TAO_HAS_INTERCEPTORS */
+class TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+{
+private:
+  unsigned int hash (const char *str, unsigned int len);
+public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+};
+/* starting time is 18:29:02 */
+/* C++ code produced by gperf version 2.8 (ACE version) */
+/* Command-line: /export/kelvar/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 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)
+{
+  static const unsigned char asso_values[] =
+    {
+#if defined (ACE_MVS)
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20,  0,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20,  0,
+     20,  0,  0,  0, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20,  0, 20,
+     20, 20, 20,  0, 20, 20, 20, 20, 20, 20,
+     20, 20, 20,  0, 20, 20, 20, 20,  0, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20,
+#else
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+     20, 20, 20, 20, 20,  0, 20,  0, 20,  0,
+      0,  0, 20, 20, 20, 20, 20, 20, 20,  0,
+     20, 20, 20, 20,  0, 20,  0, 20, 20, 20,
+     20,  0, 20, 20, 20, 20, 20, 20,
+#endif /* ACE_MVS */
+    };
+  return len + asso_values[str[len - 1]] + asso_values[str[0]];
+}
+
+const class TAO_operation_db_entry *
+TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 6,
+      MIN_WORD_LENGTH = 4,
+      MAX_WORD_LENGTH = 19,
+      MIN_HASH_VALUE = 4,
+      MAX_HASH_VALUE = 19,
+      HASH_VALUE_RANGE = 16,
+      DUPLICATES = 0
+    };
+
+  static const class TAO_operation_db_entry  wordlist[] =
+    {
+      {"",0},{"",0},{"",0},{"",0},
+      {"copy",  &POA_CORBA_ConstructionPolicy::copy_skel},
+      {"_is_a",  &POA_CORBA_ConstructionPolicy::_is_a_skel},
+      {"",0},
+      {"destroy",       &POA_CORBA_ConstructionPolicy::destroy_skel},
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_non_existent",  &POA_CORBA_ConstructionPolicy::_non_existent_skel},
+      {"",0},{"",0},
+      {"_get_policy_type",      &POA_CORBA_ConstructionPolicy::_get_policy_type_skel},
+      {"",0},{"",0},
+      {"make_domain_manager",   &POA_CORBA_ConstructionPolicy::make_domain_manager_skel},
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      unsigned int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
+        {
+          const char *s = wordlist[key].opname_;
+
+          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
+/* ending time is 18:29:02 */
+static TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable tao_CORBA_ConstructionPolicy_optable;
+
+CORBA::ConstructionPolicy_ptr _TAO_collocation_POA_CORBA_ConstructionPolicy_Stub_Factory (
+    CORBA::Object_ptr obj
+  )
+{
+  TAO_Stub *stub = obj->_stubobj ();
+
+  switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
+    {
+    case TAO_ORB_Core::THRU_POA:
+      {
+      CORBA::ConstructionPolicy_ptr retval = 0;
+      ACE_NEW_RETURN (
+          retval,
+          POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy (stub),
+          0
+        );
+      return retval;
+      }
+    case TAO_ORB_Core::DIRECT:
+      break;
+    default:
+      break;
+    }
+  return 0;
+}
+
+int _TAO_collocation_POA_CORBA_ConstructionPolicy_Stub_Factory_Initializer (long dummy)
+{
+  ACE_UNUSED_ARG (dummy);
+
+  _TAO_collocation_CORBA_ConstructionPolicy_Stub_Factory_function_pointer =
+    _TAO_collocation_POA_CORBA_ConstructionPolicy_Stub_Factory;
+
+  return 0;
+}
+
+static int _TAO_collocation_POA_CORBA_ConstructionPolicy_Stub_Factory_Initializer_Scarecrow =
+  _TAO_collocation_POA_CORBA_ConstructionPolicy_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_CORBA_ConstructionPolicy_Stub_Factory_Initializer));
+
+// skeleton constructor
+POA_CORBA_ConstructionPolicy::POA_CORBA_ConstructionPolicy (void)
+{
+  this->optable_ = &tao_CORBA_ConstructionPolicy_optable;
+}
+
+// copy ctor
+POA_CORBA_ConstructionPolicy::POA_CORBA_ConstructionPolicy (const POA_CORBA_ConstructionPolicy& rhs)
+  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
+    TAO_ServantBase (rhs)
+{}
+
+// skeleton destructor
+POA_CORBA_ConstructionPolicy::~POA_CORBA_ConstructionPolicy (void)
+{
+}
+
+void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void *_tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+)
+{
+#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *)_tao_object_reference;
+
+  IR_InterfaceDef_var object_type;
+  CORBA::Boolean constr_policy;
+  if (!(
+    (_tao_in >> object_type.out ()) &&
+    (_tao_in >> CORBA::Any::to_boolean (constr_policy))
+  ))
+    ACE_THROW (CORBA::MARSHAL());
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ServerRequestInterceptor_Adapter
+    _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV));
+  ACE_CHECK;
+  // @@ CORBA::Object_var _tao_objref;
+    POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager  ri ("make_domain_manager",
+_tao_server_request.service_info ()    ,  object_type.in ()    ,  constr_policy    ,
+    ACE_TRY_ENV);
+if (_tao_vfr.valid ())
+    {
+      // @@ _tao_objref = _tao_server_request.objref (ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+
+  ACE_TRY
+    {
+      ri.request_id (_tao_server_request.request_id ());
+      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+    TAO_INTERCEPTOR_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+    _tao_impl->make_domain_manager (
+      object_type.in (),
+      constr_policy,
+      ACE_TRY_ENV
+    );
+
+    TAO_INTERCEPTOR_CHECK;
+
+
+    #if (TAO_HAS_INTERCEPTORS == 1)
+
+   _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+  TAO_INTERCEPTOR_CHECK;
+}
+ACE_CATCHANY
+  {
+    ri.exception (&ACE_ANY_EXCEPTION);
+    _tao_vfr.send_exception (&ri,
+        ACE_TRY_ENV
+      );
+    ACE_RE_THROW;
+  }
+ACE_ENDTRY;
+ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+_tao_server_request.init_reply (ACE_TRY_ENV);
+ACE_CHECK;
+#else
+ ACE_UNUSED_ARG (_tao_server_request);
+ ACE_UNUSED_ARG (_tao_object_reference);
+ ACE_THROW (CORBA::NO_IMPLEMENT ());
+#endif /* TAO_HAS_INTERFACE_REPOSITORY */
+}
+
+void POA_CORBA_ConstructionPolicy::_is_a_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference;
+  CORBA::Boolean _tao_retval = 0;
+  CORBA::String_var value;
+  if (!(_tao_in >> value.out ()))
+    ACE_THROW (CORBA::MARSHAL ());
+
+  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  ACE_CHECK;
+
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
+void POA_CORBA_ConstructionPolicy::_non_existent_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference;
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
+CORBA::Boolean POA_CORBA_ConstructionPolicy::_is_a (
+    const char* value,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  if (
+    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/ConstructionPolicy:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      return 1;
+    else
+      return 0;
+}
+
+void* POA_CORBA_ConstructionPolicy::_downcast (
+    const char* logical_type_id
+  )
+{
+if (ACE_OS::strcmp (logical_type_id, "IDL:CORBA/ConstructionPolicy:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_ConstructionPolicy_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
+    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
+    if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+    return ACE_static_cast(PortableServer::Servant, this);
+  return 0;
+}
+
+void POA_CORBA_ConstructionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+{
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+}
+
+const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const
+{
+  return "IDL:CORBA/ConstructionPolicy:1.0";
+}
+
+CORBA::ConstructionPolicy*
+POA_CORBA_ConstructionPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
+{
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
+    switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
+      {
+      case TAO_ORB_Core::THRU_POA:
+        {
+          ::CORBA::ConstructionPolicy_ptr retval = 0;
+          ACE_NEW_RETURN (
+              retval,
+              POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy (stub),
+              0
+            );
+          return retval;
+        }
+      case TAO_ORB_Core::DIRECT:
+      default:
+        ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      }
+  else
+    {
+      // stub->_incr_refcnt ();
+      CORBA::Object_ptr tmp = CORBA::Object::_nil ();
+      ACE_NEW_RETURN (tmp, CORBA::Object (stub), 0);
+      CORBA::Object_var obj = tmp;
+      return ::CORBA::ConstructionPolicy::_unchecked_narrow (obj.in ());
+    }
+}
+
+POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy::POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy (
+  TAO_Stub *stub
+)
+  :  ACE_NESTED_CLASS (POA_CORBA, _tao_thru_poa_collocated_CORBA_Policy (stub)),
+    CORBA_Object (stub, 1)
+{
+}
+
+CORBA::Boolean POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy::_is_a(
+    const CORBA::Char *logical_type_id,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "_is_a",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN (0);
+  return ACE_reinterpret_cast (
+      POA_CORBA_ConstructionPolicy_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:CORBA/ConstructionPolicy:1.0"
+        )
+    )->_is_a (logical_type_id, ACE_TRY_ENV);
+}
+
+
+CORBA::Boolean POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy::_non_existent(
+    CORBA_Environment &ACE_TRY_ENV
+  )
+
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "_non_existent",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN (0);
+  return ACE_reinterpret_cast (
+      POA_CORBA_ConstructionPolicy_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:CORBA/ConstructionPolicy:1.0"
+        )
+    )->_non_existent (ACE_TRY_ENV);
+}
+
+
+void POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy::make_domain_manager  (
+    IR_InterfaceDef* object_type,
+    CORBA::Boolean constr_policy,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "make_domain_manager",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK;
+  ACE_reinterpret_cast (
+      POA_CORBA_ConstructionPolicy_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:CORBA/ConstructionPolicy:1.0"
+        )
+    )->make_domain_manager (
+      object_type,
+      constr_policy,
+      ACE_TRY_ENV
+    );
+  return;
+}
+
+#if (TAO_HAS_INTERCEPTORS == 1) && (TAO_HAS_INTERFACE_REPOSITORY == 1)
+POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager (const char *_tao_operation,
+IOP::ServiceContextList &_tao_service_context_list,IR_InterfaceDef* object_type,CORBA::Boolean constr_policy,
+CORBA::Environment &)
+  : TAO_ServerRequest_Info (_tao_operation, _tao_service_context_list),object_type_ (object_type),constr_policy_ (constr_policy)
+{}
+
+Dynamic::ParameterList *
+POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::arguments (CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+   // Generate the arg list on demand
+  CORBA::ULong length = 0;
+        length = this->parameter_list_.length ();
+      this->parameter_list_.length (length + 1);
+      this->parameter_list_[length].argument <<=  this->object_type_;
+
+    this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+                length = this->parameter_list_.length ();
+        this->parameter_list_.length (length + 1);
+        this->parameter_list_[length].argument <<= CORBA::Any::from_boolean (this->constr_policy_ );
+      this->parameter_list_[length].mode = Dynamic::PARAM_IN;
+
+      return &this->parameter_list_;
+}
+
+    Dynamic::ExceptionList *
+    POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::exceptions (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+ // Generate the exception list on demand
+    return 0;
+}
+
+
+      CORBA::Any *
+  POA_CORBA_ConstructionPolicy::TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager::result (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+ // Generate the result on demand
+   CORBA::TypeCode tc (CORBA::tk_void);
+  this->result_val_.type (&tc);
+
+  return &this->result_val_;
+  }
+
+#endif /* TAO_HAS_INTERCEPTORS && TAO_HAS_INTERFACE_REPOSITORY */
diff --git a/TAO/tao/PortableServer/DomainS.h b/TAO/tao/PortableServer/DomainS.h
new file mode 100644
index 00000000000..fc32bdb54d1
--- /dev/null
+++ b/TAO/tao/PortableServer/DomainS.h
@@ -0,0 +1,543 @@
+/* -*- C++ -*- $Id$ */
+
+// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
+// TAO and the TAO IDL Compiler have been developed by the Center for
+// Distributed Object Computing at Washington University, St. Louis.
+//
+// Information about TAO is available at:
+//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#ifndef _TAO_IDL_ORIG_DOMAINS_H_
+#define _TAO_IDL_ORIG_DOMAINS_H_
+
+#include "ace/pre.h"
+
+#include "PortableServerC.h"
+#include "POA_CORBA.h"
+#include "Servant_Base.h"
+#include "Collocated_Object.h"
+#include "tao/DomainC.h"
+#include "tao/Request_Info.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+  class POA_CORBA_DomainManager;
+  typedef POA_CORBA_DomainManager *POA_CORBA_DomainManager_ptr;
+  class TAO_PortableServer_Export POA_CORBA_DomainManager :  public virtual PortableServer::ServantBase
+  {
+  protected:
+    POA_CORBA_DomainManager (void);
+
+  public:
+    POA_CORBA_DomainManager (const POA_CORBA_DomainManager& rhs);
+    virtual ~POA_CORBA_DomainManager (void);
+
+
+    virtual CORBA::Boolean _is_a (
+        const char* logical_type_id,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    virtual void* _downcast (
+        const char* logical_type_id
+      );
+
+    static void _is_a_skel (
+        CORBA::ServerRequest &req,
+        void *obj,
+        void *context,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    static void _non_existent_skel (
+        CORBA::ServerRequest &req,
+        void *obj,
+        void *context,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    virtual void _dispatch (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_context,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    ::CORBA::DomainManager *_this (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+    virtual const char* _interface_repository_id (void) const;
+
+    virtual CORBA::Policy_ptr get_domain_policy (
+        CORBA::PolicyType policy_type,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    static void get_domain_policy_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+        // Generation of interceptors related RequestInfo classes per operation.
+    // This needed to be able to store the arguments, exceptiosn, constexts
+    // and build the lists dynamically on demand so that unnecessary time overhead
+    // of building these lists when they arent used is avoided.
+            class TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy : public TAO_ServerRequest_Info
+    {
+    public:
+      friend class POA_CORBA_DomainManager;
+      TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy (
+        const char *  _tao_operation,
+        IOP::ServiceContextList &_tao_service_context_list            ,      CORBA::PolicyType policy_type      ,
+            CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+      );
+
+       virtual Dynamic::ParameterList * arguments (
+        CORBA::Environment &ACE_TRY_ENV =
+           TAO_default_environment ())
+       ACE_THROW_SPEC ((CORBA::SystemException));
+
+        virtual Dynamic::ExceptionList * exceptions (
+      CORBA::Environment &ACE_TRY_ENV =
+         TAO_default_environment ())
+     ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual CORBA::Any * result (
+    CORBA::Environment &ACE_TRY_ENV =
+       TAO_default_environment ())
+   ACE_THROW_SPEC ((CORBA::SystemException));
+
+
+private:
+TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy (const TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy &);
+void operator= (const TAO_ServerRequest_Info_CORBA_DomainManager_get_domain_policy &);
+CORBA::PolicyType & policy_type_;
+void result (CORBA::Policy_ptr  result);
+ // update the result
+CORBA::Policy_ptr  result_;
+};
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+};
+
+
+#if !defined (_CORBA_DOMAINMANAGER___THRU_POA_COLLOCATED_SH_)
+#define _CORBA_DOMAINMANAGER___THRU_POA_COLLOCATED_SH_
+
+class TAO_PortableServer_Export POA_CORBA__tao_thru_poa_collocated_DomainManager   : public virtual ::CORBA::DomainManager
+{
+public:
+  POA_CORBA__tao_thru_poa_collocated_DomainManager (
+      TAO_Stub *stub
+    );
+  virtual CORBA::Boolean _is_a(
+      const CORBA::Char *logical_type_id,
+      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    );
+
+  virtual CORBA::Boolean _non_existent(
+      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    );
+
+    virtual CORBA::Policy_ptr get_domain_policy (
+      CORBA::PolicyType policy_type,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DOMAINMANAGER___DIRECT_COLLOCATED_SH_)
+#define _CORBA_DOMAINMANAGER___DIRECT_COLLOCATED_SH_
+
+class TAO_PortableServer_Export POA_CORBA__tao_direct_collocated_DomainManager   :  public virtual CORBA::DomainManager, public virtual TAO_Collocated_Object
+{
+public:
+  POA_CORBA__tao_direct_collocated_DomainManager (
+      POA_CORBA_DomainManager_ptr  servant,
+      TAO_Stub *stub
+    );
+  virtual CORBA::Boolean _is_a(
+      const CORBA::Char *logical_type_id,
+      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    );
+  virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+  POA_CORBA_DomainManager_ptr _get_servant (void) const;
+
+  virtual CORBA::Boolean _non_existent(
+      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    );
+
+    virtual CORBA::Policy_ptr get_domain_policy (
+      CORBA::PolicyType policy_type,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+
+private:
+  POA_CORBA_DomainManager_ptr servant_;
+};
+
+
+#endif /* end #if !defined */
+
+
+#if defined (ACE_HAS_USING_KEYWORD)
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class TAO_PortableServer_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager
+{
+public:
+  POA_CORBA_DomainManager_tie (T &t);
+  // the T& ctor
+  POA_CORBA_DomainManager_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_DomainManager_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_DomainManager_tie (void);
+  // dtor
+
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+  CORBA::Policy_ptr get_domain_policy (
+      CORBA::PolicyType policy_type,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+
+  // copy and assignment are not allowed
+  POA_CORBA_DomainManager_tie (const POA_CORBA_DomainManager_tie &);
+  void operator= (const POA_CORBA_DomainManager_tie &);
+};
+
+#endif /* ACE_HAS_USING_KEYWORD */
+
+class POA_CORBA_ConstructionPolicy;
+typedef POA_CORBA_ConstructionPolicy *POA_CORBA_ConstructionPolicy_ptr;
+class TAO_PortableServer_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA::Policy
+{
+protected:
+  POA_CORBA_ConstructionPolicy (void);
+
+public:
+  POA_CORBA_ConstructionPolicy (const POA_CORBA_ConstructionPolicy& rhs);
+  virtual ~POA_CORBA_ConstructionPolicy (void);
+
+
+  virtual CORBA::Boolean _is_a (
+      const char* logical_type_id,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  virtual void* _downcast (
+      const char* logical_type_id
+    );
+
+  static void _is_a_skel (
+      CORBA::ServerRequest &req,
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void _non_existent_skel (
+      CORBA::ServerRequest &req,
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  virtual void _dispatch (
+      CORBA::ServerRequest &_tao_req,
+      void *_tao_context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  ::CORBA::ConstructionPolicy *_this (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  virtual const char* _interface_repository_id (void) const;
+
+  virtual void make_domain_manager (
+      IR_InterfaceDef* object_type,
+      CORBA::Boolean constr_policy,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void make_domain_manager_skel (
+      CORBA::ServerRequest &_tao_req,
+      void *_tao_obj,
+      void *_tao_context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void _get_policy_type_skel (
+      CORBA::ServerRequest &req,
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void copy_skel (
+      CORBA::ServerRequest &req,
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void destroy_skel (
+      CORBA::ServerRequest &req,
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+    // Generation of interceptors related RequestInfo classes per operation.
+  // This needed to be able to store the arguments, exceptiosn, constexts
+  // and build the lists dynamically on demand so that unnecessary time overhead
+  // of building these lists when they arent used is avoided.
+      class TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager : public TAO_ServerRequest_Info
+  {
+  public:
+    friend class POA_CORBA_ConstructionPolicy;
+    TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager (
+      const char *  _tao_operation,
+      IOP::ServiceContextList &_tao_service_context_list        ,    IR_InterfaceDef* object_type        ,    CORBA::Boolean constr_policy    ,
+        CORBA::Environment &ACE_TRY_ENV =
+      TAO_default_environment ()
+    );
+
+     virtual Dynamic::ParameterList * arguments (
+      CORBA::Environment &ACE_TRY_ENV =
+         TAO_default_environment ())
+     ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual Dynamic::ExceptionList * exceptions (
+    CORBA::Environment &ACE_TRY_ENV =
+       TAO_default_environment ())
+   ACE_THROW_SPEC ((CORBA::SystemException));
+
+virtual CORBA::Any * result (
+  CORBA::Environment &ACE_TRY_ENV =
+     TAO_default_environment ())
+ ACE_THROW_SPEC ((CORBA::SystemException));
+
+
+private:
+TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager &);
+void operator= (const TAO_ServerRequest_Info_CORBA_ConstructionPolicy_make_domain_manager &);
+IR_InterfaceDef* & object_type_;
+CORBA::Boolean & constr_policy_;
+};
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+};
+
+
+#if !defined (_CORBA_CONSTRUCTIONPOLICY___THRU_POA_COLLOCATED_SH_)
+#define _CORBA_CONSTRUCTIONPOLICY___THRU_POA_COLLOCATED_SH_
+
+class TAO_PortableServer_Export POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy   : public virtual ::CORBA::ConstructionPolicy,
+    public virtual POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy
+{
+public:
+  POA_CORBA__tao_thru_poa_collocated_ConstructionPolicy (
+      TAO_Stub *stub
+    );
+  virtual CORBA::Boolean _is_a(
+      const CORBA::Char *logical_type_id,
+      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    );
+
+  virtual CORBA::Boolean _non_existent(
+      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    );
+
+    virtual void make_domain_manager (
+      IR_InterfaceDef* object_type,
+      CORBA::Boolean constr_policy,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+};
+
+
+#endif /* end #if !defined */
+
+
+#if defined (ACE_HAS_USING_KEYWORD)
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class TAO_PortableServer_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy
+{
+public:
+  POA_CORBA_ConstructionPolicy_tie (T &t);
+  // the T& ctor
+  POA_CORBA_ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_ConstructionPolicy_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_ConstructionPolicy_tie (void);
+  // dtor
+
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+  void make_domain_manager (
+      IR_InterfaceDef* object_type,
+      CORBA::Boolean constr_policy,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::PolicyType policy_type (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Policy_ptr copy (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+
+  // copy and assignment are not allowed
+  POA_CORBA_ConstructionPolicy_tie (const POA_CORBA_ConstructionPolicy_tie &);
+  void operator= (const POA_CORBA_ConstructionPolicy_tie &);
+};
+
+#endif /* ACE_HAS_USING_KEYWORD */
+
+
+#include "DomainS_T.h"
+
+#if defined (__ACE_INLINE__)
+#include "DomainS.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/DomainS.i b/TAO/tao/PortableServer/DomainS.i
new file mode 100644
index 00000000000..9c4b9957937
--- /dev/null
+++ b/TAO/tao/PortableServer/DomainS.i
@@ -0,0 +1,54 @@
+/* -*- C++ -*- $Id$ */
+
+// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
+// TAO and the TAO IDL Compiler have been developed by the Center for
+// Distributed Object Computing at Washington University, St. Louis.
+//
+// Information about TAO is available at:
+//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+
+ACE_INLINE void POA_CORBA_ConstructionPolicy::_get_policy_type_skel (
+    CORBA::ServerRequest &req,
+    void *obj,
+    void *context,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA::Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj;
+  POA_CORBA::Policy::_get_policy_type_skel (
+      req,
+      (POA_CORBA::Policy_ptr) impl,
+      context,
+      ACE_TRY_ENV
+    );
+}
+ACE_INLINE void POA_CORBA_ConstructionPolicy::copy_skel (
+    CORBA::ServerRequest &req,
+    void *obj,
+    void *context,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA::Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj;
+  POA_CORBA::Policy::copy_skel (
+      req,
+      (POA_CORBA::Policy_ptr) impl,
+      context,
+       ACE_TRY_ENV
+    );
+}
+ACE_INLINE void POA_CORBA_ConstructionPolicy::destroy_skel (
+    CORBA::ServerRequest &req,
+    void *obj,
+    void *context,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA::Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj;
+  POA_CORBA::Policy::destroy_skel (
+      req,
+      (POA_CORBA::Policy_ptr) impl,
+      context,
+       ACE_TRY_ENV
+    );
+}
diff --git a/TAO/tao/DomainS_T.cpp b/TAO/tao/PortableServer/DomainS_T.cpp
index 7af8ccd4a7c..6a1cf214170 100644
--- a/TAO/tao/DomainS_T.cpp
+++ b/TAO/tao/PortableServer/DomainS_T.cpp
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-// $Id$
+/* -*- C++ -*- $Id$ */
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
@@ -8,13 +7,13 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DOMAINS_T_CPP_
-#define _TAO_IDL_DOMAINS_T_CPP_
+#ifndef _TAO_IDL_ORIG_DOMAINS_T_CPP_
+#define _TAO_IDL_ORIG_DOMAINS_T_CPP_
 
-#include "tao/DomainS_T.h"
+#include "DomainS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/DomainS_T.i"
+#include "DomainS_T.i"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/DomainS_T.h b/TAO/tao/PortableServer/DomainS_T.h
index 0e31e09140d..a811ef64eac 100644
--- a/TAO/tao/DomainS_T.h
+++ b/TAO/tao/PortableServer/DomainS_T.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-// $Id$
+/* -*- C++ -*- $Id$ */
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
@@ -8,10 +7,10 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DOMAINS_T_H_
-#define _TAO_IDL_DOMAINS_T_H_
-#include "ace/pre.h"
+#ifndef _TAO_IDL_ORIG_DOMAINS_T_H_
+#define _TAO_IDL_ORIG_DOMAINS_T_H_
 
+#include "ace/pre.h"
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -21,12 +20,12 @@
 
 
 #if defined (__ACE_INLINE__)
-#include "tao/DomainS_T.i"
+#include "DomainS_T.i"
 #endif /* defined INLINE */
 
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/DomainS_T.cpp"
+#include "DomainS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
 
diff --git a/TAO/tao/DomainS_T.i b/TAO/tao/PortableServer/DomainS_T.i
index cb0f9d3128a..f02569b5455 100644
--- a/TAO/tao/DomainS_T.i
+++ b/TAO/tao/PortableServer/DomainS_T.i
@@ -1,5 +1,4 @@
-/* -*- C++ -*- */
-// $Id$
+/* -*- C++ -*- $Id$ */
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
@@ -11,47 +10,47 @@
 
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t)
+POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_tie (T &t)
         : ptr_ (&t),
           poa_ (PortableServer::POA::_nil ()),
           rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_tie (T &t, PortableServer::POA_ptr poa)
         : ptr_ (&t),
           poa_ (PortableServer::POA::_duplicate (poa)),
           rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_tie (T *tp, CORBA::Boolean release)
         : ptr_ (tp),
           poa_ (PortableServer::POA::_nil ()),
           rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
         : ptr_ (tp),
           poa_ (PortableServer::POA::_duplicate (poa)),
           rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::~DomainManager_tie (void)
+POA_CORBA_DomainManager_tie<T>::~POA_CORBA_DomainManager_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::DomainManager_tie<T>::_tied_object (void)
+POA_CORBA_DomainManager_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj)
+POA_CORBA_DomainManager_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -59,7 +58,7 @@ POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -67,31 +66,34 @@ POA_CORBA::DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::DomainManager_tie<T>::_is_owner (void)
+POA_CORBA_DomainManager_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_DomainManager_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::DomainManager_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_DomainManager_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->DomainManager::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_DomainManager::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy  (
+CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy  (
     CORBA::PolicyType policy_type,
     CORBA::Environment &ACE_TRY_ENV
   )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
 {
   return this->ptr_->get_domain_policy (
     policy_type,
@@ -101,51 +103,49 @@ CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy  (
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t)
+POA_CORBA_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_tie (T &t)
         : ptr_ (&t),
           poa_ (PortableServer::POA::_nil ()),
           rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa)
         : ptr_ (&t),
           poa_ (PortableServer::POA::_duplicate (poa)),
           rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_tie (T *tp, CORBA::Boolean release)
         : ptr_ (tp),
           poa_ (PortableServer::POA::_nil ()),
           rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
         : ptr_ (tp),
           poa_ (PortableServer::POA::_duplicate (poa)),
           rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::~ConstructionPolicy_tie (void)
+POA_CORBA_ConstructionPolicy_tie<T>::~POA_CORBA_ConstructionPolicy_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (void)
+POA_CORBA_ConstructionPolicy_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj)
+POA_CORBA_ConstructionPolicy_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -153,7 +153,7 @@ POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -161,32 +161,35 @@ POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean relea
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (void)
+POA_CORBA_ConstructionPolicy_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (CORBA::Environment &env)
+POA_CORBA_ConstructionPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->Construction::_default_POA (env);
+  return this->POA_CORBA_ConstructionPolicy::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
-    CORBA::InterfaceDef_ptr object_type,
+void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager  (
+    IR_InterfaceDef* object_type,
     CORBA::Boolean constr_policy,
     CORBA::Environment &ACE_TRY_ENV
   )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
 {
   this->ptr_->make_domain_manager (
     object_type,
@@ -195,6 +198,43 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
+template <class T> ACE_INLINE
+CORBA::PolicyType POA_CORBA_ConstructionPolicy_tie<T>::policy_type  (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  return this->ptr_->policy_type (
+    ACE_TRY_ENV
+  );
+}
+
+template <class T> ACE_INLINE
+CORBA::Policy_ptr POA_CORBA_ConstructionPolicy_tie<T>::copy  (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  return this->ptr_->copy (
+    ACE_TRY_ENV
+  );
+}
 
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA)
+template <class T> ACE_INLINE
+void POA_CORBA_ConstructionPolicy_tie<T>::destroy  (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  this->ptr_->destroy (
+    ACE_TRY_ENV
+  );
+}
+
+#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/tao/FT_CORBAS.cpp b/TAO/tao/PortableServer/FT_CORBAS.cpp
index 23bc8a5d04e..bbef4d1a20d 100644
--- a/TAO/tao/FT_CORBAS.cpp
+++ b/TAO/tao/PortableServer/FT_CORBAS.cpp
@@ -7,16 +7,16 @@
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/FT_CORBAS.h"
+#include "FT_CORBAS.h"
 
 #if (TAO_HAS_FT_CORBA == 1)
 
-#include "tao/Operation_Table.h"
+#include "Operation_Table.h"
+#include "Object_Adapter.h"
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Server_Request.h"
 #include "tao/NVList.h"
-#include "tao/Object_Adapter.h"
 
 // The code needs to be cleaned up a bit here.. - Bala
 #if !defined (__ACE_INLINE__)
@@ -330,7 +330,7 @@ FT_POA_tao_thru_poa_collocated_RequestDurationPolicy::FT_POA_tao_thru_poa_colloc
   TAO_Stub *stub
 )
   :  ACE_NESTED_CLASS (POA_CORBA,_tao_thru_poa_collocated_CORBA_Policy) (stub),
-    CORBA_Object (stub, 0, 1)
+    CORBA_Object (stub, 1)
 {
 }
 
@@ -341,7 +341,7 @@ CORBA::Boolean FT_POA_tao_thru_poa_collocated_RequestDurationPolicy::_is_a(
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -364,7 +364,7 @@ CORBA::Boolean FT_POA_tao_thru_poa_collocated_RequestDurationPolicy::_non_existe
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -392,7 +392,7 @@ FT_POA_tao_thru_poa_collocated_RequestDurationPolicy::request_duration_value  (
   TimeBase::TimeT _tao_retval = 0;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -721,7 +721,7 @@ FT_POA_tao_thru_poa_collocated_HeartbeatPolicy::FT_POA_tao_thru_poa_collocated_H
   TAO_Stub *stub
 )
   :  ACE_NESTED_CLASS (POA_CORBA,_tao_thru_poa_collocated_CORBA_Policy) (stub),
-    CORBA_Object (stub, 0, 1)
+    CORBA_Object (stub, 1)
 {
 }
 
@@ -732,7 +732,7 @@ CORBA::Boolean FT_POA_tao_thru_poa_collocated_HeartbeatPolicy::_is_a(
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -755,7 +755,7 @@ CORBA::Boolean FT_POA_tao_thru_poa_collocated_HeartbeatPolicy::_non_existent(
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -782,7 +782,7 @@ FT::HeartbeatPolicyValue FT_POA_tao_thru_poa_collocated_HeartbeatPolicy::heartbe
   FT::HeartbeatPolicyValue _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1112,7 +1112,7 @@ FT_POA_tao_thru_poa_collocated_HeartbeatEnabledPolicy::FT_POA_tao_thru_poa_collo
   TAO_Stub *stub
 )
   :  ACE_NESTED_CLASS (POA_CORBA,_tao_thru_poa_collocated_CORBA_Policy) (stub),
-    CORBA_Object (stub, 0, 1)
+    CORBA_Object (stub, 1)
 {
 }
 
@@ -1123,7 +1123,7 @@ CORBA::Boolean FT_POA_tao_thru_poa_collocated_HeartbeatEnabledPolicy::_is_a(
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1146,7 +1146,7 @@ CORBA::Boolean FT_POA_tao_thru_poa_collocated_HeartbeatEnabledPolicy::_non_exist
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1173,7 +1173,7 @@ CORBA::Boolean FT_POA_tao_thru_poa_collocated_HeartbeatEnabledPolicy::heartbeat_
   CORBA::Boolean _tao_retval = 0;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
diff --git a/TAO/tao/FT_CORBAS.h b/TAO/tao/PortableServer/FT_CORBAS.h
index 272fde79856..b59a54ec195 100644
--- a/TAO/tao/FT_CORBAS.h
+++ b/TAO/tao/PortableServer/FT_CORBAS.h
@@ -10,9 +10,10 @@
 #ifndef TAO_FT_CORBAS_H_
 #define TAO_FT_CORBAS_H_
 #include "ace/pre.h"
+
+#include "POA_CORBA.h"
 #include "tao/ftpoafwd.h"
 #include "tao/FT_CORBAC.h"
-#include "tao/POA_CORBA.h"
 #include "tao/PolicyC.h"
 
 #if (TAO_HAS_FT_CORBA == 1)
@@ -29,7 +30,7 @@
 #endif /* _MSC_VER */
 
 
-class TAO_Export FT_POA_RequestDurationPolicy : public virtual POA_CORBA::Policy
+class TAO_PortableServer_Export FT_POA_RequestDurationPolicy : public virtual POA_CORBA::Policy
 {
 protected:
   FT_POA_RequestDurationPolicy (void);
@@ -121,7 +122,7 @@ public:
 };
 
 
-class TAO_Export
+class TAO_PortableServer_Export
 FT_POA_tao_thru_poa_collocated_RequestDurationPolicy :
   public virtual FT::RequestDurationPolicy,
   public virtual POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy
@@ -158,7 +159,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class TAO_Export FT_POA_RequestDurationPolicy_tie :
+class TAO_PortableServer_Export FT_POA_RequestDurationPolicy_tie :
   public FT_POA_RequestDurationPolicy
 {
 public:
@@ -237,7 +238,7 @@ private:
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
-class TAO_Export FT_POA_HeartbeatPolicy : public virtual POA_CORBA::Policy
+class TAO_PortableServer_Export FT_POA_HeartbeatPolicy : public virtual POA_CORBA::Policy
 {
 protected:
   FT_POA_HeartbeatPolicy (void);
@@ -329,7 +330,7 @@ public:
 };
 
 
-class TAO_Export FT_POA_tao_thru_poa_collocated_HeartbeatPolicy:
+class TAO_PortableServer_Export FT_POA_tao_thru_poa_collocated_HeartbeatPolicy:
   public virtual FT::HeartbeatPolicy,
   public virtual POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy
 {
@@ -363,7 +364,7 @@ public:
 // about it.
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class TAO_Export FT_POA_HeartbeatPolicy_tie : public FT_POA_HeartbeatPolicy
+class TAO_PortableServer_Export FT_POA_HeartbeatPolicy_tie : public FT_POA_HeartbeatPolicy
 {
 public:
   FT_POA_HeartbeatPolicy_tie (T &t);
@@ -440,7 +441,7 @@ private:
 #endif /* ACE_HAS_USING_KEYWORD */
 
 
-class TAO_Export FT_POA_HeartbeatEnabledPolicy : public virtual POA_CORBA::Policy
+class TAO_PortableServer_Export FT_POA_HeartbeatEnabledPolicy : public virtual POA_CORBA::Policy
 {
 protected:
   FT_POA_HeartbeatEnabledPolicy (void);
@@ -532,7 +533,7 @@ public:
 };
 
 
-class TAO_Export FT_POA_tao_thru_poa_collocated_HeartbeatEnabledPolicy
+class TAO_PortableServer_Export FT_POA_tao_thru_poa_collocated_HeartbeatEnabledPolicy
   : public virtual FT::HeartbeatEnabledPolicy,
     public virtual POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy
 {
@@ -569,7 +570,7 @@ public:
 // about it.
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class TAO_Export FT_POA_HeartbeatEnabledPolicy_tie :
+class TAO_PortableServer_Export FT_POA_HeartbeatEnabledPolicy_tie :
   public FT_POA_HeartbeatEnabledPolicy
 {
 public:
diff --git a/TAO/tao/FT_CORBAS.i b/TAO/tao/PortableServer/FT_CORBAS.i
index 6a7cb7036e9..6a7cb7036e9 100644
--- a/TAO/tao/FT_CORBAS.i
+++ b/TAO/tao/PortableServer/FT_CORBAS.i
diff --git a/TAO/tao/Forwarding_Servant.cpp b/TAO/tao/PortableServer/Forwarding_Servant.cpp
index 494b8878717..25ff6315fb1 100644
--- a/TAO/tao/Forwarding_Servant.cpp
+++ b/TAO/tao/PortableServer/Forwarding_Servant.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "tao/Forwarding_Servant.h"
+#include "Forwarding_Servant.h"
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
+#include "PortableServerC.h"
 #include "tao/Object.h"
-#include "tao/PortableServerC.h"
-#include "tao/Any.h"
-#include "tao/Server_Request.h"
 
 ACE_RCSID(tao, Forwarding_Servant, "$Id$")
 
@@ -19,15 +17,10 @@ TAO_Forwarding_Servant::TAO_Forwarding_Servant (CORBA::Object_ptr forward_to,
 }
 
 void
-TAO_Forwarding_Servant::invoke (CORBA::ServerRequest_ptr request,
+TAO_Forwarding_Servant::invoke (CORBA::ServerRequest_ptr,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  PortableServer::ForwardRequest exception (this->forward_to_.in ());
-
-  CORBA::Any any;
-  any <<= exception;
-
-  request->set_exception (any, ACE_TRY_ENV);
+  ACE_THROW (PortableServer::ForwardRequest (this->forward_to_.in ()));
 }
 
 CORBA::RepositoryId
diff --git a/TAO/tao/Forwarding_Servant.h b/TAO/tao/PortableServer/Forwarding_Servant.h
index 956772ef7ce..0095eba6fd9 100644
--- a/TAO/tao/Forwarding_Servant.h
+++ b/TAO/tao/PortableServer/Forwarding_Servant.h
@@ -28,10 +28,10 @@
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-#include "tao/Servant_Base.h"
+#include "Servant_Base.h"
 #include "tao/ORB.h"
 
-class TAO_Forwarding_Servant : public TAO_DynamicImplementation
+class TAO_PortableServer_Export TAO_Forwarding_Servant : public TAO_DynamicImplementation
 {
 public:
 
diff --git a/TAO/tao/ImplRepo.pidl b/TAO/tao/PortableServer/ImplRepo.pidl
index bfddb6e09b7..f29dd03c836 100644
--- a/TAO/tao/ImplRepo.pidl
+++ b/TAO/tao/PortableServer/ImplRepo.pidl
@@ -7,8 +7,8 @@ module ImplementationRepository
     //    Server Side IR Object
     //
     // = DESCRIPTION
-    //    This object, which exists on the servers that use the 
-    //    Implementation Repository (IR), is used to control or check the 
+    //    This object, which exists on the servers that use the
+    //    Implementation Repository (IR), is used to control or check the
     //    status of the server by the IR.
   {
     void ping ();
@@ -32,17 +32,17 @@ module ImplementationRepository
   // Complete Environment.
 
   enum ActivationMode {NORMAL, MANUAL, PER_CLIENT, AUTO_START};
-  // The type of Activation 
+  // The type of Activation
 
   struct StartupOptions
   // Options used to start up the server.
   {
     string command_line;
     // Startup command (program name and arguments).
-    
+
     EnvironmentList environment;
     // Environment Variables.
-    
+
     string working_directory;
     // Working directory.
 
@@ -107,7 +107,7 @@ module ImplementationRepository
                           in StartupOptions options)
       raises (AlreadyRegistered);
     // Register the <options> to specify how the <server> should be
-    // restarted when a client asks for it.  
+    // restarted when a client asks for it.
     //
     // The <AlreadyRegistered> exception is raised when <server> has
     // already been registered with the Implementation Repository.
@@ -136,7 +136,7 @@ module ImplementationRepository
                                in Address addr,
                                in ServerObject server_object)
       raises (NotFound);
-    // Used to notify the Implementation Repository that <server> is alive 
+    // Used to notify the Implementation Repository that <server> is alive
     // and well at <addr>.
     //
     // The <NotFound> exception is raised when <server> is not found
@@ -150,7 +150,7 @@ module ImplementationRepository
     // The <NotFound> exception is raised when <server> is not found
     // in the Implementation Repository.
 
-    void find (in string server, 
+    void find (in string server,
                out ServerInformation info)
       raises (NotFound);
     // Returns the startup information for a given <server>.
@@ -174,7 +174,7 @@ module ImplementationRepository
     // Administration::list ().
 
     boolean next_n (in unsigned long how_many,
-		    out ServerInformationList server_list);
+                    out ServerInformationList server_list);
     // This operation returns at most the requested number of
     // servers.
 
diff --git a/TAO/tao/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 08ed5444f36..840f65855c6 100644
--- a/TAO/tao/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -10,7 +10,6 @@
 #include "ImplRepoC.h"
 #include "tao/Stub.h"
 #include "tao/NVList.h"
-//#include "tao/PortableInterceptor.h"
 #include "tao/ORB_Core.h"
 #include "tao/Invocation.h"
 
diff --git a/TAO/tao/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index 94d84122912..98eb947a86b 100644
--- a/TAO/tao/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -11,6 +11,7 @@
 #define _TAO_IDL_IMPLREPOC_H_
 #include "ace/pre.h"
 
+#include "portableserver_export.h"
 #include "tao/Object.h"
 #include "tao/Managed_Types.h"
 #include "tao/Sequence.h"
@@ -33,13 +34,13 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#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_Export
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -64,7 +65,7 @@ TAO_NAMESPACE  ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_
 
-  class TAO_Export ServerObject_var : public TAO_Base_var
+  class TAO_PortableServer_Export ServerObject_var : public TAO_Base_var
   {
   public:
     ServerObject_var (void); // default constructor
@@ -99,7 +100,7 @@ TAO_NAMESPACE  ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_
 
-  class TAO_Export ServerObject_out
+  class TAO_PortableServer_Export ServerObject_out
   {
   public:
     ServerObject_out (ServerObject_ptr &);
@@ -123,7 +124,7 @@ TAO_NAMESPACE  ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
 
-class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object)
+class TAO_PortableServer_Export ServerObject : public virtual ACE_CORBA_1 (Object)
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -176,7 +177,6 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object)
   protected:
     ServerObject (void);
     ServerObject (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
         CORBA::Boolean _tao_collocated = 0
       );
     virtual ~ServerObject (void);
@@ -268,7 +268,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerObject;
 struct EnvironmentVariable;
 class EnvironmentVariable_var;
 
-struct TAO_Export EnvironmentVariable
+struct TAO_PortableServer_Export EnvironmentVariable
 {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -281,7 +281,7 @@ struct TAO_Export EnvironmentVariable
   TAO_String_Manager value;
 };
 
-class TAO_Export EnvironmentVariable_var
+class TAO_PortableServer_Export EnvironmentVariable_var
 {
 public:
   EnvironmentVariable_var (void); // default constructor
@@ -310,7 +310,7 @@ private:
   EnvironmentVariable *ptr_;
 };
 
-class TAO_Export EnvironmentVariable_out
+class TAO_PortableServer_Export EnvironmentVariable_out
 {
 public:
   EnvironmentVariable_out (EnvironmentVariable *&);
@@ -388,7 +388,7 @@ class EnvironmentList_var;
 // EnvironmentList
 // *************************************************************
 
-class TAO_Export EnvironmentList : public
+class TAO_PortableServer_Export EnvironmentList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
@@ -424,7 +424,7 @@ public:
 // class ImplementationRepository::EnvironmentList_var
 // *************************************************************
 
-class TAO_Export EnvironmentList_var
+class TAO_PortableServer_Export EnvironmentList_var
 {
 public:
   EnvironmentList_var (void); // default constructor
@@ -461,7 +461,7 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_
 
-class TAO_Export EnvironmentList_out
+class TAO_PortableServer_Export EnvironmentList_out
 {
 public:
   EnvironmentList_out (EnvironmentList *&);
@@ -498,7 +498,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode;
 struct StartupOptions;
 class StartupOptions_var;
 
-struct TAO_Export StartupOptions
+struct TAO_PortableServer_Export StartupOptions
 {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -513,7 +513,7 @@ struct TAO_Export StartupOptions
   ACE_NESTED_CLASS (ImplementationRepository, ActivationMode) activation;
 };
 
-class TAO_Export StartupOptions_var
+class TAO_PortableServer_Export StartupOptions_var
 {
 public:
   StartupOptions_var (void); // default constructor
@@ -542,7 +542,7 @@ private:
   StartupOptions *ptr_;
 };
 
-class TAO_Export StartupOptions_out
+class TAO_PortableServer_Export StartupOptions_out
 {
 public:
   StartupOptions_out (StartupOptions *&);
@@ -565,7 +565,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StartupOptions;
 struct ServerInformation;
 class ServerInformation_var;
 
-struct TAO_Export ServerInformation
+struct TAO_PortableServer_Export ServerInformation
 {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -580,7 +580,7 @@ struct TAO_Export ServerInformation
   TAO_String_Manager location;
 };
 
-class TAO_Export ServerInformation_var
+class TAO_PortableServer_Export ServerInformation_var
 {
 public:
   ServerInformation_var (void); // default constructor
@@ -609,7 +609,7 @@ private:
   ServerInformation *ptr_;
 };
 
-class TAO_Export ServerInformation_out
+class TAO_PortableServer_Export ServerInformation_out
 {
 public:
   ServerInformation_out (ServerInformation *&);
@@ -682,7 +682,7 @@ class ServerInformationList_var;
 // ServerInformationList
 // *************************************************************
 
-class TAO_Export ServerInformationList : public
+class TAO_PortableServer_Export ServerInformationList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
@@ -718,7 +718,7 @@ public:
 // class ImplementationRepository::ServerInformationList_var
 // *************************************************************
 
-class TAO_Export ServerInformationList_var
+class TAO_PortableServer_Export ServerInformationList_var
 {
 public:
   ServerInformationList_var (void); // default constructor
@@ -755,7 +755,7 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_
 
-class TAO_Export ServerInformationList_out
+class TAO_PortableServer_Export ServerInformationList_out
 {
 public:
   ServerInformationList_out (ServerInformationList *&);
@@ -792,7 +792,7 @@ typedef ServerInformationIterator *ServerInformationIterator_ptr;
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
 
-class TAO_Export ServerInformationIterator_var : public TAO_Base_var
+class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
 {
 public:
   ServerInformationIterator_var (void); // default constructor
@@ -827,7 +827,7 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
 
-class TAO_Export ServerInformationIterator_out
+class TAO_PortableServer_Export ServerInformationIterator_out
 {
 public:
   ServerInformationIterator_out (ServerInformationIterator_ptr &);
@@ -860,7 +860,7 @@ typedef Administration *Administration_ptr;
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_
 
-class TAO_Export Administration_var : public TAO_Base_var
+class TAO_PortableServer_Export Administration_var : public TAO_Base_var
 {
 public:
   Administration_var (void); // default constructor
@@ -895,7 +895,7 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_
 
-class TAO_Export Administration_out
+class TAO_PortableServer_Export Administration_out
 {
 public:
   Administration_out (Administration_ptr &);
@@ -919,7 +919,7 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
 
-class TAO_Export Administration : public virtual ACE_CORBA_1 (Object)
+class TAO_PortableServer_Export Administration : public virtual ACE_CORBA_1 (Object)
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -949,7 +949,7 @@ public:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_
 
-  class TAO_Export AlreadyRegistered : public CORBA::UserException
+  class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException
   {
   public:
 
@@ -986,7 +986,7 @@ public:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_
 
-  class TAO_Export CannotActivate : public CORBA::UserException
+  class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
   {
   public:
 
@@ -1028,7 +1028,7 @@ public:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_
 
-  class TAO_Export NotFound : public CORBA::UserException
+  class TAO_PortableServer_Export NotFound : public CORBA::UserException
   {
   public:
 
@@ -1168,7 +1168,6 @@ public:
 protected:
   Administration (void);
   Administration (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~Administration (void);
@@ -1350,7 +1349,7 @@ typedef ServerInformationIterator *ServerInformationIterator_ptr;
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
 
-class TAO_Export ServerInformationIterator_var : public TAO_Base_var
+class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
 {
 public:
   ServerInformationIterator_var (void); // default constructor
@@ -1385,7 +1384,7 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
 
-class TAO_Export ServerInformationIterator_out
+class TAO_PortableServer_Export ServerInformationIterator_out
 {
 public:
   ServerInformationIterator_out (ServerInformationIterator_ptr &);
@@ -1409,7 +1408,7 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
 
-class TAO_Export ServerInformationIterator : public virtual ACE_CORBA_1 (Object)
+class TAO_PortableServer_Export ServerInformationIterator : public virtual ACE_CORBA_1 (Object)
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1464,7 +1463,6 @@ public:
 protected:
   ServerInformationIterator (void);
   ServerInformationIterator (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~ServerInformationIterator (void);
@@ -1559,129 +1557,129 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationIterator;
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
-extern TAO_Export ImplementationRepository::ServerObject_ptr (*_TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer) (
+extern TAO_PortableServer_Export ImplementationRepository::ServerObject_ptr (*_TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 // Any operators for interface ImplementationRepository::ServerObject
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject *&);
-TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
-TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
-TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
-TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
-TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
-extern TAO_Export ImplementationRepository::Administration_ptr (*_TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer) (
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject *&);
+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_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_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
+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_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_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 *&);
+extern TAO_PortableServer_Export ImplementationRepository::Administration_ptr (*_TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 // Any operators for interface ImplementationRepository::Administration
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration *&);
-TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered *&);
-TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::CannotActivate &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::CannotActivate*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::CannotActivate *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::CannotActivate *&);
-TAO_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::NotFound &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::NotFound*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::NotFound *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::NotFound *&);
-extern TAO_Export ImplementationRepository::ServerInformationIterator_ptr (*_TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer) (
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration *&);
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered *&);
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::CannotActivate &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::CannotActivate*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::CannotActivate *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::CannotActivate *&);
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::NotFound &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::NotFound*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::NotFound *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::NotFound *&);
+extern TAO_PortableServer_Export ImplementationRepository::ServerInformationIterator_ptr (*_TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 // Any operators for interface ImplementationRepository::ServerInformationIterator
-TAO_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator *&);
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator *&);
 
 #ifndef __ACE_INLINE__
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 
-TAO_Export CORBA::Boolean operator<< (
+TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::EnvironmentList &
   );
-TAO_Export CORBA::Boolean operator>> (
+TAO_PortableServer_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::EnvironmentList &
   );
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); //
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); //
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 
-TAO_Export CORBA::Boolean operator<< (
+TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerInformationList &
   );
-TAO_Export CORBA::Boolean operator>> (
+TAO_PortableServer_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::ServerInformationList &
   );
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::AlreadyRegistered &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::AlreadyRegistered &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::AlreadyRegistered &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::AlreadyRegistered &);
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
-TAO_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::AlreadyRegistered &);
+TAO_PortableServer_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::AlreadyRegistered &);
 
 # endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::CannotActivate &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::CannotActivate &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::CannotActivate &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::CannotActivate &);
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
-TAO_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::CannotActivate &);
+TAO_PortableServer_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::CannotActivate &);
 
 # endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::NotFound &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::NotFound &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::NotFound &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::NotFound &);
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
-TAO_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::NotFound &);
+TAO_PortableServer_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::NotFound &);
 
 # endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 #endif /* __ACE_INLINE__ */
 
diff --git a/TAO/tao/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index 1ec8f773ac3..51c7f2eec60 100644
--- a/TAO/tao/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -12,8 +12,8 @@ ImplementationRepository::ServerObject::ServerObject (void) // default construct
 {}
 
 ACE_INLINE
-ImplementationRepository::ServerObject::ServerObject (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+ImplementationRepository::ServerObject::ServerObject (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -75,14 +75,14 @@ ImplementationRepository::ServerObject_var::operator= (const ::ImplementationRep
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerObject_var::operator const ::ImplementationRepository::ServerObject_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast 
+ACE_INLINE
+ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -174,7 +174,7 @@ ImplementationRepository::ServerObject_out::operator= (ServerObject_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerObject_out::operator ::ImplementationRepository::ServerObject_ptr &() // cast
 {
   return this->ptr_;
@@ -262,20 +262,20 @@ ImplementationRepository::EnvironmentVariable_var::operator const ::Implementati
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast 
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast 
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast 
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
 {
   return this->ptr_;
 }
@@ -292,7 +292,7 @@ ImplementationRepository::EnvironmentVariable_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::ImplementationRepository::EnvironmentVariable *&
 ImplementationRepository::EnvironmentVariable_var::out (void)
 {
@@ -353,7 +353,7 @@ ImplementationRepository::EnvironmentVariable_out::operator= (EnvironmentVariabl
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::EnvironmentVariable_out::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
 {
   return this->ptr_;
@@ -373,7 +373,7 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
 
@@ -386,24 +386,24 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     ACE_NEW_RETURN (retval, ImplementationRepository::EnvironmentVariable[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (ImplementationRepository::EnvironmentVariable *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -412,7 +412,7 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs)
   // Copy constructor.
@@ -422,10 +422,10 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     {
       ImplementationRepository::EnvironmentVariable *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_);
       ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -433,14 +433,14 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -453,18 +453,18 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     ImplementationRepository::EnvironmentVariable *tmp1 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
     ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE ImplementationRepository::EnvironmentVariable &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i)
@@ -474,7 +474,7 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     ImplementationRepository::EnvironmentVariable* tmp = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const ImplementationRepository::EnvironmentVariable &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) const
   // operator []
@@ -483,9 +483,9 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     ImplementationRepository::EnvironmentVariable * const tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE ImplementationRepository::EnvironmentVariable *
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (CORBA::Boolean orphan)
   {
@@ -497,7 +497,7 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
       {
         result = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -519,13 +519,13 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const ImplementationRepository::EnvironmentVariable *
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -542,11 +542,11 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
@@ -611,27 +611,27 @@ ImplementationRepository::EnvironmentList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::EnvironmentList_var::operator const ::ImplementationRepository::EnvironmentList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast 
+ACE_INLINE
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast 
+ACE_INLINE
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast 
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast
 {
   return this->ptr_;
 }
@@ -654,7 +654,7 @@ ImplementationRepository::EnvironmentList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::ImplementationRepository::EnvironmentList *&
 ImplementationRepository::EnvironmentList_var::out (void)
 {
@@ -715,7 +715,7 @@ ImplementationRepository::EnvironmentList_out::operator= (EnvironmentList *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::EnvironmentList_out::operator ::ImplementationRepository::EnvironmentList *&() // cast
 {
   return this->ptr_;
@@ -809,20 +809,20 @@ ImplementationRepository::StartupOptions_var::operator const ::ImplementationRep
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast 
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast 
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast 
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast
 {
   return this->ptr_;
 }
@@ -839,7 +839,7 @@ ImplementationRepository::StartupOptions_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::ImplementationRepository::StartupOptions *&
 ImplementationRepository::StartupOptions_var::out (void)
 {
@@ -900,7 +900,7 @@ ImplementationRepository::StartupOptions_out::operator= (StartupOptions *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::StartupOptions_out::operator ::ImplementationRepository::StartupOptions *&() // cast
 {
   return this->ptr_;
@@ -985,20 +985,20 @@ ImplementationRepository::ServerInformation_var::operator const ::Implementation
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast 
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast 
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast 
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast
 {
   return this->ptr_;
 }
@@ -1015,7 +1015,7 @@ ImplementationRepository::ServerInformation_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::ImplementationRepository::ServerInformation *&
 ImplementationRepository::ServerInformation_var::out (void)
 {
@@ -1076,7 +1076,7 @@ ImplementationRepository::ServerInformation_out::operator= (ServerInformation *p
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformation_out::operator ::ImplementationRepository::ServerInformation *&() // cast
 {
   return this->ptr_;
@@ -1096,7 +1096,7 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
 
@@ -1109,24 +1109,24 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     ACE_NEW_RETURN (retval, ImplementationRepository::ServerInformation[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (ImplementationRepository::ServerInformation *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -1135,7 +1135,7 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs)
   // Copy constructor.
@@ -1145,10 +1145,10 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     {
       ImplementationRepository::ServerInformation *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_);
       ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -1156,14 +1156,14 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -1176,18 +1176,18 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     ImplementationRepository::ServerInformation *tmp1 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
     ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE ImplementationRepository::ServerInformation &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i)
@@ -1197,7 +1197,7 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     ImplementationRepository::ServerInformation* tmp = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const ImplementationRepository::ServerInformation &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) const
   // operator []
@@ -1206,9 +1206,9 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     ImplementationRepository::ServerInformation * const tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE ImplementationRepository::ServerInformation *
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (CORBA::Boolean orphan)
   {
@@ -1220,7 +1220,7 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
       {
         result = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->length_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -1242,13 +1242,13 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const ImplementationRepository::ServerInformation *
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const ImplementationRepository::ServerInformation * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -1265,11 +1265,11 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
@@ -1334,27 +1334,27 @@ ImplementationRepository::ServerInformationList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformationList_var::operator const ::ImplementationRepository::ServerInformationList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast 
+ACE_INLINE
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast 
+ACE_INLINE
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast 
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast
 {
   return this->ptr_;
 }
@@ -1377,7 +1377,7 @@ ImplementationRepository::ServerInformationList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::ImplementationRepository::ServerInformationList *&
 ImplementationRepository::ServerInformationList_var::out (void)
 {
@@ -1438,7 +1438,7 @@ ImplementationRepository::ServerInformationList_out::operator= (ServerInformatio
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformationList_out::operator ::ImplementationRepository::ServerInformationList *&() // cast
 {
   return this->ptr_;
@@ -1470,8 +1470,8 @@ ImplementationRepository::Administration::Administration (void) // default const
 {}
 
 ACE_INLINE
-ImplementationRepository::Administration::Administration (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+ImplementationRepository::Administration::Administration (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -1533,14 +1533,14 @@ ImplementationRepository::Administration_var::operator= (const ::ImplementationR
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::Administration_var::operator const ::ImplementationRepository::Administration_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast 
+ACE_INLINE
+ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1632,7 +1632,7 @@ ImplementationRepository::Administration_out::operator= (Administration_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::Administration_out::operator ::ImplementationRepository::Administration_ptr &() // cast
 {
   return this->ptr_;
@@ -1670,8 +1670,8 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
 {}
 
 ACE_INLINE
-ImplementationRepository::ServerInformationIterator::ServerInformationIterator (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
+ImplementationRepository::ServerInformationIterator::ServerInformationIterator (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
+  : CORBA_Object (objref, _tao_collocated)
 {}
 
 ACE_INLINE
@@ -1733,14 +1733,14 @@ ImplementationRepository::ServerInformationIterator_var::operator= (const ::Impl
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformationIterator_var::operator const ::ImplementationRepository::ServerInformationIterator_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast 
+ACE_INLINE
+ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1832,7 +1832,7 @@ ImplementationRepository::ServerInformationIterator_out::operator= (ServerInform
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformationIterator_out::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast
 {
   return this->ptr_;
@@ -1911,7 +1911,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::EnvironmentVariable &_tao_aggregate)
@@ -1923,18 +1923,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
     return 1;
   else
     return 0;
-  
+
 }
 
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
 
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::EnvironmentList &
   );
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     ImplementationRepository::EnvironmentList &
   );
@@ -1951,12 +1951,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (ImplementationRepository::ActivationMode, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1971,7 +1971,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::StartupOptions &_tao_aggregate)
@@ -1985,7 +1985,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ServerInformation &_tao_aggregate)
@@ -1999,7 +1999,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::ServerInformation &_tao_aggregate)
@@ -2013,18 +2013,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
     return 1;
   else
     return 0;
-  
+
 }
 
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
 
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerInformationList &
   );
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     ImplementationRepository::ServerInformationList &
   );
@@ -2254,4 +2254,3 @@ operator>> (
   ACE_ENDTRY;
   return 0;
 }
-
diff --git a/TAO/tao/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index 66ea012ce61..eb24447e696 100644
--- a/TAO/tao/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -8,9 +8,8 @@
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ImplRepoS.h"
-#include "tao/Operation_Table.h"
-//#include "tao/PortableInterceptor.h"
-#include "tao/Object_Adapter.h"
+#include "Operation_Table.h"
+#include "Object_Adapter.h"
 #include "tao/Stub.h"
 #include "tao/GIOP_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -329,7 +328,7 @@ POA_ImplementationRepository::ServerObject::_this (CORBA_Environment &ACE_TRY_EN
 POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObject::_tao_thru_poa_collocated_ServerObject (
   TAO_Stub *stub
 )
-  :  CORBA_Object (stub, 0, 1)
+  :  CORBA_Object (stub, 1)
 {
 }
 
@@ -340,7 +339,7 @@ CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObje
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -363,7 +362,7 @@ CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObje
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -388,7 +387,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObject::ping
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -415,7 +414,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObject::shutdo
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1015,7 +1014,7 @@ POA_ImplementationRepository::Administration::_this (CORBA_Environment &ACE_TRY_
 POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::_tao_thru_poa_collocated_Administration (
   TAO_Stub *stub
 )
-  :  CORBA_Object (stub, 0, 1)
+  :  CORBA_Object (stub, 1)
 {
 }
 
@@ -1026,7 +1025,7 @@ CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_Administra
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1049,7 +1048,7 @@ CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_Administra
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1077,7 +1076,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::acti
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1108,7 +1107,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::regi
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1139,7 +1138,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::rere
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1170,7 +1169,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::remo
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1200,7 +1199,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::shut
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1234,7 +1233,7 @@ char * POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::se
   CORBA::String_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1266,7 +1265,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::serv
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1297,7 +1296,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::find
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1329,7 +1328,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::list
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1681,7 +1680,7 @@ POA_ImplementationRepository::ServerInformationIterator::_this (CORBA_Environmen
 POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInformationIterator::_tao_thru_poa_collocated_ServerInformationIterator (
   TAO_Stub *stub
 )
-  :  CORBA_Object (stub, 0, 1)
+  :  CORBA_Object (stub, 1)
 {
 }
 
@@ -1692,7 +1691,7 @@ CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInfo
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1715,7 +1714,7 @@ CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInfo
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1744,7 +1743,7 @@ CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInfo
   CORBA::Boolean _tao_retval = 0;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -1773,7 +1772,7 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInformationIte
   ))
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
diff --git a/TAO/tao/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index 3cd719559b2..c021add5ff8 100644
--- a/TAO/tao/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -12,8 +12,8 @@
 #include "ace/pre.h"
 
 #include "ImplRepoC.h"
-#include "tao/PortableServerC.h"
-#include "tao/Servant_Base.h"
+#include "Servant_Base.h"
+#include "PortableServerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,7 +30,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 {
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-  class TAO_Export ServerObject :  public virtual PortableServer::ServantBase
+  class TAO_PortableServer_Export ServerObject :  public virtual PortableServer::ServantBase
   {
   protected:
     ServerObject (void);
@@ -119,7 +119,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___THRU_POA_COLLOCATED_SH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___THRU_POA_COLLOCATED_SH_
 
-  class TAO_Export _tao_thru_poa_collocated_ServerObject     : public virtual ::ImplementationRepository::ServerObject
+  class TAO_PortableServer_Export _tao_thru_poa_collocated_ServerObject     : public virtual ::ImplementationRepository::ServerObject
   {
   public:
     _tao_thru_poa_collocated_ServerObject (
@@ -159,7 +159,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 #if defined (ACE_HAS_USING_KEYWORD)
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class TAO_Export ServerObject_tie : public ServerObject
+  class TAO_PortableServer_Export ServerObject_tie : public ServerObject
   {
   public:
     ServerObject_tie (T &t);
@@ -220,7 +220,7 @@ private:
 
   class Administration;
   typedef Administration *Administration_ptr;
-  class TAO_Export Administration :  public virtual PortableServer::ServantBase
+  class TAO_PortableServer_Export Administration :  public virtual PortableServer::ServantBase
   {
   protected:
     Administration (void);
@@ -445,7 +445,7 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___THRU_POA_COLLOCATED_SH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___THRU_POA_COLLOCATED_SH_
 
-  class TAO_Export _tao_thru_poa_collocated_Administration     : public virtual ::ImplementationRepository::Administration
+  class TAO_PortableServer_Export _tao_thru_poa_collocated_Administration     : public virtual ::ImplementationRepository::Administration
   {
   public:
     _tao_thru_poa_collocated_Administration (
@@ -565,7 +565,7 @@ private:
 #if defined (ACE_HAS_USING_KEYWORD)
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class TAO_Export Administration_tie : public Administration
+  class TAO_PortableServer_Export Administration_tie : public Administration
   {
   public:
     Administration_tie (T &t);
@@ -706,7 +706,7 @@ private:
 
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-  class TAO_Export ServerInformationIterator :  public virtual PortableServer::ServantBase
+  class TAO_PortableServer_Export ServerInformationIterator :  public virtual PortableServer::ServantBase
   {
   protected:
     ServerInformationIterator (void);
@@ -797,7 +797,7 @@ private:
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___THRU_POA_COLLOCATED_SH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___THRU_POA_COLLOCATED_SH_
 
-  class TAO_Export _tao_thru_poa_collocated_ServerInformationIterator     : public virtual ::ImplementationRepository::ServerInformationIterator
+  class TAO_PortableServer_Export _tao_thru_poa_collocated_ServerInformationIterator     : public virtual ::ImplementationRepository::ServerInformationIterator
   {
   public:
     _tao_thru_poa_collocated_ServerInformationIterator (
@@ -839,7 +839,7 @@ private:
 #if defined (ACE_HAS_USING_KEYWORD)
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class TAO_Export ServerInformationIterator_tie : public ServerInformationIterator
+  class TAO_PortableServer_Export ServerInformationIterator_tie : public ServerInformationIterator
   {
   public:
     ServerInformationIterator_tie (T &t);
diff --git a/TAO/tao/ImplRepoS.i b/TAO/tao/PortableServer/ImplRepoS.i
index d41d475fa1a..9386d854853 100644
--- a/TAO/tao/ImplRepoS.i
+++ b/TAO/tao/PortableServer/ImplRepoS.i
@@ -6,4 +6,3 @@
 //
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
diff --git a/TAO/tao/ImplRepoS_T.cpp b/TAO/tao/PortableServer/ImplRepoS_T.cpp
index 341ff292dff..341ff292dff 100644
--- a/TAO/tao/ImplRepoS_T.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS_T.cpp
diff --git a/TAO/tao/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h
index 37cf44e03f2..37cf44e03f2 100644
--- a/TAO/tao/ImplRepoS_T.h
+++ b/TAO/tao/PortableServer/ImplRepoS_T.h
diff --git a/TAO/tao/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i
index c9f070e9a57..25f991dfc5d 100644
--- a/TAO/tao/ImplRepoS_T.i
+++ b/TAO/tao/PortableServer/ImplRepoS_T.i
@@ -11,30 +11,30 @@
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -117,30 +117,30 @@ void POA_ImplementationRepository::ServerObject_tie<T>::shutdown  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -354,30 +354,30 @@ void POA_ImplementationRepository::Administration_tie<T>::list  (
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
diff --git a/TAO/tao/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index e8afbeb534a..2400e3405c6 100644
--- a/TAO/tao/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "tao/Key_Adapters.h"
+#include "Key_Adapters.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Key_Adapters.i"
+# include "Key_Adapters.i"
 #endif /* __ACE_INLINE__ */
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h
index 564fd6ee672..aba2ccdc98b 100644
--- a/TAO/tao/Key_Adapters.h
+++ b/TAO/tao/PortableServer/Key_Adapters.h
@@ -18,9 +18,9 @@
 #define TAO_KEY_ADAPTERS_H
 #include "ace/pre.h"
 
+#include "PortableServerC.h"
 #include "tao/corbafwd.h"
 #include "ace/Map.h"
-#include "tao/PortableServerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -48,7 +48,7 @@ protected:
 
 ////////////////////////////////////////////////////////////////////////////////
 
-class TAO_Export TAO_ObjectId_Hash
+class TAO_PortableServer_Export TAO_ObjectId_Hash
 {
   // = TITLE
   //     Hashing class for Object Ids.
@@ -112,7 +112,7 @@ public:
 ////////////////////////////////////////////////////////////////////////////////
 
 #if defined (__ACE_INLINE__)
-# include "tao/Key_Adapters.i"
+# include "Key_Adapters.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/TAO/tao/PortableServer/Key_Adapters.i b/TAO/tao/PortableServer/Key_Adapters.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/PortableServer/Key_Adapters.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile
new file mode 100644
index 00000000000..2363dfdb549
--- /dev/null
+++ b/TAO/tao/PortableServer/Makefile
@@ -0,0 +1,3928 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#----------------------------------------------------------------------------
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+MAKEFILE = Makefile
+LIBNAME  = libTAO_PortableServer
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
+
+ACE_SHLIBS = -lTAO -lACE
+
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
+CPP_SRCS += \
+  PortableServer \
+  PortableServerC \
+  POA \
+  Object_Adapter \
+  Operation_Table \
+  Key_Adapters \
+  POAManager \
+  Active_Object_Map \
+  Servant_Base \
+  Collocated_Object \
+  DomainS \
+  PolicyS \
+  FT_CORBAS \
+  ORB_Manager
+
+ifeq ($(minimum_corba),0)
+
+CPP_SRCS += \
+  Forwarding_Servant \
+  ImplRepoC \
+  ImplRepoS
+
+endif # minimum_corba
+
+ifeq ($(corba_messaging),1)
+
+CPP_SRCS += \
+  MessagingS
+
+endif # corba_messaging
+
+IDL_SRC = \
+        $(addsuffix S.cpp, $(IDL_FILES)) \
+        $(addsuffix C.cpp, $(IDL_FILES))
+FILES = $(CPP_SRCS)
+DEFS  = $(addsuffix .h,$(FILES))
+LSRC  = $(addsuffix .cpp,$(FILES))
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#----------------------------------------------------------------------------
+#       Local targets (and local hacks)
+#----------------------------------------------------------------------------
+
+LDFLAGS += -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/PortableServer.o .obj/PortableServer.so .shobj/PortableServer.o .shobj/PortableServer.so: PortableServer.cpp PortableServer.h \
+ $(ACE_ROOT)/ace/pre.h \
+ portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i Object_Adapter.h Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h Servant_Base.h Servant_Base.i \
+ Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ Object_Adapter.i
+
+.obj/PortableServerC.o .obj/PortableServerC.so .shobj/PortableServerC.o .shobj/PortableServerC.so: PortableServerC.cpp PortableServerC.h \
+ $(ACE_ROOT)/ace/pre.h \
+ portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i POA.h Object_Adapter.h Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h Servant_Base.h Servant_Base.i \
+ Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ Object_Adapter.i POAManager.h POAManager.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ POA.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i
+
+.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp POA.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ Object_Adapter.h portableserver_export.h Key_Adapters.h \
+ PortableServerC.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h Servant_Base.h Servant_Base.i \
+ Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ Object_Adapter.i POAManager.h POAManager.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ POA.i Collocated_Object.h Collocated_Object.i ImplRepoS.h ImplRepoC.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ ImplRepoC.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Acceptor_Filter.h \
+ $(TAO_ROOT)/tao/Acceptor_Filter.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ Forwarding_Servant.h
+
+.obj/Object_Adapter.o .obj/Object_Adapter.so .shobj/Object_Adapter.o .shobj/Object_Adapter.so: Object_Adapter.cpp Object_Adapter.h \
+ $(ACE_ROOT)/ace/pre.h \
+ portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ Key_Adapters.h PortableServerC.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h Servant_Base.h Servant_Base.i \
+ Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ Object_Adapter.i POA.h POAManager.h POAManager.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ POA.i Collocated_Object.h Collocated_Object.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h
+
+.obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp Operation_Table.h \
+ $(ACE_ROOT)/ace/pre.h \
+ portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i
+
+.obj/Key_Adapters.o .obj/Key_Adapters.so .shobj/Key_Adapters.o .shobj/Key_Adapters.so: Key_Adapters.cpp Key_Adapters.h \
+ $(ACE_ROOT)/ace/pre.h \
+ PortableServerC.h portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i
+
+.obj/POAManager.o .obj/POAManager.so .shobj/POAManager.o .shobj/POAManager.so: POAManager.cpp POAManager.h \
+ $(ACE_ROOT)/ace/pre.h \
+ PortableServerC.h portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i poa_macros.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ POAManager.i POA.h Object_Adapter.h Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i Servant_Base.h Servant_Base.i Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ Object_Adapter.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ POA.i
+
+.obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp Active_Object_Map.h \
+ $(ACE_ROOT)/ace/pre.h \
+ Key_Adapters.h PortableServerC.h portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i Servant_Base.h Servant_Base.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
+
+.obj/Servant_Base.o .obj/Servant_Base.so .shobj/Servant_Base.o .shobj/Servant_Base.so: Servant_Base.cpp Servant_Base.h \
+ $(ACE_ROOT)/ace/pre.h \
+ PortableServerC.h portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i Servant_Base.i POA.h Object_Adapter.h \
+ Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ Object_Adapter.i POAManager.h POAManager.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ POA.i Operation_Table.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ Collocated_Object.h Collocated_Object.i \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i
+
+.obj/Collocated_Object.o .obj/Collocated_Object.so .shobj/Collocated_Object.o .shobj/Collocated_Object.so: Collocated_Object.cpp Collocated_Object.h \
+ $(ACE_ROOT)/ace/pre.h \
+ portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Object.i \
+ Collocated_Object.i Object_Adapter.h Key_Adapters.h PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h Servant_Base.h Servant_Base.i \
+ Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ Object_Adapter.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i
+
+.obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h \
+ $(ACE_ROOT)/ace/pre.h \
+ PortableServerC.h portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i POA_CORBA.h Servant_Base.h Servant_Base.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
+ Collocated_Object.h Collocated_Object.i DomainS_T.h DomainS_T.i \
+ DomainS_T.cpp DomainS.i Object_Adapter.h Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ Object_Adapter.i Operation_Table.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i
+
+.obj/PolicyS.o .obj/PolicyS.so .shobj/PolicyS.o .shobj/PolicyS.so: PolicyS.cpp POA_CORBA.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ Servant_Base.h PortableServerC.h portableserver_export.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i Servant_Base.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
+ Object_Adapter.h Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ Object_Adapter.i Operation_Table.h \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+.obj/FT_CORBAS.o .obj/FT_CORBAS.so .shobj/FT_CORBAS.o .shobj/FT_CORBAS.so: FT_CORBAS.cpp FT_CORBAS.h \
+ $(ACE_ROOT)/ace/pre.h \
+ POA_CORBA.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ Servant_Base.h PortableServerC.h portableserver_export.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i Servant_Base.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/ifrfwd.h \
+ $(TAO_ROOT)/tao/InterfaceC.i \
+ $(TAO_ROOT)/tao/ftpoafwd.h \
+ $(TAO_ROOT)/tao/ftcorbafwd.h \
+ $(TAO_ROOT)/tao/FT_CORBAC.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i
+
+.obj/ORB_Manager.o .obj/ORB_Manager.so .shobj/ORB_Manager.o .shobj/ORB_Manager.so: ORB_Manager.cpp ORB_Manager.h \
+ $(ACE_ROOT)/ace/pre.h \
+ PortableServerC.h portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i
+
+.obj/Forwarding_Servant.o .obj/Forwarding_Servant.so .shobj/Forwarding_Servant.o .shobj/Forwarding_Servant.so: Forwarding_Servant.cpp Forwarding_Servant.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ Servant_Base.h PortableServerC.h portableserver_export.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i Servant_Base.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i
+
+.obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h \
+ $(ACE_ROOT)/ace/pre.h \
+ portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ ImplRepoC.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation.i
+
+.obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \
+ $(ACE_ROOT)/ace/pre.h \
+ ImplRepoC.h portableserver_export.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ ImplRepoC.i Servant_Base.h PortableServerC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ PortableServerC.i Servant_Base.i ImplRepoS_T.h ImplRepoS_T.i \
+ ImplRepoS_T.cpp ImplRepoS.i Operation_Table.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ Object_Adapter.h Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ Object_Adapter.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/GIOP_Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/GIOP_Server_Request.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i
+
+.obj/MessagingS.o .obj/MessagingS.so .shobj/MessagingS.o .shobj/MessagingS.so: MessagingS.cpp \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ MessagingS.h PortableServerC.h portableserver_export.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ PortableServerC.i Servant_Base.h Servant_Base.i Collocated_Object.h \
+ Collocated_Object.i \
+ $(TAO_ROOT)/tao/TimeBaseS.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.h \
+ $(TAO_ROOT)/tao/TimeBaseS_T.i \
+ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+ $(TAO_ROOT)/tao/TimeBaseS.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \
+ Operation_Table.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ Object_Adapter.h Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ Key_Adapters.i poa_macros.h Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ Object_Adapter.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Request_Info.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/PortableServer/MessagingS.cpp
index e69e23e68ca..c38a88c80df 100644
--- a/TAO/tao/MessagingS.cpp
+++ b/TAO/tao/PortableServer/MessagingS.cpp
@@ -13,10 +13,10 @@
 
 #include "MessagingS.h"
 #include "Operation_Table.h"
-#include "Server_Request.h"
-#include "Stub.h"
-#include "ORB_Core.h"
 #include "Object_Adapter.h"
+#include "tao/Server_Request.h"
+#include "tao/Stub.h"
+#include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
 #include "MessagingS.i"
@@ -145,9 +145,12 @@ Messaging::ReplyHandler_ptr _TAO_collocation_POA_Messaging_ReplyHandler_Stub_Fac
       return retval;
       }
     case TAO_ORB_Core::DIRECT:
-      if (obj->_servant () != 0)
+      if (obj->_is_local () != 0)
         {
-          POA_Messaging::ReplyHandler *servant = ACE_reinterpret_cast (POA_Messaging::ReplyHandler*, obj->_servant ()->_downcast ("IDL:omg.org/Messaging/ReplyHandler:1.0"));
+          TAO_Collocated_Object *local_object =
+            TAO_Collocated_Object::_narrow (obj);
+
+          POA_Messaging::ReplyHandler *servant = ACE_reinterpret_cast (POA_Messaging::ReplyHandler*, local_object->_servant ()->_downcast ("IDL:omg.org/Messaging/ReplyHandler:1.0"));
           if (servant != 0)
             {
               Messaging::ReplyHandler *retval = 0;
@@ -315,7 +318,7 @@ POA_Messaging::ReplyHandler::_this (CORBA_Environment &ACE_TRY_ENV)
 POA_Messaging::_tao_thru_poa_collocated_ReplyHandler::_tao_thru_poa_collocated_ReplyHandler (
   TAO_Stub *stub
 )
-  :  CORBA_Object (stub, 0, 1)
+  :  CORBA_Object (stub, 1)
 {
 }
 
@@ -326,7 +329,7 @@ CORBA::Boolean POA_Messaging::_tao_thru_poa_collocated_ReplyHandler::_is_a(
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -349,7 +352,7 @@ CORBA::Boolean POA_Messaging::_tao_thru_poa_collocated_ReplyHandler::_non_existe
 
 {
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      *this->_stubobj ()->servant_orb_var ()->orb_core ()->object_adapter ()
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   servant_upcall.prepare_for_upcall (
       this->_object_key (),
@@ -371,7 +374,8 @@ POA_Messaging::_tao_direct_collocated_ReplyHandler::_tao_direct_collocated_Reply
     TAO_Stub *stub
   )
   : ACE_NESTED_CLASS (Messaging,ReplyHandler) (),
-    CORBA_Object (stub, servant, 1),
+    TAO_Collocated_Object (stub, 1, servant),
+    CORBA_Object (stub, 1),
     servant_ (servant)
 {
 }
@@ -385,6 +389,16 @@ CORBA::Boolean POA_Messaging::_tao_direct_collocated_ReplyHandler::_is_a(
   return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV);
 }
 
+void *
+POA_Messaging::_tao_direct_collocated_ReplyHandler::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *value =
+    this->TAO_Collocated_Object::_tao_QueryInterface (type);
+  if (value != 0)
+    return value;
+  return this->ACE_NESTED_CLASS (Messaging, ReplyHandler)::_tao_QueryInterface (type);
+}
+
 
 POA_Messaging::ReplyHandler_ptr POA_Messaging::_tao_direct_collocated_ReplyHandler::_get_servant (void) const
 {
diff --git a/TAO/tao/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h
index 919d32da5f0..f84ebe818ed 100644
--- a/TAO/tao/MessagingS.h
+++ b/TAO/tao/PortableServer/MessagingS.h
@@ -12,15 +12,15 @@
 
 #include "ace/pre.h"
 
-#include "orbconf.h"
+#include "tao/orbconf.h"
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
-#include "TimeBaseS.h"
-#include "MessagingC.h"
 #include "PortableServerC.h"
 #include "Servant_Base.h"
-
+#include "Collocated_Object.h"
+#include "tao/TimeBaseS.h"
+#include "tao/MessagingC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,7 +40,7 @@ TAO_NAMESPACE  POA_Messaging
 
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
-  class TAO_Export ReplyHandler :  public virtual PortableServer::ServantBase
+  class TAO_PortableServer_Export ReplyHandler :  public virtual PortableServer::ServantBase
   {
   protected:
     ReplyHandler (void);
@@ -97,7 +97,7 @@ TAO_NAMESPACE  POA_Messaging
 #if !defined (_MESSAGING_REPLYHANDLER___THRU_POA_COLLOCATED_SH_)
 #define _MESSAGING_REPLYHANDLER___THRU_POA_COLLOCATED_SH_
 
-  class TAO_Export _tao_thru_poa_collocated_ReplyHandler     : public virtual ::Messaging::ReplyHandler
+  class TAO_PortableServer_Export _tao_thru_poa_collocated_ReplyHandler     : public virtual ::Messaging::ReplyHandler
   {
   public:
     _tao_thru_poa_collocated_ReplyHandler (
@@ -121,7 +121,7 @@ TAO_NAMESPACE  POA_Messaging
 #if !defined (_MESSAGING_REPLYHANDLER___DIRECT_COLLOCATED_SH_)
 #define _MESSAGING_REPLYHANDLER___DIRECT_COLLOCATED_SH_
 
-  class TAO_Export _tao_direct_collocated_ReplyHandler     : public virtual Messaging::ReplyHandler
+  class TAO_PortableServer_Export _tao_direct_collocated_ReplyHandler     : public virtual Messaging::ReplyHandler, public virtual TAO_Collocated_Object
   {
   public:
     _tao_direct_collocated_ReplyHandler (
@@ -132,6 +132,7 @@ TAO_NAMESPACE  POA_Messaging
         const CORBA::Char *logical_type_id,
         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
       );
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
 
     ReplyHandler_ptr _get_servant (void) const;
 
@@ -151,7 +152,7 @@ TAO_NAMESPACE  POA_Messaging
 #if defined (ACE_HAS_USING_KEYWORD)
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class TAO_Export ReplyHandler_tie : public ReplyHandler
+  class TAO_PortableServer_Export ReplyHandler_tie : public ReplyHandler
   {
   public:
     ReplyHandler_tie (T &t);
diff --git a/TAO/tao/MessagingS.i b/TAO/tao/PortableServer/MessagingS.i
index d41d475fa1a..9386d854853 100644
--- a/TAO/tao/MessagingS.i
+++ b/TAO/tao/PortableServer/MessagingS.i
@@ -6,4 +6,3 @@
 //
 // Information about TAO is available at:
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
diff --git a/TAO/tao/MessagingS_T.cpp b/TAO/tao/PortableServer/MessagingS_T.cpp
index 44b2c4f35cb..44b2c4f35cb 100644
--- a/TAO/tao/MessagingS_T.cpp
+++ b/TAO/tao/PortableServer/MessagingS_T.cpp
diff --git a/TAO/tao/MessagingS_T.h b/TAO/tao/PortableServer/MessagingS_T.h
index 11c18ac244b..11c18ac244b 100644
--- a/TAO/tao/MessagingS_T.h
+++ b/TAO/tao/PortableServer/MessagingS_T.h
diff --git a/TAO/tao/MessagingS_T.i b/TAO/tao/PortableServer/MessagingS_T.i
index e14ce71aea7..e1ae68c687f 100644
--- a/TAO/tao/MessagingS_T.i
+++ b/TAO/tao/PortableServer/MessagingS_T.i
@@ -12,30 +12,30 @@
 #if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
diff --git a/TAO/tao/TAO.cpp b/TAO/tao/PortableServer/ORB_Manager.cpp
index 634e339d8a8..84cc956600f 100644
--- a/TAO/tao/TAO.cpp
+++ b/TAO/tao/PortableServer/ORB_Manager.cpp
@@ -5,18 +5,15 @@
 // = LIBRARY
 //    tao
 //
-// = FILENAME
-//   TAO.cpp
-//
 // = AUTHOR
 //    Sumedh Mungee <sumedh@cs.wustl.edu>
 //
 // ============================================================================
 
-#include "tao/TAO.h"
+#include "ORB_Manager.h"
 #include "tao/Environment.h"
 
-ACE_RCSID(tao, TAO, "$Id$")
+ACE_RCSID(tao, ORB_Manager, "$Id$")
 
 // constructor
 TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
diff --git a/TAO/tao/TAO.h b/TAO/tao/PortableServer/ORB_Manager.h
index 173e02c7689..959589542d6 100644
--- a/TAO/tao/TAO.h
+++ b/TAO/tao/PortableServer/ORB_Manager.h
@@ -7,30 +7,26 @@
 //    tao
 //
 // = FILENAME
-//   TAO.h
-//
-// = DESCRIPTION
-//   Externally visible TAO extensions.
+//   ORB_Manager.h
 //
 // = AUTHOR
 //    Chris Cleeland
 //
 // ============================================================================
 
-#ifndef TAO_H
-#define TAO_H
+#ifndef TAO_ORB_MANAGER_H
+#define TAO_ORB_MANAGER_H
 #include "ace/pre.h"
 
-#include "tao/corbafwd.h"
+#include "PortableServerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServerC.h"
 #include "tao/ORB.h"
 
-class TAO_Export TAO_ORB_Manager
+class TAO_PortableServer_Export TAO_ORB_Manager
 {
   // = TITLE
   //     Helper class for simple ORB/POA initialization and
@@ -167,4 +163,4 @@ protected:
 
 
 #include "ace/post.h"
-#endif /* TAO_H */
+#endif /* TAO_ORB_MANAGER_H */
diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index bad62d109da..09174a39788 100644
--- a/TAO/tao/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -1,14 +1,18 @@
 // $Id$
 
-#include "tao/Object_Adapter.h"
-#include "tao/POA.h"
+#include "Object_Adapter.h"
+#include "POA.h"
+#include "Collocated_Object.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/Server_Request.h"
+#include "tao/Stub.h"
+#include "tao/Profile.h"
+#include "tao/MProfile.h"
 #include "ace/Auto_Ptr.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Object_Adapter.i"
+# include "Object_Adapter.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(tao, Object_Adapter, "$Id$")
@@ -104,6 +108,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
     non_servant_upcall_condition_ (thread_lock_),
     non_servant_upcall_in_progress_ (0),
     non_servant_upcall_thread_ (ACE_OS::NULL_thread)
+  , root_ (0)
 {
   TAO_Object_Adapter::set_transient_poa_name_size (creation_parameters);
 
@@ -227,7 +232,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);
+  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.
@@ -341,8 +346,9 @@ 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->orb_core_.root_poa (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  TAO_POA *parent = this->root_;
+  // @@ PPOA: this->orb_core_.root_poa (ACE_TRY_ENV);
+  // @@ PPOA: ACE_CHECK_RETURN (-1);
 
   if (parent->name () != *iterator)
     ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
@@ -389,14 +395,15 @@ 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,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        CORBA::Environment &)
 {
   int result = 0;
 
   if (root)
     {
-      poa = this->orb_core_.root_poa (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
+      poa = this->root_;
+      // @@ PPOA: this->orb_core_.root_poa (ACE_TRY_ENV);
+      // @@ PPOA: ACE_CHECK_RETURN (-1);
     }
   else
     {
@@ -493,6 +500,249 @@ TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
   return servant_location;
 }
 
+void
+TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
+{
+  // Only set the auto_ptr if poa_manager is allocated here.
+  auto_ptr<TAO_POA_Manager> safe_poa_manager;
+
+  TAO_POA_Manager *poa_manager;
+  ACE_NEW_THROW_EX (poa_manager,
+                    TAO_POA_Manager (*this),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  ACE_AUTO_PTR_RESET (safe_poa_manager,
+                      poa_manager,
+                      TAO_POA_Manager);
+
+#if 0
+  TAO_POA_Policies root_poa_policies (this->orb_core_,
+                                      ACE_TRY_ENV);
+  ACE_CHECK;
+
+  if (policies == 0)
+    {
+      // RootPOA policies defined in spec
+      root_poa_policies.implicit_activation (
+           PortableServer::IMPLICIT_ACTIVATION);
+
+      policies = &root_poa_policies;
+    }
+#else
+  TAO_POA_Policies policies (this->orb_core_,
+                             ACE_TRY_ENV);
+  ACE_CHECK;
+
+  policies.implicit_activation (PortableServer::IMPLICIT_ACTIVATION);
+#endif /* 0 */
+
+  // Construct a new POA
+  ACE_NEW_THROW_EX (this->root_,
+                    TAO_POA (TAO_DEFAULT_ROOTPOA_NAME,
+                             *poa_manager,
+                             policies,
+                             0,
+                             this->lock (),
+                             this->thread_lock (),
+                             this->orb_core_,
+                             this,
+                             ACE_TRY_ENV),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  // The Object_Adapter will keep a reference to the Root POA so that
+  // on its destruction, it can check whether the Root POA has
+  // been destroyed yet or not.
+  this->root_->_add_ref ();
+
+  // Release the auto_ptr since we got here without error, the TAO_POA
+  // object takes ownership of the POA_Manager object (actually it
+  // shares the ownership with its peers).
+
+  (void) safe_poa_manager.release ();
+}
+
+void
+TAO_Object_Adapter::close (int wait_for_completion,
+                           CORBA::Environment &ACE_TRY_ENV)
+{
+  this->check_close (wait_for_completion, ACE_TRY_ENV);
+  ACE_CHECK;
+
+  // Shutting down the ORB causes all object adapters to be destroyed,
+  // since they cannot exist in the absence of an ORB. Shut down is
+  // complete when all ORB processing (including request processing
+  // and object deactivation or other operations associated with
+  // object adapters) has completed and the object adapters have been
+  // destroyed. In the case of the POA, this means that all object
+  // etherealizations have finished and root POA has been destroyed
+  // (implying that all descendent POAs have also been destroyed).
+  if (this->root_ != 0)
+    {
+      CORBA::Boolean etherealize_objects = 1;
+      this->root_->destroy (etherealize_objects,
+                            wait_for_completion,
+                            ACE_TRY_ENV);
+      ACE_CHECK;
+      CORBA::release (this->root_);
+      this->root_ = 0;
+    }
+}
+
+void
+TAO_Object_Adapter::check_close (int wait_for_completion,
+                                 CORBA::Environment &ACE_TRY_ENV)
+{
+  // @@ Irfan: this seems suspect, say I am in the middle of an upcall
+  // to ORB A, and I decide to shutdown ORB B as part of that, does
+  // this global function have enough context to verify that this is
+  // valid?  IMHO it should be a method in the Object_Adapter, that
+  // only bails out if we are in the middle of an upcall to its
+  // ORB. Comments?
+  TAO_POA::check_for_valid_wait_for_completions (wait_for_completion,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+int
+TAO_Object_Adapter::priority (void) const
+{
+  return 0;
+}
+
+int
+TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
+                              CORBA::ServerRequest &request,
+                              void *context,
+                              CORBA::Object_out forward_to,
+                              CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (ACE_OS::memcmp (key.get_buffer (),
+                      &TAO_POA::objectkey_prefix[0],
+                      TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
+    {
+      return TAO_Adapter::DS_MISMATCHED_KEY;
+    }
+
+  ACE_TRY
+    {
+      this->dispatch_servant (key,
+                              request,
+                              context,
+                              ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
+    {
+      forward_to =
+        CORBA::Object::_duplicate (forward_request.forward_reference.in ());
+      return TAO_Adapter::DS_FORWARD;
+    }
+  ACE_ENDTRY;
+
+  return TAO_Adapter::DS_OK;
+}
+
+const char *
+TAO_Object_Adapter::name (void) const
+{
+  return TAO_OBJID_ROOTPOA;
+}
+
+CORBA::Object_ptr
+TAO_Object_Adapter::root (void)
+{
+  return CORBA::Object::_duplicate (this->root_);
+}
+
+CORBA::Object_ptr
+TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
+                                              const TAO_MProfile &mp)
+{
+  for (TAO_PHandle j = 0;
+       j != mp.profile_count ();
+       ++j)
+    {
+      const TAO_Profile *profile = mp.get_profile (j);
+      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)
+        continue;
+
+      ACE_DECLARE_NEW_CORBA_ENV;
+      ACE_TRY
+        {
+          TAO_ServantBase *servant = 0;
+
+          TAO_SERVANT_LOCATION servant_location =
+            this->find_servant (objkey.in (),
+                                servant,
+                                ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          if (servant_location != TAO_SERVANT_NOT_FOUND)
+            {
+              // Found collocated object.  Perhaps we can get around
+              // by simply setting the servant_orb, but let get this
+              // to work first.
+
+              // There could only be one ORB which is us.
+
+              // @@ Do not duplicate the ORB here!
+              //    TAO_Stub::servant_orb()  duplicates it.
+              //       -Ossama
+              stub->servant_orb (this->orb_core_.orb ());
+
+              CORBA::Object_ptr x;
+              ACE_NEW_RETURN (x,
+                              TAO_Collocated_Object (stub, 1,
+                                                     servant),
+                              0);
+              return x;
+            }
+        }
+      ACE_CATCHANY
+        {
+          // Ignore the exception and continue with the next one.
+        }
+      ACE_ENDTRY;
+    }
+
+  return 0;
+}
+
+// ****************************************************************
+
+TAO_Object_Adapter_Factory::TAO_Object_Adapter_Factory (void)
+{
+}
+
+TAO_Adapter*
+TAO_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;
+  orb_core->poa_current (current.in ());
+
+  return new TAO_Object_Adapter (orb_core->server_factory ()->
+                                    active_object_map_creation_parameters (),
+                                 *orb_core);
+}
+
+ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Object_Adapter_Factory)
+ACE_STATIC_SVC_DEFINE (TAO_Object_Adapter_Factory,
+                       ACE_TEXT ("TAO_POA"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_Object_Adapter_Factory),
+                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+                       0)
+
+// ****************************************************************
+
 TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy (void)
 {
 }
@@ -746,8 +996,9 @@ TAO_Object_Adapter::Non_Servant_Upcall::~Non_Servant_Upcall (void)
     this->object_adapter_.non_servant_upcall_condition_.broadcast ();
 }
 
-TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_Object_Adapter &object_adapter)
-  : object_adapter_ (object_adapter),
+// @@ PPOA TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_Object_Adapter &object_adapter)
+TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_ORB_Core *oc)
+  : object_adapter_ (0),
     poa_ (0),
     servant_ (0),
     state_ (INITIAL_STAGE),
@@ -760,6 +1011,10 @@ TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_Object_Adapter &object_a
     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;
 }
 
 void
@@ -768,7 +1023,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
                                                         CORBA::Environment &ACE_TRY_ENV)
 {
   // Acquire the object adapter lock first.
-  int result = this->object_adapter_.lock ().acquire ();
+  int result = this->object_adapter_->lock ().acquire ();
   if (result == -1)
     // Locking error.
     ACE_THROW (CORBA::OBJ_ADAPTER ());
@@ -780,11 +1035,11 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   // 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_TRY_ENV);
+  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (ACE_TRY_ENV);
   ACE_CHECK;
 
   // Locate the POA.
-  this->object_adapter_.locate_poa (key,
+  this->object_adapter_->locate_poa (key,
                                     this->id_,
                                     this->poa_,
                                     ACE_TRY_ENV);
@@ -827,7 +1082,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   this->poa_->increment_outstanding_requests ();
 
   // Release the object adapter lock.
-  this->object_adapter_.lock ().release ();
+  this->object_adapter_->lock ().release ();
 
   // We have release the object adapater lock.  Record this for later
   // use.
@@ -863,7 +1118,7 @@ TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall ()
       //
       // Note that errors are ignored here since we cannot do much
       // with it.
-      this->object_adapter_.lock ().acquire ();
+      this->object_adapter_->lock ().acquire ();
 
       // Cleanup servant related state.
       this->servant_cleanup ();
@@ -880,7 +1135,7 @@ TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall ()
     case OBJECT_ADAPTER_LOCK_ACQUIRED:
       // Finally, since the object adapter lock was acquired, we must
       // release it.
-      this->object_adapter_.lock ().release ();
+      this->object_adapter_->lock ().release ();
 
       /* FALLTHRU */
     case INITIAL_STAGE:
@@ -1009,7 +1264,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_cleanup (void)
           ACE_ENDTRY;
 
           if (this->poa_->waiting_servant_deactivation_ > 0 &&
-              this->object_adapter_.enable_locking_)
+              this->object_adapter_->enable_locking_)
             {
               // Wakeup all waiting threads.
               this->poa_->servant_deactivation_condition_.broadcast ();
@@ -1033,7 +1288,7 @@ TAO_Object_Adapter::Servant_Upcall::poa_cleanup (void)
   if (outstanding_requests == 0)
     {
       // If locking is enabled and some thread is waiting in POA::destroy.
-      if (this->object_adapter_.enable_locking_ &&
+      if (this->object_adapter_->enable_locking_ &&
           this->poa_->wait_for_completion_pending_)
         {
           // Wakeup all waiting threads.
@@ -1260,7 +1515,8 @@ TAO_POA_Current::get_object_id (CORBA::Environment &ACE_TRY_ENV)
 TAO_POA_Current_Impl *
 TAO_POA_Current::implementation (void)
 {
-  return TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
+  return ACE_static_cast (TAO_POA_Current_Impl *,
+                          TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 }
 
 TAO_POA_Current_Impl *
@@ -1269,7 +1525,9 @@ TAO_POA_Current::implementation (TAO_POA_Current_Impl *new_current)
   TAO_TSS_Resources *tss =
     TAO_TSS_RESOURCES::instance ();
 
-  TAO_POA_Current_Impl *old = tss->poa_current_impl_;
+  TAO_POA_Current_Impl *old =
+    ACE_static_cast (TAO_POA_Current_Impl *,
+                     tss->poa_current_impl_);
   tss->poa_current_impl_ = new_current;
   return old;
 }
diff --git a/TAO/tao/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 2f9e0f1737d..546e6bbba0a 100644
--- a/TAO/tao/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -18,18 +18,25 @@
 #define TAO_OBJECT_ADAPTER_H
 #include "ace/pre.h"
 
-#include "tao/Key_Adapters.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/poa_macros.h"
+#include "portableserver_export.h"
+#include "Key_Adapters.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "poa_macros.h"
 // Stubs
-#include "tao/PortableServerC.h"
+#include "PortableServerC.h"
 
 // Servant
-#include "tao/Servant_Base.h"
+#include "Servant_Base.h"
 
 // Active Object Table
-#include "tao/Active_Object_Map.h"
+#include "Active_Object_Map.h"
+
+#include "tao/Adapter.h"
+#include "tao/Server_Strategy_Factory.h"
 
 // RTCORBA
 #include "tao/RTCORBAC.h"
@@ -37,10 +44,6 @@
 // Local Object
 #include "tao/LocalObject.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -48,7 +51,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-////////////////////////////////////////////////////////////////////////////////
+// ****************************************************************
 
 // Forward declaration
 class TAO_POA;
@@ -58,7 +61,7 @@ class TAO_POA_Current_Impl;
 class TAO_TSS_Resources;
 class TAO_Transport;
 
-class TAO_Export TAO_POA_Current :
+class TAO_PortableServer_Export TAO_POA_Current :
   public PortableServer::Current,
   public TAO_Local_RefCounted_Object
 {
@@ -88,7 +91,7 @@ public:
   // returning a pointer to the existing POA Current state.
 };
 
-class TAO_Export TAO_POA_Current_Impl
+class TAO_PortableServer_Export TAO_POA_Current_Impl
 {
   // = TITLE
   //
@@ -130,7 +133,7 @@ public:
   // Set the POA implementation.
 
   TAO_POA *poa (void) const;
-  // Get the POA imeplemantation
+  // Get the POA implemantation
 
   TAO_ORB_Core &orb_core (void) const;
   // ORB Core for this current.
@@ -187,7 +190,8 @@ protected:
   CORBA::Short priority_;
   // The priority for the current upcall.
 
-  TAO_POA_Current_Impl *previous_current_impl_;
+  // PPOA: TAO_POA_Current_Impl *previous_current_impl_;
+  void *previous_current_impl_;
   // Current previous from <this>.
 
   int setup_done_;
@@ -201,7 +205,7 @@ protected:
   void operator= (const TAO_POA_Current_Impl &);
 };
 
-class TAO_Export TAO_Object_Adapter
+class TAO_PortableServer_Export TAO_Object_Adapter : public TAO_Adapter
 {
   // = TITLE
   //     Defines the Object Adapter abstraction.
@@ -260,10 +264,33 @@ public:
 
   ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void);
 
+  TAO_POA *root_poa (void) const;
+  // Access the root poa.
+
   void wait_for_non_servant_upcalls_to_complete (CORBA::Environment &ACE_TRY_ENV);
 
   static CORBA::ULong transient_poa_name_size (void);
 
+
+  // = The TAO_Adapter methods, please check tao/Adapter.h for the
+  // documentation
+  virtual void open (CORBA::Environment &ACE_TRY_ENV);
+  virtual void close (int wait_for_completion,
+                      CORBA::Environment &ACE_TRY_ENV);
+  virtual void check_close (int wait_for_completion,
+                            CORBA::Environment &ACE_TRY_ENV);
+  virtual int priority (void) const;
+  virtual int dispatch (TAO_ObjectKey &key,
+                        CORBA::ServerRequest &request,
+                        void *context, /* unused? */
+                        CORBA::Object_out foward_to,
+                        CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual const char *name (void) const;
+  virtual CORBA::Object_ptr root (void);
+  virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
+                                                      const TAO_MProfile &);
+
 protected:
 
   int locate_servant_i (const TAO_ObjectKey &key,
@@ -310,7 +337,7 @@ protected:
 
 public:
 
-  class TAO_Export Hint_Strategy
+  class TAO_PortableServer_Export Hint_Strategy
   {
     // = TITLE
     //     Base class for POA active hint strategy.
@@ -340,7 +367,7 @@ public:
     TAO_Object_Adapter *object_adapter_;
   };
 
-  class TAO_Export Active_Hint_Strategy : public Hint_Strategy
+  class TAO_PortableServer_Export Active_Hint_Strategy : public Hint_Strategy
   {
     // = TITLE
     //     This class uses active demux hint for POA active hint
@@ -376,7 +403,7 @@ public:
     persistent_poa_system_map persistent_poa_system_map_;
   };
 
-  class TAO_Export No_Hint_Strategy : public Hint_Strategy
+  class TAO_PortableServer_Export No_Hint_Strategy : public Hint_Strategy
   {
     // = TITLE
     //     This class doesn't use any hints for POA active hint
@@ -488,7 +515,7 @@ protected:
 
 public:
 
-  class TAO_Export poa_name_iterator
+  class TAO_PortableServer_Export poa_name_iterator
   {
     // = TITLE
     //     Iterator for a folded poa name.
@@ -517,7 +544,7 @@ public:
     CORBA::ULong last_separator_;
   };
 
-  class TAO_Export iteratable_poa_name
+  class TAO_PortableServer_Export iteratable_poa_name
   {
     // = TITLE
     //     This class allows iteration over a folded poa name.
@@ -535,7 +562,7 @@ public:
     const poa_name &folded_name_;
   };
 
-  class TAO_Export Non_Servant_Upcall
+  class TAO_PortableServer_Export Non_Servant_Upcall
   {
     // = TITLE
     //     This class helps us with a recursive thread lock without
@@ -563,7 +590,7 @@ public:
 
   friend class Non_Servant_Upcall;
 
-  class TAO_Export Servant_Upcall
+  class TAO_PortableServer_Export Servant_Upcall
   {
     // = TITLE
     //     This class finds out the POA and the servant to perform an
@@ -573,7 +600,8 @@ public:
 
     friend class TAO_POA;
 
-    Servant_Upcall (TAO_Object_Adapter &object_adapter);
+    // @@ PPOA: Servant_Upcall (TAO_Object_Adapter &object_adapter);
+    Servant_Upcall (TAO_ORB_Core *orb_core);
     // Constructor.
 
     ~Servant_Upcall (void);
@@ -629,7 +657,7 @@ public:
     void servant_cleanup (void);
     void poa_cleanup (void);
 
-    TAO_Object_Adapter &object_adapter_;
+    TAO_Object_Adapter *object_adapter_;
 
     TAO_POA *poa_;
 
@@ -676,7 +704,7 @@ public:
 
 #if (TAO_HAS_RT_CORBA == 1)
 
-  class TAO_Export Priority_Model_Processing
+  class TAO_PortableServer_Export Priority_Model_Processing
   {
     // = TITLE
     //     This class encapsulates processing necessary for
@@ -734,13 +762,32 @@ public:
   };
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
+
+private:
+  TAO_POA *root_;
+  // The Root POA
+};
+
+// ****************************************************************
+
+class TAO_PortableServer_Export TAO_Object_Adapter_Factory : public TAO_Adapter_Factory
+{
+public:
+  TAO_Object_Adapter_Factory (void);
+  // Constructor
+
+  // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for
+  // details.
+  virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
 };
 
+ACE_STATIC_SVC_DECLARE (TAO_Object_Adapter_Factory)
+ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory)
 
-////////////////////////////////////////////////////////////////////////////////
+// ****************************************************************
 
 #if defined (__ACE_INLINE__)
-# include "tao/Object_Adapter.i"
+# include "Object_Adapter.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/TAO/tao/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index 2862b7d2d11..1a2584d803f 100644
--- a/TAO/tao/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -131,6 +131,14 @@ TAO_Object_Adapter::unbind_persistent_poa (const poa_name &folded_name,
                                                       system_name);
 }
 
+ACE_INLINE TAO_POA *
+TAO_Object_Adapter::root_poa (void) const
+{
+  return this->root_;
+}
+
+// ****************************************************************
+
 ACE_INLINE TAO_POA &
 TAO_Object_Adapter::Servant_Upcall::poa (void) const
 {
@@ -146,7 +154,7 @@ TAO_Object_Adapter::Servant_Upcall::servant (void) const
 ACE_INLINE TAO_Object_Adapter &
 TAO_Object_Adapter::Servant_Upcall::object_adapter (void) const
 {
-  return this->object_adapter_;
+  return *this->object_adapter_;
 }
 
 ACE_INLINE const PortableServer::ObjectId &
diff --git a/TAO/tao/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp
index 8d0e56b30fa..bc8c58c5064 100644
--- a/TAO/tao/Operation_Table.cpp
+++ b/TAO/tao/PortableServer/Operation_Table.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Operation_Table.h"
+#include "Operation_Table.h"
 #include "tao/Timeprobe.h"
 #include "tao/ORB.h"
 
diff --git a/TAO/tao/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h
index bcc2ab32ce5..5619abcf45a 100644
--- a/TAO/tao/Operation_Table.h
+++ b/TAO/tao/PortableServer/Operation_Table.h
@@ -18,7 +18,8 @@
 #define TAO_OPTABLE_H
 #include "ace/pre.h"
 
-#include "ace/Hash_Map_Manager.h"
+#include "portableserver_export.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,7 +27,7 @@
 
 #include "tao/TAO_Singleton.h"
 #include "ace/Synch.h"
-#include "tao/corbafwd.h"
+#include "ace/Hash_Map_Manager.h"
 
 class TAO_operation_db_entry
 {
@@ -42,7 +43,7 @@ public:
   // skeleton pointer
 };
 
-class TAO_Export TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Operation_Table
 {
   // = TITLE
   //     Abstract class for maintaining and lookup of CORBA IDL
@@ -63,7 +64,7 @@ public:
   virtual ~TAO_Operation_Table (void);
 };
 
-class TAO_Export TAO_Operation_Table_Factory
+class TAO_PortableServer_Export TAO_Operation_Table_Factory
 {
   // = TITLE
   //   Factory for producing operation table lookup objects based on
@@ -79,7 +80,7 @@ public:
   // destructor
 };
 
-class TAO_Export TAO_Operation_Table_Parameters
+class TAO_PortableServer_Export TAO_Operation_Table_Parameters
 {
   // = TITLE
   //    Parameters used to create the operation table.
@@ -122,7 +123,7 @@ private:
   // the enumerated value indicating the lookup strategy
 };
 
-class TAO_Export TAO_Dynamic_Hash_OpTable : public TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Dynamic_Hash_OpTable : public TAO_Operation_Table
 {
   // = TITLE
   //     Dynamic Hashing scheme for CORBA IDL operation name lookup.
@@ -166,7 +167,7 @@ private:
   // The hash table data structure.
 };
 
-class TAO_Export TAO_Linear_Search_OpTable : public TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Linear_Search_OpTable : public TAO_Operation_Table
 {
   // = TITLE
   //    Operation table lookup strategy based on
@@ -197,7 +198,7 @@ private:
   virtual const TAO_operation_db_entry* lookup (const char *str) = 0;
 };
 
-class TAO_Export TAO_Active_Demux_OpTable_Entry
+class TAO_PortableServer_Export TAO_Active_Demux_OpTable_Entry
 {
   // = TITLE
   //   Active Demux lookup table entry.
@@ -213,7 +214,7 @@ public:
   // Skeleton pointer corresponding to the index.
 };
 
-class TAO_Export TAO_Active_Demux_OpTable : public TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Active_Demux_OpTable : public TAO_Operation_Table
 {
   // = TITLE
   //   Implements the active demultiplexed lookup strategy. The key is
@@ -249,7 +250,7 @@ private:
   // internal lookup table
 };
 
-class TAO_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table
 {
   // = TITLE
   //     Helper class  for use of perfect hashing operation lookup
@@ -289,7 +290,7 @@ private:
   virtual const TAO_operation_db_entry* lookup (const char *str, unsigned int len) = 0;
 };
 
-class TAO_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table
 {
   // = TITLE
   //     Helper class for using binary search operatin lookup strategy
diff --git a/TAO/tao/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 28ba3bb0243..01850a01571 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -1,9 +1,16 @@
 // @(#) $Id$
 
-// auto_ptr class
-#include "ace/Auto_Ptr.h"
+#include "POA.h"
+#include "Collocated_Object.h"
+
+//
+// ImplRepo related.
+//
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+# include "ImplRepoS.h"
+# include "ImplRepoC.h"
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
-#include "tao/POA.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/Server_Strategy_Factory.h"
@@ -13,15 +20,10 @@
 #include "tao/debug.h"
 
 #include "tao/RT_Policy_i.h"
+#include "tao/Acceptor_Filter.h"
 
-//
-// ImplRepo related.
-//
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-# include "tao/ImplRepoC.h"
-# include "tao/ImplRepoS.h"
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
+// auto_ptr class
+#include "ace/Auto_Ptr.h"
 
 //
 // ImplRepo related.
@@ -77,10 +79,10 @@ private:
 
 
 // Forwarding Servant class
-#include "tao/Forwarding_Servant.h"
+#include "Forwarding_Servant.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/POA.i"
+# include "POA.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID(tao, POA, "$Id$")
@@ -104,6 +106,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
                   ACE_Lock &lock,
                   ACE_SYNCH_MUTEX &thread_lock,
                   TAO_ORB_Core &orb_core,
+                  TAO_Object_Adapter *object_adapter,
                   CORBA::Environment &ACE_TRY_ENV)
   : name_ (name),
     poa_manager_ (poa_manager),
@@ -136,6 +139,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
     system_id_ (policies.id_assignment () == PortableServer::SYSTEM_ID),
     creation_time_ (ACE_OS::gettimeofday ()),
     orb_core_ (orb_core),
+    object_adapter_ (object_adapter),
     cleanup_in_progress_ (0),
     etherealize_objects_ (1),
     outstanding_requests_ (0),
@@ -349,6 +353,7 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
                              this->object_adapter ().lock (),
                              this->object_adapter ().thread_lock (),
                              this->orb_core_,
+                             this->object_adapter_,
                              ACE_TRY_ENV),
                     CORBA::NO_MEMORY ());
 
@@ -534,7 +539,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
       if (this->server_object_)
         {
-          TAO_POA *root_poa = this->orb_core ().root_poa ();
+          TAO_POA *root_poa = this->object_adapter ().root_poa ();
 
           PortableServer::ObjectId_var id =
             root_poa->servant_to_id_i (this->server_object_, ACE_TRY_ENV);
@@ -1067,7 +1072,8 @@ TAO_POA::check_for_valid_wait_for_completions (CORBA::Boolean wait_for_completio
   if (wait_for_completion)
     {
       TAO_POA_Current_Impl *poa_current_impl =
-        TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
+        ACE_static_cast(TAO_POA_Current_Impl *,
+                        TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 
       // This thread cannot currently be in an upcall.
       if (poa_current_impl != 0)
@@ -1591,7 +1597,8 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant,
           // If they are the same servant, then check if we are in an
           // upcall.
           TAO_POA_Current_Impl *poa_current_impl =
-            TAO_TSS_RESOURCES::instance ()->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 &&
@@ -2952,86 +2959,7 @@ TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id)
 TAO_Object_Adapter &
 TAO_POA::object_adapter (void)
 {
-  return *this->orb_core_.object_adapter ();
-}
-
-void
-TAO_POA::encode_sequence_to_string (char * &str,
-                                    const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
-{
-  // We must allocate a buffer which is (gag) 3 times the length
-  // of the sequence, which is the length required in the worst-case
-  // scenario of all non-printable characters.
-  //
-  // There are two strategies here...we could allocate all that space here,
-  // fill it up, then copy-allocate new space of just the right length.
-  // OR, we could just return this space.  The classic time-space tradeoff,
-  // and for now we'll let time win out, which means that we only do the
-  // allocation once.
-  u_int len = 3 * seq.length (); /* space for zero termination not needed */;
-  str = CORBA::string_alloc (len);
-
-  char *cp = str;
-
-  for (u_int i = 0;
-       cp < (cp + len) && i < seq.length();
-       ++i)
-    {
-      u_char byte = seq[i];
-      if (isprint (byte) && byte != '\\')
-        {
-          *cp++ = (char) byte;
-          continue;
-        }
-
-      *cp++ = '\\';
-      *cp++ = ACE::nibble2hex ((byte >> 4) & 0x0f);
-      *cp++ = ACE::nibble2hex (byte & 0x0f);
-    }
-  // Zero terminate
-  *cp = '\0';
-}
-
-void
-TAO_POA::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                    const char *str)
-{
-  if (str == 0)
-    {
-      seq.length (0);
-      return;
-    }
-
-  u_int length = ACE_OS::strlen (str);
-  const char *eos = str + length;
-  const char *cp = str;
-
-  // Set the length of the sequence to be as long as
-  // we'll possibly need...we'll reset it to the actual
-  // length later.
-  seq.length (length);
-
-  u_int i = 0;
-  for (;
-       cp < eos && i < seq.length ();
-       i++)
-    {
-      if (*cp == '\\')
-        {
-          // This is an escaped non-printable,
-          // so we decode the hex values into
-          // the sequence's octet
-          seq[i] = (u_char) (ACE::hex2byte (cp[1]) << 4);
-          seq[i] |= (u_char) ACE::hex2byte (cp[2]);
-          cp += 3;
-        }
-      else
-        // Copy it in
-        seq[i] = *cp++;
-    }
-
-  // Set the length appropriately
-  seq.length (i);
+  return *this->object_adapter_;
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -3878,6 +3806,43 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+
+#if (TAO_HAS_RT_CORBA == 1)
+
+// @@ We may want to move this class to its own file, but it is only
+// used here.
+
+class TAO_Server_Policy_Acceptor_Filter : public TAO_Acceptor_Filter
+{
+public:
+  TAO_Server_Policy_Acceptor_Filter (RTCORBA::ProtocolList &protocols);
+
+  virtual int evaluate (TAO_Acceptor *acceptor);
+
+private:
+  RTCORBA::ProtocolList &protocols_;
+};
+
+TAO_Server_Policy_Acceptor_Filter::
+TAO_Server_Policy_Acceptor_Filter (RTCORBA::ProtocolList &protocols)
+  :  protocols_ (protocols)
+{
+}
+
+int
+TAO_Server_Policy_Acceptor_Filter::evaluate (TAO_Acceptor *acceptor)
+{
+  for (CORBA::ULong j = 0;
+       j != this->protocols_.length ();
+       ++j)
+    {
+      if (acceptor->tag () ==  this->protocols_[j].protocol_type)
+        return 1;
+    }
+  return 0;
+}
+#endif /* TAO_HAS_RT_CORBA == 1 */
+
 CORBA::Object_ptr
 TAO_POA::key_to_object (const TAO_ObjectKey &key,
                         const char *type_id,
@@ -3886,6 +3851,12 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
                         CORBA::Short priority,
                         CORBA_Environment &ACE_TRY_ENV)
 {
+  // 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_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
   CORBA::Object_ptr obj = CORBA::Object::_nil ();
 
   //
@@ -3937,7 +3908,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
       // Add the key.
 
       CORBA::String_var key_str;
-      TAO_POA::encode_sequence_to_string (key_str.inout (), key);
+      TAO_ObjectKey::encode_sequence_to_string (key_str.inout (), key);
 
       ior += key_str.in ();
 
@@ -3956,21 +3927,93 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
 orbkey:
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
+  TAO_Stub *data =
+    this->key_to_stub_i (key, type_id, priority, ACE_TRY_ENV);
+  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,
+                        TAO_Collocated_Object (safe_data.get (),
+                                               collocated,
+                                               servant),
+                        CORBA::INTERNAL ());
+      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    }
+  else
+    {
+      ACE_NEW_THROW_EX (tmp,
+                        CORBA_Object (safe_data.get (),
+                                      collocated),
+                        CORBA::INTERNAL ());
+      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    }
+
+  safe_data.get ()->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,
+                      CORBA_Environment &ACE_TRY_ENV)
+{
+  // 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_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  return this->key_to_stub_i (key, type_id, priority, ACE_TRY_ENV);
+}
+
+TAO_Stub *
+TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
+                        const char *type_id,
+                        CORBA::Short priority,
+                        CORBA_Environment &ACE_TRY_ENV)
+{
   CORBA::PolicyList_var client_exposed_policies =
     this->client_exposed_policies (priority,
                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (obj);
+  ACE_CHECK_RETURN (0);
 
-  obj = this->orb_core_.orb ()->key_to_object (key,
-                                               type_id,
-                                               client_exposed_policies._retn (),
-                                               servant,
-                                               collocated,
-                                               this,
-                                               ACE_TRY_ENV);
-  ACE_CHECK_RETURN (obj);
+  // By default all the acceptors are useful, but with RT CORBA we
+  // must only accept the protocols configured in the POA.
+  TAO_Acceptor_Filter *filter = 0;
+
+#if (TAO_HAS_RT_CORBA == 1)
+
+  // RTCORBA 1.0, Section 4.15.1: ServerProtocolPolicy determines
+  // which protocols get included into IOR and in what order.
+  TAO_ServerProtocolPolicy *policy =
+    this->policies ().server_protocol ();
+  RTCORBA::ProtocolList & protocols = policy->protocols_rep ();
 
-  return obj;
+  TAO_Server_Policy_Acceptor_Filter real_filter (protocols);
+  filter = &real_filter;
+
+#endif /* TAO_HAS_RT_CORBA == 1 */
+
+  TAO_Stub *data =
+    this->orb_core_.create_stub_object (key,
+                                        type_id,
+                                        client_exposed_policies._retn (),
+                                        filter,
+                                        ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  return data;
 }
 
 CORBA::PolicyList *
@@ -3986,7 +4029,7 @@ TAO_POA::client_exposed_policies (CORBA::Short object_priority,
                     CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
-  
+
   client_exposed_policies->length (client_exposed_fixed_policies.length ());
 
   for (CORBA::ULong i = 0;
@@ -4060,7 +4103,7 @@ TAO_POA::imr_notify_startup (CORBA_Environment &ACE_TRY_ENV)
   ACE_CHECK;
 
   // Activate the servant in the root poa.
-  TAO_POA *root_poa = this->orb_core ().root_poa ();
+  TAO_POA *root_poa = this->object_adapter ().root_poa ();
   PortableServer::ObjectId_var id =
     root_poa->activate_object_i (this->server_object_,
                                  TAO_INVALID_PRIORITY,
@@ -4173,11 +4216,6 @@ template class auto_ptr<TAO_Forwarding_Servant>;
 template class ACE_Auto_Basic_Ptr<TAO_POA>;
 template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
 template class ACE_Auto_Basic_Ptr<TAO_POA_Manager>;
-template class ACE_Lock_Adapter<ACE_Null_Mutex>;
-#if defined (ACE_HAS_THREADS)
-template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>;
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-#endif /* ACE_HAS_THREADS */
 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>;
@@ -4215,11 +4253,6 @@ template class ACE_Node<TAO_POA *>;
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_POA>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_POA_Manager>
-#pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex>
-#if defined (ACE_HAS_THREADS)
-#pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-#endif /* ACE_HAS_THREADS */
 #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>
diff --git a/TAO/tao/POA.h b/TAO/tao/PortableServer/POA.h
index 3769935f6b6..de2d9860346 100644
--- a/TAO/tao/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -28,30 +28,30 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// Map
-#include "ace/Hash_Map_Manager.h"
-
-// Vector
-#include "ace/Containers.h"
-
-// Locking
-#include "ace/Synch.h"
-
 // Object Adapter
-#include "tao/Object_Adapter.h"
+#include "Object_Adapter.h"
+
+// POA Manager
+#include "POAManager.h"
 
 // Object_Key
 #include "tao/Object_KeyC.h"
 
-// POA Manager
-#include "tao/POAManager.h"
-
 // RT CORBA
 #include "tao/RTCORBAC.h"
 
 // Local Object
 #include "tao/LocalObject.h"
 
+// Map
+#include "ace/Hash_Map_Manager.h"
+
+// Vector
+#include "ace/Containers.h"
+
+// Locking
+#include "ace/Synch.h"
+
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
@@ -66,7 +66,7 @@ class TAO_ServerProtocolPolicy;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-class TAO_Export TAO_Thread_Policy :
+class TAO_PortableServer_Export TAO_Thread_Policy :
   public PortableServer::ThreadPolicy,
   public TAO_Local_RefCounted_Object
 {
@@ -91,7 +91,7 @@ protected:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-class TAO_Export TAO_Lifespan_Policy :
+class TAO_PortableServer_Export TAO_Lifespan_Policy :
   public PortableServer::LifespanPolicy,
   public TAO_Local_RefCounted_Object
 {
@@ -114,7 +114,7 @@ protected:
   PortableServer::LifespanPolicyValue value_;
 };
 
-class TAO_Export TAO_Id_Uniqueness_Policy :
+class TAO_PortableServer_Export TAO_Id_Uniqueness_Policy :
   public PortableServer::IdUniquenessPolicy,
   public TAO_Local_RefCounted_Object
 {
@@ -137,7 +137,7 @@ protected:
   PortableServer::IdUniquenessPolicyValue value_;
 };
 
-class TAO_Export TAO_Id_Assignment_Policy :
+class TAO_PortableServer_Export TAO_Id_Assignment_Policy :
   public PortableServer::IdAssignmentPolicy,
   public TAO_Local_RefCounted_Object
 {
@@ -162,7 +162,7 @@ protected:
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-class TAO_Export TAO_Implicit_Activation_Policy :
+class TAO_PortableServer_Export TAO_Implicit_Activation_Policy :
   public PortableServer::ImplicitActivationPolicy,
   public TAO_Local_RefCounted_Object
 {
@@ -185,7 +185,7 @@ protected:
   PortableServer::ImplicitActivationPolicyValue value_;
 };
 
-class TAO_Export TAO_Servant_Retention_Policy :
+class TAO_PortableServer_Export TAO_Servant_Retention_Policy :
   public PortableServer::ServantRetentionPolicy,
   public TAO_Local_RefCounted_Object
 {
@@ -208,7 +208,7 @@ protected:
   PortableServer::ServantRetentionPolicyValue value_;
 };
 
-class TAO_Export TAO_Request_Processing_Policy :
+class TAO_PortableServer_Export TAO_Request_Processing_Policy :
   public PortableServer::RequestProcessingPolicy,
   public TAO_Local_RefCounted_Object
 {
@@ -233,7 +233,7 @@ protected:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-class TAO_Export TAO_POA_Policies
+class TAO_PortableServer_Export TAO_POA_Policies
 {
 public:
 
@@ -393,7 +393,7 @@ protected:
 // Forward Declaration
 class ServerObject_i;
 
-class TAO_Export TAO_POA :
+class TAO_PortableServer_Export TAO_POA :
   public PortableServer::POA,
   public TAO_Local_RefCounted_Object
 {
@@ -629,11 +629,6 @@ public:
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   // Utility functions for the other
-  static void encode_sequence_to_string (char * &str,
-                                         const TAO_Unbounded_Sequence<CORBA::Octet> &seq);
-  static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
-                                         const char *str);
-
   static char* ObjectId_to_string (const PortableServer::ObjectId &id);
 
   static CORBA::WChar* ObjectId_to_wstring (const PortableServer::ObjectId &id);
@@ -652,6 +647,7 @@ public:
            ACE_Lock &lock,
            ACE_SYNCH_MUTEX &thread_lock,
            TAO_ORB_Core &orb_core,
+           TAO_Object_Adapter *object_adapter,
            CORBA_Environment &ACE_TRY_ENV);
 
   ~TAO_POA (void);
@@ -683,6 +679,14 @@ public:
 
   ACE_Lock &lock (void);
 
+
+  TAO_Stub* key_to_stub (const TAO_ObjectKey &key,
+                         const char *type_id,
+                         CORBA::Short priority,
+                         CORBA_Environment &ACE_TRY_ENV);
+  // Create the correct stub, properly initialized with the attributes
+  // and policies attached to the current POA.
+
 protected:
 
   const ACE_CString &name (void) const;
@@ -764,6 +768,12 @@ protected:
   // Wrapper for the ORB's key_to_object that will alter the object pointer
   // if the ImplRepo is used.
 
+  TAO_Stub* key_to_stub_i (const TAO_ObjectKey &key,
+                           const char *type_id,
+                           CORBA::Short priority,
+                           CORBA_Environment &ACE_TRY_ENV);
+  // Like key_to_stub() but assume that the ORB is not shutting down.
+
   int is_servant_in_map (PortableServer::Servant servant);
 
   int is_user_id_in_map (const PortableServer::ObjectId &user_id,
@@ -1003,6 +1013,9 @@ protected:
 
   TAO_ORB_Core &orb_core_;
 
+  TAO_Object_Adapter *object_adapter_;
+  // The object adapter we belong to
+
   CORBA::Boolean cleanup_in_progress_;
 
   CORBA::Boolean etherealize_objects_;
@@ -1034,7 +1047,7 @@ private:
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-class TAO_Export TAO_Adapter_Activator : public PortableServer::AdapterActivator
+class TAO_PortableServer_Export TAO_Adapter_Activator : public PortableServer::AdapterActivator
 {
 public:
 
@@ -1058,7 +1071,7 @@ protected:
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "tao/POA.i"
+# include "POA.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/TAO/tao/POA.i b/TAO/tao/PortableServer/POA.i
index ab765d88f1c..0d4abd956f6 100644
--- a/TAO/tao/POA.i
+++ b/TAO/tao/PortableServer/POA.i
@@ -1,7 +1,7 @@
 // $Id$
 
 // Exception macros
-#include "tao/poa_macros.h"
+#include "poa_macros.h"
 #include "tao/Environment.h"
 
 ACE_INLINE CORBA::Boolean
diff --git a/TAO/tao/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index f0930d1bbed..19afbbae22e 100644
--- a/TAO/tao/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "tao/POAManager.h"
-#include "tao/POA.h"
+#include "POAManager.h"
+#include "POA.h"
+#include "poa_macros.h"
 #include "tao/Server_Strategy_Factory.h"
-#include "tao/poa_macros.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/POAManager.i"
+# include "POAManager.i"
 #endif /* ! __ACE_INLINE__ */
 
 TAO_POA_Manager::TAO_POA_Manager (TAO_Object_Adapter &object_adapter)
diff --git a/TAO/tao/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index c17bc351253..21f15e7c455 100644
--- a/TAO/tao/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -21,13 +21,13 @@
 #define TAO_POAMANAGER_H
 #include "ace/pre.h"
 
-#include "tao/PortableServerC.h"
+#include "PortableServerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/poa_macros.h"
+#include "poa_macros.h"
 
 // Local Object
 #include "tao/LocalObject.h"
@@ -45,7 +45,7 @@ class TAO_Object_Adapter;
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_Export TAO_POA_Manager :
+class TAO_PortableServer_Export TAO_POA_Manager :
   public PortableServer::POAManager,
   public TAO_Local_RefCounted_Object
 {
@@ -132,7 +132,7 @@ protected:
 };
 
 #if defined (__ACE_INLINE__)
-# include "tao/POAManager.i"
+# include "POAManager.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/TAO/tao/POAManager.i b/TAO/tao/PortableServer/POAManager.i
index 8977b773bbd..8977b773bbd 100644
--- a/TAO/tao/POAManager.i
+++ b/TAO/tao/PortableServer/POAManager.i
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/PortableServer/POA_CORBA.h
index 5c44e051ed1..22c4a7a3f84 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/PortableServer/POA_CORBA.h
@@ -37,9 +37,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "Servant_Base.h"
 #include "tao/PolicyC.h"
 #include "tao/DomainC.h"
-#include "tao/Servant_Base.h"
 #if (TAO_HAS_INTERFACE_REPOSITORY == 1)
 #include "tao/InterfaceC.h"
 #endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
@@ -52,8 +52,10 @@
 #endif /* _MSC_VER */
 
 class IR_InterfaceDef;
+class POA_CORBA_DomainManager;
+class POA_CORBA_ConstructionPolicy;
 
-class TAO_Export  POA_CORBA
+class TAO_PortableServer_Export  POA_CORBA
 {
 public:
 
@@ -61,7 +63,7 @@ public:
 
   class Policy;
   typedef Policy *Policy_ptr;
-  class TAO_Export Policy :  public virtual PortableServer::ServantBase
+  class TAO_PortableServer_Export Policy :  public virtual PortableServer::ServantBase
   {
   protected:
     Policy (void);
@@ -163,7 +165,7 @@ public:
   };
 
 
-  class TAO_Export _tao_thru_poa_collocated_CORBA_Policy   : public virtual ::CORBA_Policy
+  class TAO_PortableServer_Export _tao_thru_poa_collocated_CORBA_Policy   : public virtual ::CORBA_Policy
   {
   public:
     _tao_thru_poa_collocated_CORBA_Policy (
@@ -206,187 +208,8 @@ public:
 
   // ****************************************************************
 
-  class DomainManager;
-  typedef DomainManager *DomainManager_ptr;
-  class  DomainManager : public virtual PortableServer::ServantBase
-  {
-  protected:
-    DomainManager (void);
-
-  public:
-    DomainManager (const DomainManager& rhs);
-    virtual ~DomainManager (void);
-
-
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ()
-                                  );
-
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-
-    static void _is_a_skel (
-                            CORBA::ServerRequest &req,
-                            void *obj,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()
-                            );
-
-    static void _non_existent_skel (
-                                    CORBA::ServerRequest &req,
-                                    void *obj,
-                                    void *context,
-                                    CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ()
-                                    );
-
-    virtual void _dispatch (
-                            CORBA::ServerRequest &_tao_req,
-                            void *_tao_context,
-                            CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()
-                            );
-
-    CORBA::DomainManager *_this (
-                                 CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ()
-                                 );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Policy_ptr get_domain_policy (
-                                                 CORBA::PolicyType policy_type,
-                                                 CORBA::Environment &ACE_TRY_ENV =
-                                                 TAO_default_environment ()
-                                                 ) = 0;
-    static void get_domain_policy_skel (
-                                        CORBA::ServerRequest &_tao_req,
-                                        void *_tao_obj,
-                                        void *_tao_context,
-                                        CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()
-                                        );
-
-  };
-
-  class  _tao_collocated_DomainManager : public virtual CORBA::DomainManager
-  {
-  public:
-    _tao_collocated_DomainManager (
-                                   DomainManager_ptr  servant,
-                                   TAO_Stub *stub
-                                   );
-    DomainManager_ptr _get_servant (void) const;
-    virtual CORBA::Policy_ptr get_domain_policy (
-                                                 CORBA::PolicyType policy_type,
-                                                 CORBA::Environment &ACE_TRY_ENV =
-                                                 TAO_default_environment ()
-                                                 );
-
-  private:
-    DomainManager_ptr servant_;
-  };
-
-  // ****************************************************************
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  class ConstructionPolicy;
-  typedef ConstructionPolicy *ConstructionPolicy_ptr;
-  class  ConstructionPolicy : public virtual Policy
-  {
-  protected:
-    ConstructionPolicy (void);
-
-  public:
-    ConstructionPolicy (const ConstructionPolicy& rhs);
-    virtual ~ConstructionPolicy (void);
-
-
-    virtual CORBA::Boolean _is_a (
-                                  const char* logical_type_id,
-                                  CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ()
-                                  );
-
-    virtual void* _downcast (
-                             const char* logical_type_id
-                             );
-
-    static void _is_a_skel (
-                            CORBA::ServerRequest &req,
-                            void *obj,
-                            void *context,
-                            CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()
-                            );
-
-    static void _non_existent_skel (
-                                    CORBA::ServerRequest &req,
-                                    void *obj,
-                                    void *context,
-                                    CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ()
-                                    );
-
-    virtual void _dispatch (
-                            CORBA::ServerRequest &_tao_req,
-                            void *_tao_context,
-                            CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()
-                            );
-
-    CORBA::ConstructionPolicy *_this (
-                                      CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ()
-                                      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual void make_domain_manager (
-                                      IR_InterfaceDef *object_type,
-                                      CORBA::Boolean constr_policy,
-                                      CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ()
-                                      ) = 0;
-    static void make_domain_manager_skel (
-                                          CORBA::ServerRequest &_tao_req,
-                                          void *_tao_obj,
-                                          void *_tao_context,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ()
-                                          );
-
-  };
-
-  class  _tao_collocated_ConstructionPolicy : public virtual CORBA::ConstructionPolicy,
-                                              public virtual _tao_thru_poa_collocated_CORBA_Policy
-  {
-  public:
-    _tao_collocated_ConstructionPolicy (
-                                        ConstructionPolicy_ptr  servant,
-                                        TAO_Stub *stub
-                                        );
-    ConstructionPolicy_ptr _get_servant (void) const;
-    virtual void make_domain_manager (
-                                      IR_InterfaceDef *object_type,
-                                      CORBA::Boolean constr_policy,
-                                      CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ()
-                                      );
-    virtual CORBA::Boolean _is_a (
-                                  const char *logical_type_id,
-                                  CORBA::Environment &ACE_TRY_ENV =
-                                  CORBA::Environment::default_environment ()
-                                  );
-
-  private:
-    ConstructionPolicy_ptr servant_;
-  };
-
-#endif /* ! defined TAO_HAS_MINIMUM_CORBA */
+  typedef POA_CORBA_DomainManager DomainManager;
+  typedef POA_CORBA_ConstructionPolicy ConstructionPolicy;
 
   // ****************************************************************
 
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
new file mode 100644
index 00000000000..ad57042a17f
--- /dev/null
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -0,0 +1,503 @@
+/* -*- C++ -*- $Id$ */
+
+// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
+// TAO and the TAO IDL Compiler have been developed by the Center for
+// Distributed Object Computing at Washington University, St. Louis.
+//
+// Information about TAO is available at:
+//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "POA_CORBA.h"
+#include "Object_Adapter.h"
+#include "Operation_Table.h"
+
+#include "tao/PolicyC.h"
+#include "tao/Server_Request.h"
+#include "tao/NVList.h"
+#include "tao/Stub.h"
+#include "tao/Typecode.h"
+#include "tao/ORB_Core.h"
+
+class TAO_CORBA_Policy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+{
+private:
+  unsigned int hash (const char *str, unsigned int len);
+public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+};
+/* starting time is 6:18:45 */
+/* C++ code produced by gperf version 2.8 (ACE version) */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
+unsigned int
+TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
+{
+  static const unsigned char asso_values[] =
+    {
+#if defined (ACE_MVS)
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17,  0,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17,  0,
+     17,  0,  0,  0, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17,  0, 17, 17, 17, 17,  0, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17,
+#else
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
+      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
+     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
+     17,  0, 17, 17, 17, 17, 17, 17,
+#endif /* ACE_MVS */
+    };
+  return len + asso_values[str[len - 1]] + asso_values[str[0]];
+}
+
+const class TAO_operation_db_entry *
+TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 5,
+      MIN_WORD_LENGTH = 4,
+      MAX_WORD_LENGTH = 16,
+      MIN_HASH_VALUE = 4,
+      MAX_HASH_VALUE = 16,
+      HASH_VALUE_RANGE = 13,
+      DUPLICATES = 0
+    };
+
+  static const class TAO_operation_db_entry  wordlist[] =
+    {
+      {"",0},{"",0},{"",0},{"",0},
+      {"copy",  &POA_CORBA::Policy::copy_skel},
+      {"_is_a",  &POA_CORBA::Policy::_is_a_skel},
+      {"",0},
+      {"destroy",       &POA_CORBA::Policy::destroy_skel},
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_non_existent",  &POA_CORBA::Policy::_non_existent_skel},
+      {"",0},{"",0},
+      {"_get_policy_type",      &POA_CORBA::Policy::_get_policy_type_skel},
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      unsigned int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
+        {
+          const char *s = wordlist[key].opname_;
+
+          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
+/* ending time is 6:18:45 */
+static TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable;
+
+CORBA_Policy_ptr _TAO_collocation_POA_CORBA_Policy_Stub_Factory (
+    CORBA::Object_ptr obj
+  )
+{
+  TAO_Stub *stub = obj->_stubobj ();
+
+  switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
+    {
+    case TAO_ORB_Core::THRU_POA:
+      {
+      CORBA_Policy_ptr retval = 0;
+      ACE_NEW_RETURN (
+          retval,
+          POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy (stub),
+          0
+        );
+      return retval;
+      }
+    case TAO_ORB_Core::DIRECT:
+      break;
+    default:
+      break;
+    }
+  return 0;
+}
+
+int _TAO_collocation_POA_CORBA_Policy_Stub_Factory_Initializer (long dummy)
+{
+  ACE_UNUSED_ARG (dummy);
+
+  _TAO_collocation_CORBA_Policy_Stub_Factory_function_pointer =
+    _TAO_collocation_POA_CORBA_Policy_Stub_Factory;
+
+  return 0;
+}
+
+static int _TAO_collocation_POA_CORBA_Policy_Stub_Factory_Initializer_Scarecrow =
+  _TAO_collocation_POA_CORBA_Policy_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_CORBA_Policy_Stub_Factory_Initializer));
+
+// skeleton constructor
+POA_CORBA::Policy::Policy (void)
+{
+  this->optable_ = &tao_CORBA_Policy_optable;
+}
+
+// copy ctor
+POA_CORBA::Policy::Policy (const POA_CORBA::Policy& rhs)
+  :   TAO_ServantBase (rhs)
+{}
+
+// skeleton destructor
+POA_CORBA::Policy::~Policy (void)
+{
+}
+
+void POA_CORBA::Policy::_get_policy_type_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void *_tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+)
+{
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
+
+  CORBA::PolicyType _tao_retval = 0;
+
+      _tao_retval = _tao_impl->policy_type (
+        ACE_TRY_ENV
+      );
+
+      ACE_CHECK;
+
+
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  if (!(
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
+
+}
+
+void POA_CORBA::Policy::copy_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void *_tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+)
+{
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
+
+  CORBA_Policy_var _tao_retval;
+
+      _tao_retval = _tao_impl->copy (
+        ACE_TRY_ENV
+      );
+
+      ACE_CHECK;
+
+
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  if (!(
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
+
+}
+
+void POA_CORBA::Policy::destroy_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void *_tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+)
+{
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
+
+      _tao_impl->destroy (
+        ACE_TRY_ENV
+      );
+
+      ACE_CHECK;
+
+
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  }
+
+void POA_CORBA::Policy::_is_a_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
+  CORBA::Boolean _tao_retval = 0;
+  CORBA::String_var value;
+  if (!(_tao_in >> value.out ()))
+    ACE_THROW (CORBA::MARSHAL ());
+
+  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  ACE_CHECK;
+
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
+void POA_CORBA::Policy::_non_existent_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  _tao_server_request.init_reply (ACE_TRY_ENV);
+  ACE_CHECK;
+  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+    ACE_THROW (CORBA::MARSHAL ());
+}
+
+CORBA::Boolean POA_CORBA::Policy::_is_a (
+    const char* value,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  if (
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Policy:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      return 1;
+    else
+      return 0;
+}
+
+void* POA_CORBA::Policy::_downcast (
+    const char* logical_type_id
+  )
+{
+if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Policy:1.0") == 0)
+    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
+    if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+    return ACE_static_cast(PortableServer::Servant, this);
+  return 0;
+}
+
+void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+{
+  this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+}
+
+const char* POA_CORBA::Policy::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/CORBA_Policy:1.0";
+}
+
+CORBA_Policy*
+POA_CORBA::Policy::_this (CORBA_Environment &ACE_TRY_ENV)
+{
+  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
+    switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
+      {
+      case TAO_ORB_Core::THRU_POA:
+        {
+          ::CORBA_Policy_ptr retval = 0;
+          ACE_NEW_RETURN (
+              retval,
+              POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy (stub),
+              0
+            );
+          return retval;
+        }
+      case TAO_ORB_Core::DIRECT:
+        ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      default:
+        ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      }
+  else
+    {
+      // stub->_incr_refcnt ();
+      CORBA::Object_ptr tmp = CORBA::Object::_nil ();
+      ACE_NEW_RETURN (tmp, CORBA::Object (stub), 0);
+      CORBA::Object_var obj = tmp;
+      return ::CORBA_Policy::_unchecked_narrow (obj.in ());
+    }
+}
+
+POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy::_tao_thru_poa_collocated_CORBA_Policy (
+  TAO_Stub *stub
+)
+  :  CORBA_Object (stub, 1)
+{
+}
+
+CORBA::Boolean POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy::_is_a(
+    const CORBA::Char *logical_type_id,
+    CORBA_Environment &ACE_TRY_ENV
+  )
+
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "_is_a",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN (0);
+  return ACE_reinterpret_cast (
+      POA_CORBA::Policy_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:omg.org/CORBA_Policy:1.0"
+        )
+    )->_is_a (logical_type_id, ACE_TRY_ENV);
+}
+
+
+CORBA::Boolean POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy::_non_existent(
+    CORBA_Environment &ACE_TRY_ENV
+  )
+
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "_non_existent",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN (0);
+  return ACE_reinterpret_cast (
+      POA_CORBA::Policy_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:omg.org/CORBA_Policy:1.0"
+        )
+    )->_non_existent (ACE_TRY_ENV);
+}
+
+
+CORBA::PolicyType POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy::policy_type  (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA::PolicyType _tao_retval = 0;
+  ACE_UNUSED_ARG (_tao_retval);
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "policy_type",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN  (_tao_retval);
+  return ACE_reinterpret_cast (
+      POA_CORBA::Policy_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:omg.org/CORBA_Policy:1.0"
+        )
+    )->policy_type (
+      ACE_TRY_ENV
+    );
+
+}
+
+CORBA_Policy_ptr POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy::copy  (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  CORBA_Policy_var _tao_retval;
+  ACE_UNUSED_ARG (_tao_retval);
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "copy",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK_RETURN (0);
+  return ACE_reinterpret_cast (
+      POA_CORBA::Policy_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:omg.org/CORBA_Policy:1.0"
+        )
+    )->copy (
+      ACE_TRY_ENV
+    );
+
+}
+
+void POA_CORBA::_tao_thru_poa_collocated_CORBA_Policy::destroy  (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      this->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  servant_upcall.prepare_for_upcall (
+      this->_object_key (),
+      "destroy",
+      ACE_TRY_ENV
+    );
+  ACE_CHECK;
+  ACE_reinterpret_cast (
+      POA_CORBA::Policy_ptr,
+      servant_upcall.servant ()->_downcast (
+          "IDL:omg.org/CORBA_Policy:1.0"
+        )
+    )->destroy (
+      ACE_TRY_ENV
+    );
+  return;
+}
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
new file mode 100644
index 00000000000..05a4daf4c10
--- /dev/null
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -0,0 +1,29 @@
+/* -*- C++ -*- */
+
+// $Id$
+// =================================================================
+//
+// = LIBRARY
+//    TAO
+//
+// = FILENAME
+//    PortableServer.cpp
+//
+// = AUTHOR
+//    Carlos O'Ryan <coryan@uci.edu>
+//
+// =================================================================
+
+#include "PortableServer.h"
+#include "Object_Adapter.h"
+
+ACE_RCSID (PortableServer, PortableServer, "$Id$")
+
+int
+TAO_POA_Initializer::init (void)
+{
+  ACE_Service_Config::static_svcs ()->
+    insert (&ace_svc_desc_TAO_Object_Adapter_Factory);
+
+  return 0;
+}
diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h
new file mode 100644
index 00000000000..825cd148eb4
--- /dev/null
+++ b/TAO/tao/PortableServer/PortableServer.h
@@ -0,0 +1,54 @@
+/* -*- C++ -*- */
+
+// $Id$
+
+// =========================================================================
+//
+// = LIBRARY
+//    TAO
+//
+// = FILENAME
+//    Portableserver.h
+//
+// = AUTHOR
+//    Carlos O'Ryan <coryan@uci.edu>
+//
+// =========================================================================
+
+#ifndef TAO_PORTABLESERVER_H
+#define TAO_PORTABLESERVER_H
+#include "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "tao/corbafwd.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class TAO_PortableServer_Export TAO_POA_Initializer
+{
+public:
+  static int init (void);
+  // Used to force the initialization of the ORB code.
+};
+
+#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
+
+typedef int (*TAO_Module_Initializer) (void);
+
+static TAO_Module_Initializer
+TAO_Requires_POA_Initializer = &TAO_POA_Initializer::init;
+
+#else
+
+static int
+TAO_Requires_POA_Initializer = TAO_POA_Initializer::init ();
+
+#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
+
+#define TAO_PORTABLESERVER_SAFE_INCLUDE
+#include "PortableServerC.h"
+#undef TAO_PORTABLESERVER_SAFE_INCLUDE
+
+#endif /* TAO_PORTABLESERVER_H */
diff --git a/TAO/tao/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 0075c2c9c56..0075c2c9c56 100644
--- a/TAO/tao/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
diff --git a/TAO/tao/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index daf9be00022..6ed213b5503 100644
--- a/TAO/tao/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -8,8 +8,8 @@
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableServerC.h"
+#include "POA.h"
 #include "tao/ORB.h"
-#include "tao/POA.h"
 
 #if !defined (__ACE_INLINE__)
 #include "PortableServerC.i"
@@ -17,7 +17,7 @@
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CS_
 
@@ -27,7 +27,7 @@
   {
     PortableServer::POA **tmp = 0;
     tmp = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       PortableServer::POA **old = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
@@ -36,14 +36,14 @@
           tmp[i] = PortableServer::POA::_duplicate (old[i]);
         else
           tmp[i] = old[i];
-        
+
       if (this->release_)
         delete[] old;
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_deallocate_buffer (void)
   {
@@ -58,24 +58,24 @@
     _TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (tmp);
     this->buffer_ = 0;
   }
-  
+
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::~_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void)
   {
     this->_deallocate_buffer ();
   }
-  
+
   void
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
   {
     PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-    
+
     for (CORBA::ULong i = nl; i < ol; ++i)
     {
       CORBA::release (tmp[i]);
       tmp[i] = PortableServer::POA::_nil ();
     }
   }
-  void 
+  void
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast (
       void* target,
       CORBA_Object *src,
@@ -92,11 +92,11 @@
     PortableServer::POA **tmp = ACE_static_cast (PortableServer::POA**, src);
     return *tmp;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_PORTABLESERVER_POALIST_CS_)
 #define _PORTABLESERVER_POALIST_CS_
@@ -108,30 +108,30 @@
 PortableServer::POAList::POAList (void)
 {}
 PortableServer::POAList::POAList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 PortableServer::POAList::POAList (CORBA::ULong max, CORBA::ULong length, PortableServer::POA_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 PortableServer::POAList::POAList (const POAList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 PortableServer::POAList::~POAList (void) // dtor
@@ -156,30 +156,30 @@ void PortableServer::POAList::_tao_any_destructor (void *x)
 PortableServer::ObjectId::ObjectId (void)
 {}
 PortableServer::ObjectId::ObjectId (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 PortableServer::ObjectId::ObjectId (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 PortableServer::ObjectId::ObjectId (const ObjectId &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 PortableServer::ObjectId::~ObjectId (void) // dtor
@@ -442,7 +442,7 @@ void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -538,7 +538,7 @@ void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -632,7 +632,7 @@ void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -726,7 +726,7 @@ void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -822,7 +822,7 @@ void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptr_arith_t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -916,7 +916,7 @@ void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1011,7 +1011,7 @@ void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptr_arith_t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1080,7 +1080,7 @@ void *PortableServer::POAManager::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1215,7 +1215,7 @@ void *PortableServer::AdapterActivator::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1283,7 +1283,7 @@ void *PortableServer::ServantManager::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1363,7 +1363,7 @@ void *PortableServer::ServantActivator::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1443,7 +1443,7 @@ void *PortableServer::ServantLocator::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2175,7 +2175,7 @@ void *PortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2320,7 +2320,7 @@ void *PortableServer::Current::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2920,20 +2920,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-    
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
         ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (PortableServer::ObjectId *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-    
+
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -2950,14 +2950,14 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
-    
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
         ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
       oseq->replace (_tao_seq_len, strm.start ());
       oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -2966,12 +2966,11 @@ CORBA::Boolean operator>> (
     }
     else
       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; // error
 }
-
diff --git a/TAO/tao/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index ed279190d9d..7d7fcabf9c0 100644
--- a/TAO/tao/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -11,6 +11,8 @@
 #define _TAO_IDL_PORTABLESERVERC_H_
 
 #include "ace/pre.h"
+
+#include "portableserver_export.h"
 #include "tao/corbafwd.h"
 
 #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
@@ -29,13 +31,13 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#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_Export
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -62,7 +64,7 @@ TAO_NAMESPACE  PortableServer
   typedef TAO_DynamicImplementation DynamicImplementation;
 
   class POA;
-  
+
 #if !defined (_PORTABLESERVER_POA___PTR_CH_)
 #define _PORTABLESERVER_POA___PTR_CH_
 
@@ -74,21 +76,21 @@ typedef POA *POA_ptr;
 #if !defined (_PORTABLESERVER_POA___VAR_CH_)
 #define _PORTABLESERVER_POA___VAR_CH_
 
-  class TAO_Export POA_var : public TAO_Base_var
+  class TAO_PortableServer_Export POA_var : public TAO_Base_var
   {
   public:
     POA_var (void); // default constructor
-    POA_var (POA_ptr p) : ptr_ (p) {} 
+    POA_var (POA_ptr p) : ptr_ (p) {}
     POA_var (const POA_var &); // copy constructor
     ~POA_var (void); // destructor
-    
+
     POA_var &operator= (POA_ptr);
     POA_var &operator= (const POA_var &);
     POA_ptr operator-> (void) const;
-    
+
     operator const POA_ptr &() const;
     operator POA_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     POA_ptr in (void) const;
     POA_ptr &inout (void);
     POA_ptr &out (void);
@@ -109,7 +111,7 @@ typedef POA *POA_ptr;
 #if !defined (_PORTABLESERVER_POA___OUT_CH_)
 #define _PORTABLESERVER_POA___OUT_CH_
 
-  class TAO_Export POA_out
+  class TAO_PortableServer_Export POA_out
   {
   public:
     POA_out (POA_ptr &);
@@ -121,7 +123,7 @@ typedef POA *POA_ptr;
     operator POA_ptr &();
     POA_ptr &ptr (void);
     POA_ptr operator-> (void);
-    
+
   private:
     POA_ptr &ptr_;
   };
@@ -131,7 +133,7 @@ typedef POA *POA_ptr;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_
 
@@ -139,7 +141,7 @@ typedef POA *POA_ptr;
     {
     public:
       // = Initialization and termination methods.
-      
+
       _TAO_Unbounded_Object_Sequence_PortableServer_POAList (void);
       _TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum);
       _TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum,
@@ -161,42 +163,42 @@ typedef POA *POA_ptr;
       virtual void _downcast (
           void* target,
           CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
+          CORBA_Environment &ACE_TRY_ENV =
             TAO_default_environment ()
         );
       virtual CORBA_Object* _upcast (void *src) const;
-      
+
     };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_PORTABLESERVER_POALIST_CH_)
 #define _PORTABLESERVER_POALIST_CH_
 
   class POAList;
   class POAList_var;
-  
+
   // *************************************************************
   // POAList
   // *************************************************************
-  
-  class TAO_Export POAList : public 
+
+  class TAO_PortableServer_Export POAList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Object_Sequence<POA,POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     POAList (void); // default ctor
     POAList (CORBA::ULong max); // uses max size
     POAList (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      POA_ptr *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      POA_ptr *buffer,
       CORBA::Boolean release=0
     );
     POAList (const POAList &); // copy ctor
@@ -208,7 +210,7 @@ typedef POA *POA_ptr;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -219,26 +221,26 @@ typedef POA *POA_ptr;
   // class PortableServer::POAList_var
   // *************************************************************
 
-  class TAO_Export POAList_var
+  class TAO_PortableServer_Export POAList_var
   {
   public:
     POAList_var (void); // default constructor
     POAList_var (POAList *);
     POAList_var (const POAList_var &); // copy constructor
     ~POAList_var (void); // destructor
-    
+
     POAList_var &operator= (POAList *);
     POAList_var &operator= (const POAList_var &);
     POAList *operator-> (void);
     const POAList *operator-> (void) const;
-    
+
     operator const POAList &() const;
     operator POAList &();
     operator POAList &() const;
     operator POAList *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     const POAList &in (void) const;
     POAList &inout (void);
     POAList *&out (void);
@@ -256,7 +258,7 @@ typedef POA *POA_ptr;
 #if !defined (_PORTABLESERVER_POALIST___OUT_CH_)
 #define _PORTABLESERVER_POALIST___OUT_CH_
 
-  class TAO_Export POAList_out
+  class TAO_PortableServer_Export POAList_out
   {
   public:
     POAList_out (POAList *&);
@@ -268,7 +270,7 @@ typedef POA *POA_ptr;
     POAList *&ptr (void);
     POAList *operator-> (void);
     TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-    
+
   private:
     POAList *&ptr_;
     // assignment from T_var not allowed
@@ -284,25 +286,25 @@ typedef POA *POA_ptr;
 
   class ObjectId;
   class ObjectId_var;
-  
+
   // *************************************************************
   // ObjectId
   // *************************************************************
-  
-  class TAO_Export ObjectId : public 
+
+  class TAO_PortableServer_Export ObjectId : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     ObjectId (void); // default ctor
     ObjectId (CORBA::ULong max); // uses max size
     ObjectId (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA::Octet *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      CORBA::Octet *buffer,
       CORBA::Boolean release=0
     );
     ObjectId (const ObjectId &); // copy ctor
@@ -323,7 +325,7 @@ typedef POA *POA_ptr;
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -334,7 +336,7 @@ typedef POA *POA_ptr;
   // class PortableServer::ObjectId_var
   // *************************************************************
 
-  class TAO_Export ObjectId_var
+  class TAO_PortableServer_Export ObjectId_var
   {
   public:
     ObjectId_var (void); // default constructor
@@ -342,19 +344,19 @@ typedef POA *POA_ptr;
     ObjectId_var (const ObjectId_var &); // copy constructor
     ObjectId_var (const ObjectId &); // fixed-size base types only
     ~ObjectId_var (void); // destructor
-    
+
     ObjectId_var &operator= (ObjectId *);
     ObjectId_var &operator= (const ObjectId_var &);
     ObjectId_var &operator= (const ObjectId &); // fixed-size base types only
     ObjectId *operator-> (void);
     const ObjectId *operator-> (void) const;
-    
+
     operator const ObjectId &() const;
     operator ObjectId &();
     operator ObjectId &() const;
-    
+
     CORBA::Octet &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     const ObjectId &in (void) const;
     ObjectId &inout (void);
     ObjectId *&out (void);
@@ -372,7 +374,7 @@ typedef POA *POA_ptr;
 #if !defined (_PORTABLESERVER_OBJECTID___OUT_CH_)
 #define _PORTABLESERVER_OBJECTID___OUT_CH_
 
-  class TAO_Export ObjectId_out
+  class TAO_PortableServer_Export ObjectId_out
   {
   public:
     ObjectId_out (ObjectId *&);
@@ -384,7 +386,7 @@ typedef POA *POA_ptr;
     ObjectId *&ptr (void);
     ObjectId *operator-> (void);
     CORBA::Octet &operator[] (CORBA::ULong index);
-    
+
   private:
     ObjectId *&ptr_;
     // assignment from T_var not allowed
@@ -402,7 +404,7 @@ typedef POA *POA_ptr;
 #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
 #define _PORTABLESERVER_FORWARDREQUEST_CH_
 
-  class TAO_Export ForwardRequest : public CORBA::UserException
+  class TAO_PortableServer_Export ForwardRequest : public CORBA::UserException
   {
   public:
 
@@ -482,21 +484,21 @@ typedef ThreadPolicy *ThreadPolicy_ptr;
 #if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CH_)
 #define _PORTABLESERVER_THREADPOLICY___VAR_CH_
 
-class TAO_Export ThreadPolicy_var : public TAO_Base_var
+class TAO_PortableServer_Export ThreadPolicy_var : public TAO_Base_var
 {
 public:
   ThreadPolicy_var (void); // default constructor
-  ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {} 
+  ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {}
   ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor
   ~ThreadPolicy_var (void); // destructor
-  
+
   ThreadPolicy_var &operator= (ThreadPolicy_ptr);
   ThreadPolicy_var &operator= (const ThreadPolicy_var &);
   ThreadPolicy_ptr operator-> (void) const;
-  
+
   operator const ThreadPolicy_ptr &() const;
   operator ThreadPolicy_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ThreadPolicy_ptr in (void) const;
   ThreadPolicy_ptr &inout (void);
   ThreadPolicy_ptr &out (void);
@@ -517,7 +519,7 @@ private:
 #if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CH_)
 #define _PORTABLESERVER_THREADPOLICY___OUT_CH_
 
-class TAO_Export ThreadPolicy_out
+class TAO_PortableServer_Export ThreadPolicy_out
 {
 public:
   ThreadPolicy_out (ThreadPolicy_ptr &);
@@ -529,7 +531,7 @@ public:
   operator ThreadPolicy_ptr &();
   ThreadPolicy_ptr &ptr (void);
   ThreadPolicy_ptr operator-> (void);
-  
+
 private:
   ThreadPolicy_ptr &ptr_;
 };
@@ -541,7 +543,7 @@ private:
 #if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
 #define _PORTABLESERVER_THREADPOLICY_CH_
 
-class TAO_Export ThreadPolicy: public virtual CORBA::Policy
+class TAO_PortableServer_Export ThreadPolicy: public virtual CORBA::Policy
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -553,12 +555,12 @@ public:
   static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
   static ThreadPolicy_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ThreadPolicy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ThreadPolicy_ptr _nil (void)
@@ -567,7 +569,7 @@ public:
     }
 
   virtual PortableServer::ThreadPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -575,7 +577,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -613,21 +615,21 @@ typedef LifespanPolicy *LifespanPolicy_ptr;
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY___VAR_CH_
 
-class TAO_Export LifespanPolicy_var : public TAO_Base_var
+class TAO_PortableServer_Export LifespanPolicy_var : public TAO_Base_var
 {
 public:
   LifespanPolicy_var (void); // default constructor
-  LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {} 
+  LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {}
   LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor
   ~LifespanPolicy_var (void); // destructor
-  
+
   LifespanPolicy_var &operator= (LifespanPolicy_ptr);
   LifespanPolicy_var &operator= (const LifespanPolicy_var &);
   LifespanPolicy_ptr operator-> (void) const;
-  
+
   operator const LifespanPolicy_ptr &() const;
   operator LifespanPolicy_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   LifespanPolicy_ptr in (void) const;
   LifespanPolicy_ptr &inout (void);
   LifespanPolicy_ptr &out (void);
@@ -648,7 +650,7 @@ private:
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY___OUT_CH_
 
-class TAO_Export LifespanPolicy_out
+class TAO_PortableServer_Export LifespanPolicy_out
 {
 public:
   LifespanPolicy_out (LifespanPolicy_ptr &);
@@ -660,7 +662,7 @@ public:
   operator LifespanPolicy_ptr &();
   LifespanPolicy_ptr &ptr (void);
   LifespanPolicy_ptr operator-> (void);
-  
+
 private:
   LifespanPolicy_ptr &ptr_;
 };
@@ -672,7 +674,7 @@ private:
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY_CH_
 
-class TAO_Export LifespanPolicy: public virtual CORBA::Policy
+class TAO_PortableServer_Export LifespanPolicy: public virtual CORBA::Policy
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -684,12 +686,12 @@ public:
   static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
   static LifespanPolicy_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static LifespanPolicy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static LifespanPolicy_ptr _nil (void)
@@ -698,7 +700,7 @@ public:
     }
 
   virtual PortableServer::LifespanPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -706,7 +708,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -742,21 +744,21 @@ typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_
 
-class TAO_Export IdUniquenessPolicy_var : public TAO_Base_var
+class TAO_PortableServer_Export IdUniquenessPolicy_var : public TAO_Base_var
 {
 public:
   IdUniquenessPolicy_var (void); // default constructor
-  IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {} 
+  IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {}
   IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor
   ~IdUniquenessPolicy_var (void); // destructor
-  
+
   IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr);
   IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &);
   IdUniquenessPolicy_ptr operator-> (void) const;
-  
+
   operator const IdUniquenessPolicy_ptr &() const;
   operator IdUniquenessPolicy_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   IdUniquenessPolicy_ptr in (void) const;
   IdUniquenessPolicy_ptr &inout (void);
   IdUniquenessPolicy_ptr &out (void);
@@ -777,7 +779,7 @@ private:
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_
 
-class TAO_Export IdUniquenessPolicy_out
+class TAO_PortableServer_Export IdUniquenessPolicy_out
 {
 public:
   IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &);
@@ -789,7 +791,7 @@ public:
   operator IdUniquenessPolicy_ptr &();
   IdUniquenessPolicy_ptr &ptr (void);
   IdUniquenessPolicy_ptr operator-> (void);
-  
+
 private:
   IdUniquenessPolicy_ptr &ptr_;
 };
@@ -801,7 +803,7 @@ private:
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
 
-class TAO_Export IdUniquenessPolicy: public virtual CORBA::Policy
+class TAO_PortableServer_Export IdUniquenessPolicy: public virtual CORBA::Policy
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -813,12 +815,12 @@ public:
   static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
   static IdUniquenessPolicy_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static IdUniquenessPolicy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static IdUniquenessPolicy_ptr _nil (void)
@@ -827,7 +829,7 @@ public:
     }
 
   virtual PortableServer::IdUniquenessPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -835,7 +837,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -871,21 +873,21 @@ typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_
 
-class TAO_Export IdAssignmentPolicy_var : public TAO_Base_var
+class TAO_PortableServer_Export IdAssignmentPolicy_var : public TAO_Base_var
 {
 public:
   IdAssignmentPolicy_var (void); // default constructor
-  IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {} 
+  IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {}
   IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor
   ~IdAssignmentPolicy_var (void); // destructor
-  
+
   IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr);
   IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &);
   IdAssignmentPolicy_ptr operator-> (void) const;
-  
+
   operator const IdAssignmentPolicy_ptr &() const;
   operator IdAssignmentPolicy_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   IdAssignmentPolicy_ptr in (void) const;
   IdAssignmentPolicy_ptr &inout (void);
   IdAssignmentPolicy_ptr &out (void);
@@ -906,7 +908,7 @@ private:
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_
 
-class TAO_Export IdAssignmentPolicy_out
+class TAO_PortableServer_Export IdAssignmentPolicy_out
 {
 public:
   IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &);
@@ -918,7 +920,7 @@ public:
   operator IdAssignmentPolicy_ptr &();
   IdAssignmentPolicy_ptr &ptr (void);
   IdAssignmentPolicy_ptr operator-> (void);
-  
+
 private:
   IdAssignmentPolicy_ptr &ptr_;
 };
@@ -930,7 +932,7 @@ private:
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
 
-class TAO_Export IdAssignmentPolicy: public virtual CORBA::Policy
+class TAO_PortableServer_Export IdAssignmentPolicy: public virtual CORBA::Policy
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -942,12 +944,12 @@ public:
   static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
   static IdAssignmentPolicy_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static IdAssignmentPolicy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static IdAssignmentPolicy_ptr _nil (void)
@@ -956,7 +958,7 @@ public:
     }
 
   virtual PortableServer::IdAssignmentPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -964,7 +966,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -1003,21 +1005,21 @@ typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_
 
-class TAO_Export ImplicitActivationPolicy_var : public TAO_Base_var
+class TAO_PortableServer_Export ImplicitActivationPolicy_var : public TAO_Base_var
 {
 public:
   ImplicitActivationPolicy_var (void); // default constructor
-  ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {} 
+  ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {}
   ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor
   ~ImplicitActivationPolicy_var (void); // destructor
-  
+
   ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr);
   ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &);
   ImplicitActivationPolicy_ptr operator-> (void) const;
-  
+
   operator const ImplicitActivationPolicy_ptr &() const;
   operator ImplicitActivationPolicy_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ImplicitActivationPolicy_ptr in (void) const;
   ImplicitActivationPolicy_ptr &inout (void);
   ImplicitActivationPolicy_ptr &out (void);
@@ -1038,7 +1040,7 @@ private:
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_
 
-class TAO_Export ImplicitActivationPolicy_out
+class TAO_PortableServer_Export ImplicitActivationPolicy_out
 {
 public:
   ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &);
@@ -1050,7 +1052,7 @@ public:
   operator ImplicitActivationPolicy_ptr &();
   ImplicitActivationPolicy_ptr &ptr (void);
   ImplicitActivationPolicy_ptr operator-> (void);
-  
+
 private:
   ImplicitActivationPolicy_ptr &ptr_;
 };
@@ -1062,7 +1064,7 @@ private:
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
 
-class TAO_Export ImplicitActivationPolicy: public virtual CORBA::Policy
+class TAO_PortableServer_Export ImplicitActivationPolicy: public virtual CORBA::Policy
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1074,12 +1076,12 @@ public:
   static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
   static ImplicitActivationPolicy_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ImplicitActivationPolicy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ImplicitActivationPolicy_ptr _nil (void)
@@ -1088,7 +1090,7 @@ public:
     }
 
   virtual PortableServer::ImplicitActivationPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1096,7 +1098,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -1137,21 +1139,21 @@ typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_
 
-class TAO_Export ServantRetentionPolicy_var : public TAO_Base_var
+class TAO_PortableServer_Export ServantRetentionPolicy_var : public TAO_Base_var
 {
 public:
   ServantRetentionPolicy_var (void); // default constructor
-  ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {} 
+  ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {}
   ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor
   ~ServantRetentionPolicy_var (void); // destructor
-  
+
   ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr);
   ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &);
   ServantRetentionPolicy_ptr operator-> (void) const;
-  
+
   operator const ServantRetentionPolicy_ptr &() const;
   operator ServantRetentionPolicy_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ServantRetentionPolicy_ptr in (void) const;
   ServantRetentionPolicy_ptr &inout (void);
   ServantRetentionPolicy_ptr &out (void);
@@ -1172,7 +1174,7 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_
 
-class TAO_Export ServantRetentionPolicy_out
+class TAO_PortableServer_Export ServantRetentionPolicy_out
 {
 public:
   ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &);
@@ -1184,7 +1186,7 @@ public:
   operator ServantRetentionPolicy_ptr &();
   ServantRetentionPolicy_ptr &ptr (void);
   ServantRetentionPolicy_ptr operator-> (void);
-  
+
 private:
   ServantRetentionPolicy_ptr &ptr_;
 };
@@ -1196,7 +1198,7 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
 
-class TAO_Export ServantRetentionPolicy: public virtual CORBA::Policy
+class TAO_PortableServer_Export ServantRetentionPolicy: public virtual CORBA::Policy
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1208,12 +1210,12 @@ public:
   static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
   static ServantRetentionPolicy_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServantRetentionPolicy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServantRetentionPolicy_ptr _nil (void)
@@ -1222,7 +1224,7 @@ public:
     }
 
   virtual PortableServer::ServantRetentionPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1230,7 +1232,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -1272,21 +1274,21 @@ typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_
 
-class TAO_Export RequestProcessingPolicy_var : public TAO_Base_var
+class TAO_PortableServer_Export RequestProcessingPolicy_var : public TAO_Base_var
 {
 public:
   RequestProcessingPolicy_var (void); // default constructor
-  RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {} 
+  RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {}
   RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor
   ~RequestProcessingPolicy_var (void); // destructor
-  
+
   RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr);
   RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &);
   RequestProcessingPolicy_ptr operator-> (void) const;
-  
+
   operator const RequestProcessingPolicy_ptr &() const;
   operator RequestProcessingPolicy_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   RequestProcessingPolicy_ptr in (void) const;
   RequestProcessingPolicy_ptr &inout (void);
   RequestProcessingPolicy_ptr &out (void);
@@ -1307,7 +1309,7 @@ private:
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_
 
-class TAO_Export RequestProcessingPolicy_out
+class TAO_PortableServer_Export RequestProcessingPolicy_out
 {
 public:
   RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &);
@@ -1319,7 +1321,7 @@ public:
   operator RequestProcessingPolicy_ptr &();
   RequestProcessingPolicy_ptr &ptr (void);
   RequestProcessingPolicy_ptr operator-> (void);
-  
+
 private:
   RequestProcessingPolicy_ptr &ptr_;
 };
@@ -1331,7 +1333,7 @@ private:
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
 
-class TAO_Export RequestProcessingPolicy: public virtual CORBA::Policy
+class TAO_PortableServer_Export RequestProcessingPolicy: public virtual CORBA::Policy
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1343,12 +1345,12 @@ public:
   static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
   static RequestProcessingPolicy_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static RequestProcessingPolicy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static RequestProcessingPolicy_ptr _nil (void)
@@ -1357,7 +1359,7 @@ public:
     }
 
   virtual PortableServer::RequestProcessingPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1365,7 +1367,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -1393,21 +1395,21 @@ typedef POAManager *POAManager_ptr;
 #if !defined (_PORTABLESERVER_POAMANAGER___VAR_CH_)
 #define _PORTABLESERVER_POAMANAGER___VAR_CH_
 
-class TAO_Export POAManager_var : public TAO_Base_var
+class TAO_PortableServer_Export POAManager_var : public TAO_Base_var
 {
 public:
   POAManager_var (void); // default constructor
-  POAManager_var (POAManager_ptr p) : ptr_ (p) {} 
+  POAManager_var (POAManager_ptr p) : ptr_ (p) {}
   POAManager_var (const POAManager_var &); // copy constructor
   ~POAManager_var (void); // destructor
-  
+
   POAManager_var &operator= (POAManager_ptr);
   POAManager_var &operator= (const POAManager_var &);
   POAManager_ptr operator-> (void) const;
-  
+
   operator const POAManager_ptr &() const;
   operator POAManager_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   POAManager_ptr in (void) const;
   POAManager_ptr &inout (void);
   POAManager_ptr &out (void);
@@ -1428,7 +1430,7 @@ private:
 #if !defined (_PORTABLESERVER_POAMANAGER___OUT_CH_)
 #define _PORTABLESERVER_POAMANAGER___OUT_CH_
 
-class TAO_Export POAManager_out
+class TAO_PortableServer_Export POAManager_out
 {
 public:
   POAManager_out (POAManager_ptr &);
@@ -1440,7 +1442,7 @@ public:
   operator POAManager_ptr &();
   POAManager_ptr &ptr (void);
   POAManager_ptr operator-> (void);
-  
+
 private:
   POAManager_ptr &ptr_;
 };
@@ -1452,7 +1454,7 @@ private:
 #if !defined (_PORTABLESERVER_POAMANAGER_CH_)
 #define _PORTABLESERVER_POAMANAGER_CH_
 
-class TAO_Export POAManager : public virtual CORBA_Object
+class TAO_PortableServer_Export POAManager : public virtual CORBA_Object
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1464,12 +1466,12 @@ public:
   static POAManager_ptr _duplicate (POAManager_ptr obj);
   static POAManager_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static POAManager_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static POAManager_ptr _nil (void)
@@ -1481,7 +1483,7 @@ public:
 #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
 #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
 
-  class TAO_Export AdapterInactive : public CORBA::UserException
+  class TAO_PortableServer_Export AdapterInactive : public CORBA::UserException
   {
   public:
 
@@ -1522,7 +1524,7 @@ enum State
 };
 typedef State &State_out;
 virtual void activate (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -1534,7 +1536,7 @@ virtual void activate (
 
 virtual void hold_requests (
     CORBA::Boolean wait_for_completion,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -1544,7 +1546,7 @@ virtual void hold_requests (
 
 virtual void discard_requests (
     CORBA::Boolean wait_for_completion,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -1555,7 +1557,7 @@ virtual void discard_requests (
 virtual void deactivate (
     CORBA::Boolean etherealize_objects,
     CORBA::Boolean wait_for_completion,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -1566,7 +1568,7 @@ virtual void deactivate (
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 virtual PortableServer::POAManager::State get_state (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -1603,21 +1605,21 @@ typedef AdapterActivator *AdapterActivator_ptr;
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_
 
-class TAO_Export AdapterActivator_var : public TAO_Base_var
+class TAO_PortableServer_Export AdapterActivator_var : public TAO_Base_var
 {
 public:
   AdapterActivator_var (void); // default constructor
-  AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {} 
+  AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {}
   AdapterActivator_var (const AdapterActivator_var &); // copy constructor
   ~AdapterActivator_var (void); // destructor
-  
+
   AdapterActivator_var &operator= (AdapterActivator_ptr);
   AdapterActivator_var &operator= (const AdapterActivator_var &);
   AdapterActivator_ptr operator-> (void) const;
-  
+
   operator const AdapterActivator_ptr &() const;
   operator AdapterActivator_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   AdapterActivator_ptr in (void) const;
   AdapterActivator_ptr &inout (void);
   AdapterActivator_ptr &out (void);
@@ -1638,7 +1640,7 @@ private:
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_
 
-class TAO_Export AdapterActivator_out
+class TAO_PortableServer_Export AdapterActivator_out
 {
 public:
   AdapterActivator_out (AdapterActivator_ptr &);
@@ -1650,7 +1652,7 @@ public:
   operator AdapterActivator_ptr &();
   AdapterActivator_ptr &ptr (void);
   AdapterActivator_ptr operator-> (void);
-  
+
 private:
   AdapterActivator_ptr &ptr_;
 };
@@ -1662,7 +1664,7 @@ private:
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR_CH_
 
-class TAO_Export AdapterActivator : public virtual CORBA_Object
+class TAO_PortableServer_Export AdapterActivator : public virtual CORBA_Object
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1674,12 +1676,12 @@ public:
   static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
   static AdapterActivator_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static AdapterActivator_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static AdapterActivator_ptr _nil (void)
@@ -1690,7 +1692,7 @@ public:
   virtual CORBA::Boolean unknown_adapter (
       PortableServer::POA_ptr parent,
       const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1698,7 +1700,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -1725,21 +1727,21 @@ typedef ServantManager *ServantManager_ptr;
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER___VAR_CH_
 
-class TAO_Export ServantManager_var : public TAO_Base_var
+class TAO_PortableServer_Export ServantManager_var : public TAO_Base_var
 {
 public:
   ServantManager_var (void); // default constructor
-  ServantManager_var (ServantManager_ptr p) : ptr_ (p) {} 
+  ServantManager_var (ServantManager_ptr p) : ptr_ (p) {}
   ServantManager_var (const ServantManager_var &); // copy constructor
   ~ServantManager_var (void); // destructor
-  
+
   ServantManager_var &operator= (ServantManager_ptr);
   ServantManager_var &operator= (const ServantManager_var &);
   ServantManager_ptr operator-> (void) const;
-  
+
   operator const ServantManager_ptr &() const;
   operator ServantManager_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ServantManager_ptr in (void) const;
   ServantManager_ptr &inout (void);
   ServantManager_ptr &out (void);
@@ -1760,7 +1762,7 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER___OUT_CH_
 
-class TAO_Export ServantManager_out
+class TAO_PortableServer_Export ServantManager_out
 {
 public:
   ServantManager_out (ServantManager_ptr &);
@@ -1772,7 +1774,7 @@ public:
   operator ServantManager_ptr &();
   ServantManager_ptr &ptr (void);
   ServantManager_ptr operator-> (void);
-  
+
 private:
   ServantManager_ptr &ptr_;
 };
@@ -1784,7 +1786,7 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER_CH_
 
-class TAO_Export ServantManager : public virtual CORBA_Object
+class TAO_PortableServer_Export ServantManager : public virtual CORBA_Object
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1796,12 +1798,12 @@ public:
   static ServantManager_ptr _duplicate (ServantManager_ptr obj);
   static ServantManager_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServantManager_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServantManager_ptr _nil (void)
@@ -1810,7 +1812,7 @@ public:
     }
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -1837,21 +1839,21 @@ typedef ServantActivator *ServantActivator_ptr;
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_
 
-class TAO_Export ServantActivator_var : public TAO_Base_var
+class TAO_PortableServer_Export ServantActivator_var : public TAO_Base_var
 {
 public:
   ServantActivator_var (void); // default constructor
-  ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {} 
+  ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {}
   ServantActivator_var (const ServantActivator_var &); // copy constructor
   ~ServantActivator_var (void); // destructor
-  
+
   ServantActivator_var &operator= (ServantActivator_ptr);
   ServantActivator_var &operator= (const ServantActivator_var &);
   ServantActivator_ptr operator-> (void) const;
-  
+
   operator const ServantActivator_ptr &() const;
   operator ServantActivator_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ServantActivator_ptr in (void) const;
   ServantActivator_ptr &inout (void);
   ServantActivator_ptr &out (void);
@@ -1872,7 +1874,7 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_
 
-class TAO_Export ServantActivator_out
+class TAO_PortableServer_Export ServantActivator_out
 {
 public:
   ServantActivator_out (ServantActivator_ptr &);
@@ -1884,7 +1886,7 @@ public:
   operator ServantActivator_ptr &();
   ServantActivator_ptr &ptr (void);
   ServantActivator_ptr operator-> (void);
-  
+
 private:
   ServantActivator_ptr &ptr_;
 };
@@ -1896,7 +1898,7 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR_CH_
 
-class TAO_Export ServantActivator: public virtual ServantManager
+class TAO_PortableServer_Export ServantActivator: public virtual ServantManager
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1908,12 +1910,12 @@ public:
   static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
   static ServantActivator_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServantActivator_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServantActivator_ptr _nil (void)
@@ -1950,7 +1952,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -1977,21 +1979,21 @@ typedef ServantLocator *ServantLocator_ptr;
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR___VAR_CH_
 
-class TAO_Export ServantLocator_var : public TAO_Base_var
+class TAO_PortableServer_Export ServantLocator_var : public TAO_Base_var
 {
 public:
   ServantLocator_var (void); // default constructor
-  ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {} 
+  ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {}
   ServantLocator_var (const ServantLocator_var &); // copy constructor
   ~ServantLocator_var (void); // destructor
-  
+
   ServantLocator_var &operator= (ServantLocator_ptr);
   ServantLocator_var &operator= (const ServantLocator_var &);
   ServantLocator_ptr operator-> (void) const;
-  
+
   operator const ServantLocator_ptr &() const;
   operator ServantLocator_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ServantLocator_ptr in (void) const;
   ServantLocator_ptr &inout (void);
   ServantLocator_ptr &out (void);
@@ -2012,7 +2014,7 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR___OUT_CH_
 
-class TAO_Export ServantLocator_out
+class TAO_PortableServer_Export ServantLocator_out
 {
 public:
   ServantLocator_out (ServantLocator_ptr &);
@@ -2024,7 +2026,7 @@ public:
   operator ServantLocator_ptr &();
   ServantLocator_ptr &ptr (void);
   ServantLocator_ptr operator-> (void);
-  
+
 private:
   ServantLocator_ptr &ptr_;
 };
@@ -2036,7 +2038,7 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR_CH_
 
-class TAO_Export ServantLocator: public virtual ServantManager
+class TAO_PortableServer_Export ServantLocator: public virtual ServantManager
 {
 public:
 
@@ -2051,12 +2053,12 @@ public:
   static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
   static ServantLocator_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServantLocator_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static ServantLocator_ptr _nil (void)
@@ -2095,7 +2097,7 @@ public:
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
@@ -2124,21 +2126,21 @@ typedef POA *POA_ptr;
 #if !defined (_PORTABLESERVER_POA___VAR_CH_)
 #define _PORTABLESERVER_POA___VAR_CH_
 
-class TAO_Export POA_var : public TAO_Base_var
+class TAO_PortableServer_Export POA_var : public TAO_Base_var
 {
 public:
   POA_var (void); // default constructor
-  POA_var (POA_ptr p) : ptr_ (p) {} 
+  POA_var (POA_ptr p) : ptr_ (p) {}
   POA_var (const POA_var &); // copy constructor
   ~POA_var (void); // destructor
-  
+
   POA_var &operator= (POA_ptr);
   POA_var &operator= (const POA_var &);
   POA_ptr operator-> (void) const;
-  
+
   operator const POA_ptr &() const;
   operator POA_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   POA_ptr in (void) const;
   POA_ptr &inout (void);
   POA_ptr &out (void);
@@ -2159,7 +2161,7 @@ private:
 #if !defined (_PORTABLESERVER_POA___OUT_CH_)
 #define _PORTABLESERVER_POA___OUT_CH_
 
-class TAO_Export POA_out
+class TAO_PortableServer_Export POA_out
 {
 public:
   POA_out (POA_ptr &);
@@ -2171,7 +2173,7 @@ public:
   operator POA_ptr &();
   POA_ptr &ptr (void);
   POA_ptr operator-> (void);
-  
+
 private:
   POA_ptr &ptr_;
 };
@@ -2183,7 +2185,7 @@ private:
 #if !defined (_PORTABLESERVER_POA_CH_)
 #define _PORTABLESERVER_POA_CH_
 
-class TAO_Export POA : public virtual CORBA_Object
+class TAO_PortableServer_Export POA : public virtual CORBA_Object
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2195,12 +2197,12 @@ public:
   static POA_ptr _duplicate (POA_ptr obj);
   static POA_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static POA_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static POA_ptr _nil (void)
@@ -2212,7 +2214,7 @@ public:
 #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
 #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
 
-  class TAO_Export AdapterAlreadyExists : public CORBA::UserException
+  class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException
   {
   public:
 
@@ -2247,7 +2249,7 @@ public:
 #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
 #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
 
-class TAO_Export AdapterNonExistent : public CORBA::UserException
+class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException
 {
 public:
 
@@ -2282,7 +2284,7 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
 #define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
 
-class TAO_Export InvalidPolicy : public CORBA::UserException
+class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException
 {
 public:
 
@@ -2323,7 +2325,7 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
 #define _PORTABLESERVER_POA_NOSERVANT_CH_
 
-class TAO_Export NoServant : public CORBA::UserException
+class TAO_PortableServer_Export NoServant : public CORBA::UserException
 {
 public:
 
@@ -2359,7 +2361,7 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
 
-class TAO_Export ObjectAlreadyActive : public CORBA::UserException
+class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException
 {
 public:
 
@@ -2394,7 +2396,7 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
 
-class TAO_Export ObjectNotActive : public CORBA::UserException
+class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException
 {
 public:
 
@@ -2429,7 +2431,7 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
 
-class TAO_Export ServantAlreadyActive : public CORBA::UserException
+class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException
 {
 public:
 
@@ -2464,7 +2466,7 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
 
-class TAO_Export ServantNotActive : public CORBA::UserException
+class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException
 {
 public:
 
@@ -2499,7 +2501,7 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
 #define _PORTABLESERVER_POA_WRONGADAPTER_CH_
 
-class TAO_Export WrongAdapter : public CORBA::UserException
+class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException
 {
 public:
 
@@ -2534,7 +2536,7 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
 #define _PORTABLESERVER_POA_WRONGPOLICY_CH_
 
-class TAO_Export WrongPolicy : public CORBA::UserException
+class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException
 {
 public:
 
@@ -2569,7 +2571,7 @@ virtual PortableServer::POA_ptr create_POA (
     const char * adapter_name,
     PortableServer::POAManager_ptr a_POAManager,
     const CORBA::PolicyList & policies,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2581,7 +2583,7 @@ virtual PortableServer::POA_ptr create_POA (
 virtual PortableServer::POA_ptr find_POA (
     const char * adapter_name,
     CORBA::Boolean activate_it,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2592,7 +2594,7 @@ virtual PortableServer::POA_ptr find_POA (
 virtual void destroy (
     CORBA::Boolean etherealize_objects,
     CORBA::Boolean wait_for_completion,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2603,7 +2605,7 @@ virtual void destroy (
 
 virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
     PortableServer::ThreadPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2614,7 +2616,7 @@ virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
 
 virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
     PortableServer::LifespanPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2623,7 +2625,7 @@ virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
 
 virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
     PortableServer::IdUniquenessPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2632,7 +2634,7 @@ virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
 
 virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
     PortableServer::IdAssignmentPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2643,7 +2645,7 @@ virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
 
 virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
     PortableServer::ImplicitActivationPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2652,7 +2654,7 @@ virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_
 
 virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
     PortableServer::ServantRetentionPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2661,7 +2663,7 @@ virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_poli
 
 virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
     PortableServer::RequestProcessingPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2671,7 +2673,7 @@ virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_po
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 virtual char * the_name (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2679,7 +2681,7 @@ virtual char * the_name (
   )) = 0;
 
 virtual PortableServer::POA_ptr the_parent (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2687,7 +2689,7 @@ virtual PortableServer::POA_ptr the_parent (
   )) = 0;
 
 virtual PortableServer::POAList * the_children (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2695,7 +2697,7 @@ virtual PortableServer::POAList * the_children (
   )) = 0;
 
 virtual PortableServer::POAManager_ptr the_POAManager (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2705,7 +2707,7 @@ virtual PortableServer::POAManager_ptr the_POAManager (
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 virtual PortableServer::AdapterActivator_ptr the_activator (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2714,7 +2716,7 @@ virtual PortableServer::AdapterActivator_ptr the_activator (
 
 virtual void the_activator (
     PortableServer::AdapterActivator_ptr the_activator,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2722,7 +2724,7 @@ virtual void the_activator (
   )) = 0;
 
 virtual PortableServer::ServantManager_ptr get_servant_manager (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2732,7 +2734,7 @@ virtual PortableServer::ServantManager_ptr get_servant_manager (
 
 virtual void set_servant_manager (
     PortableServer::ServantManager_ptr imgr,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2741,7 +2743,7 @@ virtual void set_servant_manager (
   )) = 0;
 
 virtual PortableServer::Servant get_servant (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2752,7 +2754,7 @@ virtual PortableServer::Servant get_servant (
 
 virtual void set_servant (
     PortableServer::Servant p_servant,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2764,7 +2766,7 @@ virtual void set_servant (
 
 virtual PortableServer::ObjectId * activate_object (
     PortableServer::Servant p_servant,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2776,7 +2778,7 @@ virtual PortableServer::ObjectId * activate_object (
 virtual void activate_object_with_id (
     const PortableServer::ObjectId & id,
     PortableServer::Servant p_servant,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2788,7 +2790,7 @@ virtual void activate_object_with_id (
 
 virtual void deactivate_object (
     const PortableServer::ObjectId & oid,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2799,7 +2801,7 @@ virtual void deactivate_object (
 
 virtual CORBA::Object_ptr create_reference (
     const char * intf,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2810,7 +2812,7 @@ virtual CORBA::Object_ptr create_reference (
 virtual CORBA::Object_ptr create_reference_with_id (
     const PortableServer::ObjectId & oid,
     const char * intf,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2820,7 +2822,7 @@ virtual CORBA::Object_ptr create_reference_with_id (
 
 virtual PortableServer::ObjectId * servant_to_id (
     PortableServer::Servant p_servant,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2831,7 +2833,7 @@ virtual PortableServer::ObjectId * servant_to_id (
 
 virtual CORBA::Object_ptr servant_to_reference (
     PortableServer::Servant p_servant,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2842,7 +2844,7 @@ virtual CORBA::Object_ptr servant_to_reference (
 
 virtual PortableServer::Servant reference_to_servant (
     CORBA::Object_ptr reference,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2853,7 +2855,7 @@ virtual PortableServer::Servant reference_to_servant (
 
 virtual PortableServer::ObjectId * reference_to_id (
     CORBA::Object_ptr reference,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2864,7 +2866,7 @@ virtual PortableServer::ObjectId * reference_to_id (
 
 virtual PortableServer::Servant id_to_servant (
     const PortableServer::ObjectId & oid,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2875,7 +2877,7 @@ virtual PortableServer::Servant id_to_servant (
 
 virtual CORBA::Object_ptr id_to_reference (
     const PortableServer::ObjectId & oid,
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -2912,21 +2914,21 @@ typedef Current *Current_ptr;
 #if !defined (_PORTABLESERVER_CURRENT___VAR_CH_)
 #define _PORTABLESERVER_CURRENT___VAR_CH_
 
-class TAO_Export Current_var : public TAO_Base_var
+class TAO_PortableServer_Export Current_var : public TAO_Base_var
 {
 public:
   Current_var (void); // default constructor
-  Current_var (Current_ptr p) : ptr_ (p) {} 
+  Current_var (Current_ptr p) : ptr_ (p) {}
   Current_var (const Current_var &); // copy constructor
   ~Current_var (void); // destructor
-  
+
   Current_var &operator= (Current_ptr);
   Current_var &operator= (const Current_var &);
   Current_ptr operator-> (void) const;
-  
+
   operator const Current_ptr &() const;
   operator Current_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   Current_ptr in (void) const;
   Current_ptr &inout (void);
   Current_ptr &out (void);
@@ -2947,7 +2949,7 @@ private:
 #if !defined (_PORTABLESERVER_CURRENT___OUT_CH_)
 #define _PORTABLESERVER_CURRENT___OUT_CH_
 
-class TAO_Export Current_out
+class TAO_PortableServer_Export Current_out
 {
 public:
   Current_out (Current_ptr &);
@@ -2959,7 +2961,7 @@ public:
   operator Current_ptr &();
   Current_ptr &ptr (void);
   Current_ptr operator-> (void);
-  
+
 private:
   Current_ptr &ptr_;
 };
@@ -2971,7 +2973,7 @@ private:
 #if !defined (_PORTABLESERVER_CURRENT_CH_)
 #define _PORTABLESERVER_CURRENT_CH_
 
-class TAO_Export Current: public virtual CORBA::Current
+class TAO_PortableServer_Export Current: public virtual CORBA::Current
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2983,12 +2985,12 @@ public:
   static Current_ptr _duplicate (Current_ptr obj);
   static Current_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static Current_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
   static Current_ptr _nil (void)
@@ -3000,7 +3002,7 @@ public:
 #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
 #define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
 
-  class TAO_Export NoContext : public CORBA::UserException
+  class TAO_PortableServer_Export NoContext : public CORBA::UserException
   {
   public:
 
@@ -3032,7 +3034,7 @@ public:
 #endif /* end #if !defined */
 
 virtual PortableServer::POA_ptr get_POA (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -3041,7 +3043,7 @@ virtual PortableServer::POA_ptr get_POA (
   )) = 0;
 
 virtual PortableServer::ObjectId * get_object_id (
-    CORBA::Environment &ACE_TRY_ENV = 
+    CORBA::Environment &ACE_TRY_ENV =
       TAO_default_environment ()
   )
   ACE_THROW_SPEC ((
@@ -3072,42 +3074,42 @@ private:
 }
 TAO_NAMESPACE_CLOSE // module PortableServer
 
-TAO_Export void operator<<= (CORBA::Any &, const PortableServer::ObjectId &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&);
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ObjectId &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-TAO_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
+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_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
+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_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
-TAO_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
-TAO_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
+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_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
-TAO_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
-TAO_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
+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);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
+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 */
 
@@ -3117,11 +3119,11 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Reque
 #if !defined _TAO_CDR_OP_PortableServer_ObjectId_H_
 #define _TAO_CDR_OP_PortableServer_ObjectId_H_
 
-TAO_Export CORBA::Boolean operator<< (
+TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const PortableServer::ObjectId &
   );
-TAO_Export CORBA::Boolean operator>> (
+TAO_PortableServer_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     PortableServer::ObjectId &
   );
@@ -3130,8 +3132,8 @@ TAO_Export CORBA::Boolean operator>> (
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
+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 */
 
@@ -3139,7 +3141,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardReq
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-TAO_Export ostream& operator<< (ostream &, const PortableServer::ForwardRequest &);
+TAO_PortableServer_Export ostream& operator<< (ostream &, const PortableServer::ForwardRequest &);
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
@@ -3147,26 +3149,26 @@ TAO_Export ostream& operator<< (ostream &, const PortableServer::ForwardRequest
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // 
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
+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_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // 
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // 
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // 
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
+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_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // 
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // 
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // 
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
+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 */
 
diff --git a/TAO/tao/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
index df518014776..abbd8cbe570 100644
--- a/TAO/tao/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -20,7 +20,7 @@ PortableServer::POA_var::POA_var (void) // default constructor
   : ptr_ (PortableServer::POA::_nil ())
 {}
 
-ACE_INLINE PortableServer::POA_ptr 
+ACE_INLINE PortableServer::POA_ptr
 PortableServer::POA_var::ptr (void) const
 {
   return this->ptr_;
@@ -57,19 +57,19 @@ PortableServer::POA_var::operator= (const PortableServer::POA_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::POA_var::operator const PortableServer::POA_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::POA_var::operator PortableServer::POA_ptr &() // cast 
+ACE_INLINE
+PortableServer::POA_var::operator PortableServer::POA_ptr &() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE PortableServer::POA_ptr 
+ACE_INLINE PortableServer::POA_ptr
 PortableServer::POA_var::operator-> (void) const
 {
   return this->ptr_;
@@ -95,7 +95,7 @@ PortableServer::POA_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE PortableServer::POA_ptr 
+ACE_INLINE PortableServer::POA_ptr
 PortableServer::POA_var::_retn (void)
 {
   // yield ownership of managed obj reference
@@ -156,7 +156,7 @@ PortableServer::POA_out::operator= (PortableServer::POA_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::POA_out::operator PortableServer::POA_ptr &() // cast
 {
   return this->ptr_;
@@ -168,7 +168,7 @@ PortableServer::POA_out::ptr (void) // ptr
   return this->ptr_;
 }
 
-ACE_INLINE PortableServer::POA_ptr 
+ACE_INLINE PortableServer::POA_ptr
 PortableServer::POA_out::operator-> (void)
 {
   return this->ptr_;
@@ -179,7 +179,7 @@ PortableServer::POA_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_
 
@@ -187,34 +187,34 @@ PortableServer::POA_out::operator-> (void)
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (CORBA::ULong nelems)
   {
     PortableServer::POA **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, PortableServer::POA*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       buf[i] = PortableServer::POA::_nil ();
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (PortableServer::POA **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void)
   {
   }
-  
+
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -223,7 +223,7 @@ PortableServer::POA_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList(const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -232,10 +232,10 @@ PortableServer::POA_out::operator-> (void)
     {
       PortableServer::POA **tmp1 = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
       PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -243,17 +243,17 @@ PortableServer::POA_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList &
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator= (const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -267,18 +267,18 @@ PortableServer::POA_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     PortableServer::POA **tmp1 = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
     PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -287,7 +287,7 @@ PortableServer::POA_out::operator-> (void)
     PortableServer::POA ** const tmp = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE PortableServer::POA* *
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (CORBA::Boolean orphan)
   {
@@ -299,7 +299,7 @@ PortableServer::POA_out::operator-> (void)
       {
         result = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
         this->buffer_ = result;
-	this->release_ = 1;
+        this->release_ = 1;
       }
       else
       {
@@ -321,18 +321,18 @@ PortableServer::POA_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const PortableServer::POA* *
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_PORTABLESERVER_POALIST_CI_)
 #define _PORTABLESERVER_POALIST_CI_
@@ -397,32 +397,32 @@ PortableServer::POAList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::POAList_var::operator const ::PortableServer::POAList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast 
+ACE_INLINE
+PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast 
+ACE_INLINE
+PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast 
+PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var> 
+ACE_INLINE TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
 PortableServer::POAList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -440,7 +440,7 @@ PortableServer::POAList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::PortableServer::POAList *&
 PortableServer::POAList_var::out (void)
 {
@@ -501,7 +501,7 @@ PortableServer::POAList_out::operator= (POAList *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::POAList_out::operator ::PortableServer::POAList *&() // cast
 {
   return this->ptr_;
@@ -519,7 +519,7 @@ PortableServer::POAList_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var> 
+ACE_INLINE TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var>
 PortableServer::POAList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -611,20 +611,20 @@ PortableServer::ObjectId_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ObjectId_var::operator const ::PortableServer::ObjectId &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast 
+ACE_INLINE
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast 
+ACE_INLINE
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast
 {
   return *this->ptr_;
 }
@@ -647,7 +647,7 @@ PortableServer::ObjectId_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::PortableServer::ObjectId *&
 PortableServer::ObjectId_var::out (void)
 {
@@ -708,7 +708,7 @@ PortableServer::ObjectId_out::operator= (ObjectId *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ObjectId_out::operator ::PortableServer::ObjectId *&() // cast
 {
   return this->ptr_;
@@ -791,14 +791,14 @@ PortableServer::ThreadPolicy_var::operator= (const ::PortableServer::ThreadPolic
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ThreadPolicy_var::operator const ::PortableServer::ThreadPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast 
+ACE_INLINE
+PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -890,7 +890,7 @@ PortableServer::ThreadPolicy_out::operator= (ThreadPolicy_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ThreadPolicy_out::operator ::PortableServer::ThreadPolicy_ptr &() // cast
 {
   return this->ptr_;
@@ -962,14 +962,14 @@ PortableServer::LifespanPolicy_var::operator= (const ::PortableServer::LifespanP
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::LifespanPolicy_var::operator const ::PortableServer::LifespanPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast 
+ACE_INLINE
+PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1061,7 +1061,7 @@ PortableServer::LifespanPolicy_out::operator= (LifespanPolicy_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::LifespanPolicy_out::operator ::PortableServer::LifespanPolicy_ptr &() // cast
 {
   return this->ptr_;
@@ -1132,14 +1132,14 @@ PortableServer::IdUniquenessPolicy_var::operator= (const ::PortableServer::IdUni
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::IdUniquenessPolicy_var::operator const ::PortableServer::IdUniquenessPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast 
+ACE_INLINE
+PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1231,7 +1231,7 @@ PortableServer::IdUniquenessPolicy_out::operator= (IdUniquenessPolicy_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::IdUniquenessPolicy_out::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast
 {
   return this->ptr_;
@@ -1302,14 +1302,14 @@ PortableServer::IdAssignmentPolicy_var::operator= (const ::PortableServer::IdAss
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::IdAssignmentPolicy_var::operator const ::PortableServer::IdAssignmentPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast 
+ACE_INLINE
+PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1401,7 +1401,7 @@ PortableServer::IdAssignmentPolicy_out::operator= (IdAssignmentPolicy_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::IdAssignmentPolicy_out::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast
 {
   return this->ptr_;
@@ -1473,14 +1473,14 @@ PortableServer::ImplicitActivationPolicy_var::operator= (const ::PortableServer:
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ImplicitActivationPolicy_var::operator const ::PortableServer::ImplicitActivationPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast 
+ACE_INLINE
+PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1572,7 +1572,7 @@ PortableServer::ImplicitActivationPolicy_out::operator= (ImplicitActivationPolic
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ImplicitActivationPolicy_out::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast
 {
   return this->ptr_;
@@ -1643,14 +1643,14 @@ PortableServer::ServantRetentionPolicy_var::operator= (const ::PortableServer::S
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ServantRetentionPolicy_var::operator const ::PortableServer::ServantRetentionPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast 
+ACE_INLINE
+PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1742,7 +1742,7 @@ PortableServer::ServantRetentionPolicy_out::operator= (ServantRetentionPolicy_pt
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ServantRetentionPolicy_out::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast
 {
   return this->ptr_;
@@ -1813,14 +1813,14 @@ PortableServer::RequestProcessingPolicy_var::operator= (const ::PortableServer::
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::RequestProcessingPolicy_var::operator const ::PortableServer::RequestProcessingPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast 
+ACE_INLINE
+PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1912,7 +1912,7 @@ PortableServer::RequestProcessingPolicy_out::operator= (RequestProcessingPolicy_
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::RequestProcessingPolicy_out::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast
 {
   return this->ptr_;
@@ -1989,14 +1989,14 @@ PortableServer::POAManager_var::operator= (const ::PortableServer::POAManager_va
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::POAManager_var::operator const ::PortableServer::POAManager_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast 
+ACE_INLINE
+PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2088,7 +2088,7 @@ PortableServer::POAManager_out::operator= (POAManager_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::POAManager_out::operator ::PortableServer::POAManager_ptr &() // cast
 {
   return this->ptr_;
@@ -2160,14 +2160,14 @@ PortableServer::AdapterActivator_var::operator= (const ::PortableServer::Adapter
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::AdapterActivator_var::operator const ::PortableServer::AdapterActivator_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast 
+ACE_INLINE
+PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2259,7 +2259,7 @@ PortableServer::AdapterActivator_out::operator= (AdapterActivator_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::AdapterActivator_out::operator ::PortableServer::AdapterActivator_ptr &() // cast
 {
   return this->ptr_;
@@ -2330,14 +2330,14 @@ PortableServer::ServantManager_var::operator= (const ::PortableServer::ServantMa
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ServantManager_var::operator const ::PortableServer::ServantManager_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast 
+ACE_INLINE
+PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2429,7 +2429,7 @@ PortableServer::ServantManager_out::operator= (ServantManager_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ServantManager_out::operator ::PortableServer::ServantManager_ptr &() // cast
 {
   return this->ptr_;
@@ -2500,14 +2500,14 @@ PortableServer::ServantActivator_var::operator= (const ::PortableServer::Servant
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ServantActivator_var::operator const ::PortableServer::ServantActivator_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast 
+ACE_INLINE
+PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2599,7 +2599,7 @@ PortableServer::ServantActivator_out::operator= (ServantActivator_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ServantActivator_out::operator ::PortableServer::ServantActivator_ptr &() // cast
 {
   return this->ptr_;
@@ -2670,14 +2670,14 @@ PortableServer::ServantLocator_var::operator= (const ::PortableServer::ServantLo
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ServantLocator_var::operator const ::PortableServer::ServantLocator_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast 
+ACE_INLINE
+PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2769,7 +2769,7 @@ PortableServer::ServantLocator_out::operator= (ServantLocator_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ServantLocator_out::operator ::PortableServer::ServantLocator_ptr &() // cast
 {
   return this->ptr_;
@@ -2886,14 +2886,14 @@ PortableServer::Current_var::operator= (const ::PortableServer::Current_var &p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::Current_var::operator const ::PortableServer::Current_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast 
+ACE_INLINE
+PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2985,7 +2985,7 @@ PortableServer::Current_out::operator= (Current_ptr p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::Current_out::operator ::PortableServer::Current_ptr &() // cast
 {
   return this->ptr_;
@@ -3020,11 +3020,11 @@ operator>> (
 #if !defined _TAO_CDR_OP_PortableServer_ObjectId_I_
 #define _TAO_CDR_OP_PortableServer_ObjectId_I_
 
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const PortableServer::ObjectId &
   );
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     PortableServer::ObjectId &
   );
diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index d40a97a33b0..77930a2dcfa 100644
--- a/TAO/tao/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "tao/Servant_Base.h"
+#include "Servant_Base.h"
+#include "POA.h"
+#include "Operation_Table.h"
+#include "Collocated_Object.h"
+
 #include "tao/Timeprobe.h"
-#include "tao/Operation_Table.h"
 #include "tao/ORB_Core.h"
-#include "tao/POA.h"
 #include "tao/Stub.h"
 #include "tao/Environment.h"
 #include "tao/Server_Request.h"
@@ -12,7 +14,7 @@
 ACE_RCSID(tao, Servant_Base, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Servant_Base.i"
+# include "Servant_Base.i"
 #endif /* ! __ACE_INLINE__ */
 
 #if defined (ACE_ENABLE_TIMEPROBES)
@@ -63,7 +65,11 @@ TAO_ServantBase::~TAO_ServantBase (void)
 PortableServer::POA_ptr
 TAO_ServantBase::_default_POA (CORBA::Environment &ACE_TRY_ENV)
 {
-  return TAO_ORB_Core_instance ()->root_poa_reference (ACE_TRY_ENV);
+  CORBA::Object_var object =
+    TAO_ORB_Core_instance ()->root_poa (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+
+  return PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
 }
 
 void
@@ -119,7 +125,8 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
   TAO_Stub *stub = 0;
 
   TAO_POA_Current_Impl *poa_current_impl =
-    TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
+    ACE_static_cast(TAO_POA_Current_Impl *,
+                    TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 
   CORBA::ORB_ptr servant_orb = 0;
 
@@ -128,16 +135,12 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
     {
       servant_orb = poa_current_impl->orb_core ().orb () ;
 
-      CORBA::PolicyList_var client_exposed_policies =
-        poa_current_impl->poa ()->client_exposed_policies (poa_current_impl->priority (),
-                                                           ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
 
-      stub = servant_orb->create_stub_object (poa_current_impl->object_key (),
-                                              this->_interface_repository_id (),
-                                              client_exposed_policies._retn (),
-                                              poa_current_impl->poa (),
-                                              ACE_TRY_ENV);
+      stub = poa_current_impl->poa ()->key_to_stub (
+          poa_current_impl->object_key (),
+          this->_interface_repository_id (),
+          poa_current_impl->priority (),
+          ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
     }
   else
@@ -395,7 +398,7 @@ TAO_DynamicImplementation::_this (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Create a object
-  return new CORBA::Object (stub, this, 1);
+  return new TAO_Collocated_Object (stub, 1, this);
 }
 
 const char *
@@ -422,7 +425,8 @@ TAO_DynamicImplementation::_create_stub (CORBA::Environment &ACE_TRY_ENV)
   // by the DSI servant, it raises the PortableServer::WrongPolicy
   // exception.
   TAO_POA_Current_Impl *poa_current_impl =
-    TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
+    ACE_static_cast(TAO_POA_Current_Impl *,
+                    TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 
   if (poa_current_impl == 0 ||
       this != poa_current_impl->servant ())
@@ -444,11 +448,16 @@ TAO_DynamicImplementation::_create_stub (CORBA::Environment &ACE_TRY_ENV)
                                                        ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  return poa_current_impl->poa ()->orb_core ().orb ()->create_stub_object (poa_current_impl->object_key (),
-                                                                           interface,
-                                                                           client_exposed_policies._retn (),
-                                                                           poa_current_impl->poa (),
-                                                                           ACE_TRY_ENV);
+  // @@ PPOA
+  // @@ return orb->create_stub_object (
+  // @@ client_exposed_policies._retn (),
+  // @@ poa_current_impl->poa (),
+  // @@ ACE_TRY_ENV);
+  return poa_current_impl->poa ()->key_to_stub (
+      poa_current_impl->object_key (),
+      interface,
+      poa_current_impl->priority (),
+      ACE_TRY_ENV);
 }
 
 void
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 3d380313c1c..433b2b0002a 100644
--- a/TAO/tao/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -18,17 +18,15 @@
 #define TAO_SERVANT_BASE_H
 #include "ace/pre.h"
 
-#include "tao/corbafwd.h"
+#include "PortableServerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServerC.h"
-
 class TAO_Operation_Table;
 
-class TAO_Export TAO_ServantBase
+class TAO_PortableServer_Export TAO_ServantBase
 {
   // = TITLE
   //     Base class for skeletons and servants.
@@ -124,7 +122,7 @@ protected:
   // Reference count for lock.
 };
 
-class TAO_Export TAO_RefCountServantBase : public virtual TAO_ServantBase
+class TAO_PortableServer_Export TAO_RefCountServantBase : public virtual TAO_ServantBase
 {
   // = TITLE
   //     Reference counting mix-in class.
@@ -184,7 +182,7 @@ private:
   // Reference counter.
 };
 
-class TAO_Export TAO_ServantBase_var
+class TAO_PortableServer_Export TAO_ServantBase_var
 {
   // = TITLE
   //     Auto pointer for reference counting servants.
@@ -223,14 +221,14 @@ private:
   TAO_ServantBase *ptr_;
 };
 
-class TAO_Export TAO_Servant_Hash
+class TAO_PortableServer_Export TAO_Servant_Hash
 {
 public:
   u_long operator () (PortableServer::Servant servant) const;
   // Returns hash value.
 };
 
-class TAO_Export TAO_Local_ServantBase : public virtual TAO_ServantBase
+class TAO_PortableServer_Export TAO_Local_ServantBase : public virtual TAO_ServantBase
 {
   // = TITLE
   //     Base class for local servants.
@@ -256,7 +254,7 @@ protected:
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase
+class TAO_PortableServer_Export TAO_DynamicImplementation : public virtual TAO_ServantBase
 {
   // = TITLE
   //   Base class for DSI.
@@ -303,7 +301,7 @@ protected:
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 #if defined (__ACE_INLINE__)
-# include "tao/Servant_Base.i"
+# include "Servant_Base.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/TAO/tao/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i
index 3955c3d256a..3955c3d256a 100644
--- a/TAO/tao/Servant_Base.i
+++ b/TAO/tao/PortableServer/Servant_Base.i
diff --git a/TAO/tao/PortableServer/TAO_PortableServer.dsp b/TAO/tao/PortableServer/TAO_PortableServer.dsp
new file mode 100644
index 00000000000..30a370c42cf
--- /dev/null
+++ b/TAO/tao/PortableServer/TAO_PortableServer.dsp
@@ -0,0 +1,401 @@
+# Microsoft Developer Studio Project File - Name="PortableServer" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=PortableServer - Win32 MFC Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_PortableServer.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_PortableServer.mak" CFG="PortableServer - Win32 MFC Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "PortableServer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "PortableServer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "PortableServer - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "PortableServer - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "PortableServer - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Release\PortableServer"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PortableServer_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "TAO_PORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

+# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_PortableServer.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Debug\PortableServer"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PortableServer_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_PORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServerd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "PortableServer___Win32_MFC_Debug"

+# PROP BASE Intermediate_Dir "PortableServer___Win32_MFC_Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Debug\PortableServerMFC"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D "TAO_PORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib TAO_RTSchedd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServerd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOmfcd.lib acemfcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServermfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "PortableServer___Win32_MFC_Release"

+# PROP BASE Intermediate_Dir "PortableServer___Win32_MFC_Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Release\PortableServerMFC"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D ACE_HAS_MFC=1 /D "TAO_PORTABLESERVER_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 ace.lib TAO.lib TAO_Svc_Utils.lib TAO_RTEvent.lib TAO_RTSched.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_PortableServer.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_PortableServermfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "PortableServer - Win32 Release"

+# Name "PortableServer - Win32 Debug"

+# Name "PortableServer - Win32 MFC Debug"

+# Name "PortableServer - Win32 MFC Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\Active_Object_Map.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Collocated_Object.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DomainS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Forwarding_Servant.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\FT_CORBAS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Key_Adapters.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Object_Adapter.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Operation_Table.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ORB_Manager.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\POA.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\POAManager.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PolicyS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PortableServer.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PortableServerC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Base.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Active_Object_Map.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Collocated_Object.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DomainS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Forwarding_Servant.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\FT_CORBAS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoS_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Key_Adapters.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Object_Adapter.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Operation_Table.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ORB_Manager.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\POA.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\POA_CORBA.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\poa_macros.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\POAManager.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PortableServer.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\portableserver_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PortableServerC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Base.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter ".i"

+# Begin Source File

+

+SOURCE=.\Active_Object_Map.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Collocated_Object.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\DomainS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\FT_CORBAS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoS_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Key_Adapters.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Object_Adapter.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\POA.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\POAManager.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\PortableServerC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Base.i

+# End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\ImplRepoS_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp b/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
new file mode 100644
index 00000000000..b264e664c13
--- /dev/null
+++ b/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
@@ -0,0 +1,332 @@
+# Microsoft Developer Studio Project File - Name="PortableServer_Static" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

+

+CFG=PortableServer_Static - Win32 Static Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_PortableServer_Static.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_PortableServer_Static.mak" CFG="PortableServer_Static - Win32 Static Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "PortableServer_Static - Win32 Static Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "PortableServer_Static - Win32 Static Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "PortableServer_Static - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "LIB\Release\PortableServer"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D TAO_PORTABLESERVER_HAS_DLL=0 /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:"TAO_PortableServers.lib"

+

+!ELSEIF  "$(CFG)" == "PortableServer_Static - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "LIB\Debug\PortableServer"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D TAO_PORTABLESERVER_HAS_DLL=0 /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:"TAO_PortableServersd.lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "PortableServer_Static - Win32 Static Release"

+# Name "PortableServer_Static - Win32 Static Debug"

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\ImplRepoS_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i"

+# Begin Source File

+

+SOURCE=.\Active_Object_Map.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Collocated_Object.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\DomainS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\FT_CORBAS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoS_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Key_Adapters.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS_T.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Object_Adapter.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\POA.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\POAManager.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\PortableServerC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Base.i

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h"

+# Begin Source File

+

+SOURCE=.\Active_Object_Map.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Collocated_Object.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DomainS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Forwarding_Servant.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\FT_CORBAS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoS_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Key_Adapters.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Object_Adapter.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Operation_Table.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ORB_Manager.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\POA.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\POA_CORBA.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\poa_macros.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\POAManager.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PortableServer.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\portableserver_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PortableServerC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Base.h

+# End Source File

+# End Group

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp"

+# Begin Source File

+

+SOURCE=.\Active_Object_Map.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Collocated_Object.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DomainS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Forwarding_Servant.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\FT_CORBAS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ImplRepoS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Key_Adapters.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\MessagingS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Object_Adapter.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Operation_Table.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ORB_Manager.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\POA.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\POAManager.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PolicyS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PortableServer.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PortableServerC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Base.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
new file mode 100644
index 00000000000..0f2b325646e
--- /dev/null
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -0,0 +1,38 @@
+// $Id$
+
+#ifndef TAO_POA_MACROS_H
+#define TAO_POA_MACROS_H
+#include "ace/pre.h"
+
+#include "tao/try_macros.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#define TAO_OBJECT_ADAPTER_GUARD \
+  ACE_GUARD_THROW_EX (ACE_Lock, \
+                      monitor, \
+                      this->lock (), \
+                      CORBA::OBJ_ADAPTER ()); \
+  ACE_CHECK
+
+#define TAO_OBJECT_ADAPTER_GUARD_RETURN(RETURN) \
+  ACE_GUARD_THROW_EX (ACE_Lock, \
+                      monitor, \
+                      this->lock (), \
+                      CORBA::OBJ_ADAPTER ()); \
+  ACE_CHECK_RETURN (RETURN)
+
+#define TAO_POA_GUARD \
+  TAO_POA_Guard poa_guard (*this, ACE_TRY_ENV); \
+  ACE_UNUSED_ARG (poa_guard); \
+  ACE_CHECK
+
+#define TAO_POA_GUARD_RETURN(RETURN) \
+  TAO_POA_Guard poa_guard (*this, ACE_TRY_ENV); \
+  ACE_UNUSED_ARG (poa_guard); \
+  ACE_CHECK_RETURN (RETURN)
+
+#include "ace/post.h"
+#endif /* TAO_POA_MACROS_H */
diff --git a/TAO/tao/PortableServer/portableserver_export.h b/TAO/tao/PortableServer/portableserver_export.h
new file mode 100644
index 00000000000..5a102f0c2c3
--- /dev/null
+++ b/TAO/tao/PortableServer/portableserver_export.h
@@ -0,0 +1,40 @@
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by
+// generate_export_file.pl
+// ------------------------------
+#ifndef TAO_PORTABLESERVER_EXPORT_H
+#define TAO_PORTABLESERVER_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (TAO_PORTABLESERVER_HAS_DLL)
+#define TAO_PORTABLESERVER_HAS_DLL 1
+#endif /* ! TAO_PORTABLESERVER_HAS_DLL */
+
+#if defined (TAO_PORTABLESERVER_HAS_DLL)
+#  if (TAO_PORTABLESERVER_HAS_DLL == 1)
+#    if defined (TAO_PORTABLESERVER_BUILD_DLL)
+#      define TAO_PortableServer_Export ACE_Proper_Export_Flag
+#      define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#      define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    else
+#      define TAO_PortableServer_Export ACE_Proper_Import_Flag
+#      define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#      define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    endif /* TAO_PORTABLESERVER_BUILD_DLL */
+#  else
+#    define TAO_PortableServer_Export
+#    define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T)
+#    define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif   /* ! TAO_PORTABLESERVER_HAS_DLL == 1 */
+#else
+#  define TAO_PortableServer_Export
+#  define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T)
+#  define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif     /* TAO_PORTABLESERVER_HAS_DLL */
+
+#endif     /* TAO_PORTABLESERVER_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index 4c82f3003c5..81bf75162ab 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -1,9 +1,8 @@
 // $Id$
 
-
 #include "tao/Reply_Dispatcher.h"
 
-ACE_RCSID(tao, DII_Reply_Dispatcher, "$Id$")
+ACE_RCSID(tao, Reply_Dispatcher, "$Id$")
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Reply_Dispatcher.i"
diff --git a/TAO/tao/Request_Info.h b/TAO/tao/Request_Info.h
index 7e169fe1103..1cbcaccab12 100644
--- a/TAO/tao/Request_Info.h
+++ b/TAO/tao/Request_Info.h
@@ -36,123 +36,123 @@
 #endif /* _MSC_VER */
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-//****************************************************************               
+//****************************************************************
 
-class TAO_Export TAO_ClientRequest_Info 
+class TAO_Export TAO_ClientRequest_Info
 : public virtual PortableInterceptor::ClientRequestInfo
 {
  public:
   TAO_ClientRequest_Info (const char * operation,
-                          IOP::ServiceContextList &service_context_list,               
+                          IOP::ServiceContextList &service_context_list,
                       CORBA::Object * target,
                       CORBA::Environment &ACE_TRY_ENV =
                       TAO_default_environment ());
 
-  virtual CORBA::ULong request_id (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::ULong request_id (CORBA::Environment &ACE_TRY_ENV =
                                    TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * operation (CORBA::Environment &ACE_TRY_ENV = 
+  virtual char * operation (CORBA::Environment &ACE_TRY_ENV =
                             TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::ParameterList * arguments (CORBA::Environment &ACE_TRY_ENV = 
+  virtual Dynamic::ParameterList * arguments (CORBA::Environment &ACE_TRY_ENV =
                                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::ExceptionList * exceptions (CORBA::Environment &ACE_TRY_ENV = 
+  virtual Dynamic::ExceptionList * exceptions (CORBA::Environment &ACE_TRY_ENV =
                                                TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::ContextList * contexts (CORBA::Environment &ACE_TRY_ENV = 
+  virtual Dynamic::ContextList * contexts (CORBA::Environment &ACE_TRY_ENV =
                                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::RequestContext * operation_context (CORBA::Environment &ACE_TRY_ENV = 
+  virtual Dynamic::RequestContext * operation_context (CORBA::Environment &ACE_TRY_ENV =
                                                        TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Any * result (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Any * result (CORBA::Environment &ACE_TRY_ENV =
                                TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean response_expected (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Boolean response_expected (CORBA::Environment &ACE_TRY_ENV =
                                             TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
 # if (TAO_HAS_CORBA_MESSAGING == 1)
-  virtual Messaging::SyncScope sync_scope (CORBA::Environment &ACE_TRY_ENV = 
+  virtual Messaging::SyncScope sync_scope (CORBA::Environment &ACE_TRY_ENV =
                                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif  /* TAO_HAS_CORBA_MESSAGING */
 
-  virtual PortableInterceptor::ReplyStatus reply_status (CORBA::Environment &ACE_TRY_ENV = 
+  virtual PortableInterceptor::ReplyStatus reply_status (CORBA::Environment &ACE_TRY_ENV =
                                                          TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Object_ptr forward_reference (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Object_ptr forward_reference (CORBA::Environment &ACE_TRY_ENV =
                                                TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
   virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id,
-                                 CORBA::Environment &ACE_TRY_ENV = 
+                                 CORBA::Environment &ACE_TRY_ENV =
                                  TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
   virtual IOP::ServiceContext * get_request_service_context (IOP::ServiceId id,
-                                                           CORBA::Environment &ACE_TRY_ENV = 
+                                                           CORBA::Environment &ACE_TRY_ENV =
                                                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IOP::ServiceContext * get_reply_service_context (IOP::ServiceId id,
-                                                           CORBA::Environment &ACE_TRY_ENV = 
+                                                           CORBA::Environment &ACE_TRY_ENV =
                                                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Object_ptr target (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Object_ptr target (CORBA::Environment &ACE_TRY_ENV =
                                     TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Object_ptr effective_target (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Object_ptr effective_target (CORBA::Environment &ACE_TRY_ENV =
                                               TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual IOP::TaggedProfile * effective_profile (CORBA::Environment &ACE_TRY_ENV = 
+
+  virtual IOP::TaggedProfile * effective_profile (CORBA::Environment &ACE_TRY_ENV =
                                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Any * received_exception (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Any * received_exception (CORBA::Environment &ACE_TRY_ENV =
                                            TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
   // This method causes problem since there is no trivial way to
-  // extract the exception from the Any. 
+  // extract the exception from the Any.
 
-  virtual CORBA::Exception * _received_exception (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Exception * _received_exception (CORBA::Environment &ACE_TRY_ENV =
                                                   TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Note: This is TAO specific and was done to combat the previous
   // problem to some extent.
 
-  virtual char * received_exception_id (CORBA::Environment &ACE_TRY_ENV = 
+  virtual char * received_exception_id (CORBA::Environment &ACE_TRY_ENV =
                                         TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
 
    virtual IOP::TaggedComponent * get_effective_component (IOP::ComponentId id,
-                                                           CORBA::Environment &ACE_TRY_ENV = 
+                                                           CORBA::Environment &ACE_TRY_ENV =
                                                            TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
- 
+
    virtual CORBA::Policy_ptr get_request_policy (CORBA::PolicyType type,
-                                                 CORBA::Environment &ACE_TRY_ENV = 
+                                                 CORBA::Environment &ACE_TRY_ENV =
                                                  TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
 
    virtual void add_request_service_context (const IOP::ServiceContext & service_context,
                                              CORBA::Boolean replace,
-                                             CORBA::Environment &ACE_TRY_ENV = 
+                                             CORBA::Environment &ACE_TRY_ENV =
                                              TAO_default_environment ())
-     ACE_THROW_SPEC ((CORBA::SystemException));    
+     ACE_THROW_SPEC ((CORBA::SystemException));
 
  protected:
    void exception (CORBA::Exception *exception);
@@ -169,134 +169,134 @@ class TAO_Export TAO_ClientRequest_Info
    Dynamic::RequestContext request_context_;
    CORBA::Object_var forward_reference_;
 
-   // Needed to ensure no copy anywhere. 
+   // Needed to ensure no copy anywhere.
    IOP::ServiceContextList &service_context_list_;
 
    CORBA::Any result_val_;
    CORBA::Object_var target_;
    CORBA::Object_var effective_target_;
-   CORBA::Any any_exception_;   
+   CORBA::Any any_exception_;
    CORBA::Exception *caught_exception_;
 };
 
-//****************************************************************               
+//****************************************************************
 
 class TAO_Export TAO_ServerRequest_Info
  : public virtual PortableInterceptor::ServerRequestInfo
 {
  public:
   TAO_ServerRequest_Info (const char * operation,
-                      IOP::ServiceContextList &service_context_list ,               
-                      CORBA::Environment &ACE_TRY_ENV = 
+                      IOP::ServiceContextList &service_context_list ,
+                      CORBA::Environment &ACE_TRY_ENV =
                       TAO_default_environment ());
-    
-  virtual CORBA::ULong request_id (CORBA::Environment &ACE_TRY_ENV = 
+
+  virtual CORBA::ULong request_id (CORBA::Environment &ACE_TRY_ENV =
                                    TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * operation (CORBA::Environment &ACE_TRY_ENV = 
+  virtual char * operation (CORBA::Environment &ACE_TRY_ENV =
                             TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::ParameterList * arguments (CORBA::Environment &ACE_TRY_ENV = 
+  virtual Dynamic::ParameterList * arguments (CORBA::Environment &ACE_TRY_ENV =
                                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::ExceptionList * exceptions (CORBA::Environment &ACE_TRY_ENV = 
+  virtual Dynamic::ExceptionList * exceptions (CORBA::Environment &ACE_TRY_ENV =
                                                TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::ContextList * contexts (CORBA::Environment &ACE_TRY_ENV = 
+  virtual Dynamic::ContextList * contexts (CORBA::Environment &ACE_TRY_ENV =
                                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Dynamic::RequestContext * operation_context (CORBA::Environment &ACE_TRY_ENV = 
+  virtual Dynamic::RequestContext * operation_context (CORBA::Environment &ACE_TRY_ENV =
                                                        TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Any * result (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Any * result (CORBA::Environment &ACE_TRY_ENV =
                                TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean response_expected (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Boolean response_expected (CORBA::Environment &ACE_TRY_ENV =
                                             TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
 # if (TAO_HAS_CORBA_MESSAGING == 1)
-  virtual Messaging::SyncScope sync_scope (CORBA::Environment &ACE_TRY_ENV = 
+  virtual Messaging::SyncScope sync_scope (CORBA::Environment &ACE_TRY_ENV =
                                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif  /* TAO_HAS_CORBA_MESSAGING */
 
-  virtual PortableInterceptor::ReplyStatus reply_status (CORBA::Environment &ACE_TRY_ENV = 
+  virtual PortableInterceptor::ReplyStatus reply_status (CORBA::Environment &ACE_TRY_ENV =
                                                          TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Object_ptr forward_reference (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Object_ptr forward_reference (CORBA::Environment &ACE_TRY_ENV =
                                                TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
   // Probably the following methods should be delegated to the PICurrent
   virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id,
-                                 CORBA::Environment &ACE_TRY_ENV = 
+                                 CORBA::Environment &ACE_TRY_ENV =
                                  TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
   virtual IOP::ServiceContext * get_request_service_context (IOP::ServiceId id,
-                                                             CORBA::Environment &ACE_TRY_ENV = 
+                                                             CORBA::Environment &ACE_TRY_ENV =
                                                              TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IOP::ServiceContext * get_reply_service_context (IOP::ServiceId id,
-                                                           CORBA::Environment &ACE_TRY_ENV = 
+                                                           CORBA::Environment &ACE_TRY_ENV =
                                                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Any * sending_exception (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Any * sending_exception (CORBA::Environment &ACE_TRY_ENV =
                                            TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
   // This method causes problem since there is no trivial way to
-  // extract the exception from the Any. 
+  // extract the exception from the Any.
 
-  virtual CORBA::Exception * _sending_exception (CORBA::Environment &ACE_TRY_ENV = 
+  virtual CORBA::Exception * _sending_exception (CORBA::Environment &ACE_TRY_ENV =
                                                   TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Note: This is TAO specific and was done to combat the previous
   // problem to some extent.
-  
-  virtual PortableInterceptor::OctetSeq * object_id (CORBA::Environment &ACE_TRY_ENV = 
+
+  virtual PortableInterceptor::OctetSeq * object_id (CORBA::Environment &ACE_TRY_ENV =
                                                      TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual PortableInterceptor::OctetSeq * adapter_id (CORBA::Environment &ACE_TRY_ENV = 
+  virtual PortableInterceptor::OctetSeq * adapter_id (CORBA::Environment &ACE_TRY_ENV =
                                                       TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * target_most_derived_interface (CORBA::Environment &ACE_TRY_ENV = 
+  virtual char * target_most_derived_interface (CORBA::Environment &ACE_TRY_ENV =
                                                 TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Policy_ptr get_server_policy (CORBA::PolicyType type,
-                                               CORBA::Environment &ACE_TRY_ENV = 
+                                               CORBA::Environment &ACE_TRY_ENV =
                                                TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_slot (PortableInterceptor::SlotId id,
                          const CORBA::Any & data,
-                         CORBA::Environment &ACE_TRY_ENV = 
+                         CORBA::Environment &ACE_TRY_ENV =
                          TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
   virtual CORBA::Boolean target_is_a (const char * id,
-                                      CORBA::Environment &ACE_TRY_ENV = 
+                                      CORBA::Environment &ACE_TRY_ENV =
                                       TAO_default_environment ())
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void add_reply_service_context (const IOP::ServiceContext & service_context,
                                           CORBA::Boolean replace,
-                                          CORBA::Environment &ACE_TRY_ENV = 
+                                          CORBA::Environment &ACE_TRY_ENV =
                                           TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -315,18 +315,18 @@ class TAO_Export TAO_ServerRequest_Info
   Dynamic::RequestContext request_context_;
   CORBA::Object_var forward_reference_;
 
-  // Needed to ensure no copy anywhere. 
+  // Needed to ensure no copy anywhere.
   IOP::ServiceContextList &service_context_list_;
 
   CORBA::Any result_val_;
   PortableInterceptor::OctetSeq_var object_id_;
-  PortableInterceptor::OctetSeq_var adapter_id_; 
-  CORBA::Any any_exception_;   
+  PortableInterceptor::OctetSeq_var adapter_id_;
+  CORBA::Any any_exception_;
   CORBA::Exception *caught_exception_;
 };
 
 
-//****************************************************************               
+//****************************************************************
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/SHMIOP_Profile.cpp b/TAO/tao/SHMIOP_Profile.cpp
index 7b7b1771706..49671f2ac35 100644
--- a/TAO/tao/SHMIOP_Profile.cpp
+++ b/TAO/tao/SHMIOP_Profile.cpp
@@ -10,7 +10,6 @@
 #include "tao/Environment.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
-#include "tao/POA.h"
 #include "tao/debug.h"
 
 ACE_RCSID(tao, SHMIOP_Profile, "$Id$")
@@ -310,7 +309,7 @@ TAO_SHMIOP_Profile::parse_string (const char *string,
 
   start = ++okd;  // increment past the object key separator
 
-  TAO_POA::decode_string_to_sequence (this->object_key_, start);
+  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, start);
 
   return 1;
 }
@@ -389,8 +388,8 @@ char *
 TAO_SHMIOP_Profile::to_string (CORBA::Environment &)
 {
   CORBA::String_var key;
-  TAO_POA::encode_sequence_to_string (key.inout(),
-                                      this->object_key_);
+  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
+                                             this->object_key_);
 
   u_int buflen = (ACE_OS::strlen (::prefix_) +
                   3 /* "loc" */ +
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index 919aaf550ad..5742405024f 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -131,8 +131,8 @@ public:
   virtual unsigned int operation_length (void) const = 0;
   // get the length of the operation name
 
-  virtual CORBA::Object_ptr objref (CORBA_Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ()) = 0;
+  // @@ PPOA: virtual CORBA::Object_ptr objref (CORBA_Environment &ACE_TRY_ENV =
+  // @@ PPOA: TAO_default_environment ()) = 0;
   // Return the object reference of the request.
 
   virtual void init_reply (CORBA_Environment &ACE_TRY_ENV =
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index dc61c57a323..53102d74bb6 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -233,6 +233,25 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

+SOURCE=.\Acceptor_Filter.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\Acceptor_Registry.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -252,7 +271,7 @@ SOURCE=.\Acceptor_Registry.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Active_Object_Map.cpp

+SOURCE=.\Adapter.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

 

@@ -727,25 +746,6 @@ SOURCE=.\DomainC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainS.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\DynamicC.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -841,25 +841,6 @@ SOURCE=.\Exclusive_TMS.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Forwarding_Servant.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\FT_CORBAC.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -879,25 +860,6 @@ SOURCE=.\FT_CORBAC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\FT_CORBAS.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\GIOP_Message_Accept_State.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -1221,63 +1183,6 @@ SOURCE=.\IIOP_Transport.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ImplRepoC.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS_T.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\InterfaceC.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -1411,25 +1316,6 @@ SOURCE=.\IORManipulation.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Key_Adapters.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Leader_Follower.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -1563,25 +1449,6 @@ SOURCE=.\MessagingC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\MProfile.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -1658,25 +1525,6 @@ SOURCE=.\Object.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Adapter.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_KeyC.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -1753,25 +1601,6 @@ SOURCE=.\operation_details.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Operation_Table.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\ORB.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -1886,44 +1715,6 @@ SOURCE=.\Pluggable_Messaging_Utils.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\POA.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Policy_Factory.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -1981,25 +1772,6 @@ SOURCE=.\PolicyC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\PolicyS.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\PollableC.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -2095,25 +1867,6 @@ SOURCE=.\PortableInterceptorC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\PortableServerC.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Principal.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -2475,25 +2228,6 @@ SOURCE=.\Sequence.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Servant_Base.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Server_Request.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -2817,25 +2551,6 @@ SOURCE=.\Tagged_Profile.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO.cpp

-

-!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\TAO_Internal.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -3315,11 +3030,15 @@ SOURCE=.\WrongTransactionC.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

 # Begin Source File

 

+SOURCE=.\Acceptor_Filter.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Acceptor_Registry.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Active_Object_Map.h

+SOURCE=.\Adapter.h

 # End Source File

 # Begin Source File

 

@@ -3443,18 +3162,10 @@ SOURCE=.\Exclusive_TMS.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Forwarding_Servant.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\FT_CORBAC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\FT_CORBAS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ftcorbafwd.h

 # End Source File

 # Begin Source File

@@ -3511,18 +3222,6 @@ SOURCE=.\IIOP_Transport.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ImplRepoC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\InterfaceC.h

 # End Source File

 # Begin Source File

@@ -3599,10 +3298,6 @@ SOURCE=.\object.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Adapter.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_KeyC.h

 # End Source File

 # Begin Source File

@@ -3615,10 +3310,6 @@ SOURCE=.\ObjectIDList.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Operation_Table.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\orb.h

 # End Source File

 # Begin Source File

@@ -3643,22 +3334,6 @@ SOURCE=.\Pluggable.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\poa.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\POA_CORBA.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa_macros.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Policy_Factory.h

 # End Source File

 # Begin Source File

@@ -3691,10 +3366,6 @@ SOURCE=.\PortableInterceptorC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\PortableServerC.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Principal.h

 # End Source File

 # Begin Source File

@@ -3775,10 +3446,6 @@ SOURCE=.\Sequence_T.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\servant_base.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Server_Request.h

 # End Source File

 # Begin Source File

@@ -3847,10 +3514,6 @@ SOURCE=.\Tagged_Profile.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\TAO_Export.h

 # End Source File

 # Begin Source File

@@ -3959,6 +3622,10 @@ SOURCE=.\WrongTransactionC.h
 # PROP Default_Filter "i"

 # Begin Source File

 

+SOURCE=.\Acceptor_Filter.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Acceptor_Registry.i

 # End Source File

 # Begin Source File

@@ -3967,6 +3634,10 @@ SOURCE=.\Active_Object_Map.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Adapter.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\any.i

 # End Source File

 # Begin Source File

@@ -4087,18 +3758,6 @@ SOURCE=.\IIOP_ORB.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ImplRepoC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\InterfaceC.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/TAO.dsw b/TAO/tao/TAO.dsw
index b6309e0748e..7f70701992b 100644
--- a/TAO/tao/TAO.dsw
+++ b/TAO/tao/TAO.dsw
@@ -33,6 +33,36 @@ Package=<4>
 

 ###############################################################################

 

+Project: "PortableServer"=.\PortableServer\TAO_PortableServer.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "PortableServer_Static"=.\PortableServer\TAO_PortableServer_Static.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO LIB

+    End Project Dependency

+}}}

+

+###############################################################################

+

 Project: "TAO DLL"=.\TAO.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 995cf79f164..888beb92781 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -87,6 +87,10 @@ LIB32=link.exe -lib
 # PROP Default_Filter "h"

 # Begin Source File

 

+SOURCE=.\Acceptor_Filter.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Acceptor_Registry.h

 # End Source File

 # Begin Source File

@@ -95,6 +99,10 @@ SOURCE=.\Active_Object_Map.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Adapter.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\any.h

 # End Source File

 # Begin Source File

@@ -283,18 +291,6 @@ SOURCE=.\IIOP_Transport.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ImplRepoC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\InterfaceC.h

 # End Source File

 # Begin Source File

@@ -459,10 +455,6 @@ SOURCE=.\PortableInterceptorC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\PortableServerC.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Principal.h

 # End Source File

 # Begin Source File

@@ -719,6 +711,10 @@ SOURCE=.\WrongTransactionC.h
 # PROP Default_Filter "i"

 # Begin Source File

 

+SOURCE=.\Acceptor_Filter.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Acceptor_Registry.i

 # End Source File

 # Begin Source File

@@ -727,6 +723,10 @@ SOURCE=.\Active_Object_Map.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Adapter.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\any.i

 # End Source File

 # Begin Source File

@@ -843,18 +843,6 @@ SOURCE=.\IIOP_ORB.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ImplRepoC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\InterfaceC.i

 # End Source File

 # Begin Source File

@@ -967,10 +955,6 @@ SOURCE=.\PortableInterceptorC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\PortableServerC.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Priority_Mapping.i

 # End Source File

 # Begin Source File

@@ -1147,11 +1131,15 @@ SOURCE=.\TAO_Singleton.cpp
 # PROP Default_Filter "cpp"

 # Begin Source File

 

+SOURCE=.\Acceptor_Filter.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Acceptor_Registry.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Active_Object_Map.cpp

+SOURCE=.\Adapter.cpp

 # End Source File

 # Begin Source File

 

@@ -1251,10 +1239,6 @@ SOURCE=.\DomainC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\DynamicC.cpp

 # End Source File

 # Begin Source File

@@ -1275,18 +1259,10 @@ SOURCE=.\Exclusive_TMS.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Forwarding_Servant.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\FT_CORBAC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\FT_CORBAS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\GIOP_Message_Accept_State.cpp

 # End Source File

 # Begin Source File

@@ -1355,18 +1331,6 @@ SOURCE=.\IIOP_Transport.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ImplRepoC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS_T.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\InterfaceC.cpp

 # End Source File

 # Begin Source File

@@ -1395,10 +1359,6 @@ SOURCE=.\IORManipulation.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Key_Adapters.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Leader_Follower.cpp

 # End Source File

 # Begin Source File

@@ -1427,10 +1387,6 @@ SOURCE=.\MessagingC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\MProfile.cpp

 # End Source File

 # Begin Source File

@@ -1447,10 +1403,6 @@ SOURCE=.\Object.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Adapter.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_KeyC.cpp

 # End Source File

 # Begin Source File

@@ -1467,10 +1419,6 @@ SOURCE=.\operation_details.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Operation_Table.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\ORB.cpp

 # End Source File

 # Begin Source File

@@ -1495,14 +1443,6 @@ SOURCE=.\Pluggable_Messaging_Utils.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\POA.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Policy_Factory.cpp

 # End Source File

 # Begin Source File

@@ -1515,10 +1455,6 @@ SOURCE=.\PolicyC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\PolicyS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\PollableC.cpp

 # End Source File

 # Begin Source File

@@ -1535,14 +1471,6 @@ SOURCE=.\PortableInterceptor.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\PortableInterceptorC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PortableServerC.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Principal.cpp

 # End Source File

 # Begin Source File

@@ -1619,10 +1547,6 @@ SOURCE=.\Sequence.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Servant_Base.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Server_Request.cpp

 # End Source File

 # Begin Source File

@@ -1691,10 +1615,6 @@ SOURCE=.\Tagged_Profile.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\TAO.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\TAO_Internal.cpp

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 282993d0748..95ced4d4dc8 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -481,7 +481,7 @@ public:
   CORBA::TCKind  tc_kind_;
   // our kind that will determine what kind of children we may have
 
-  // = data members that indicate if the desired quantify 
+  // = data members that indicate if the desired quantify
   // was precomputed or not.
   CORBA::Boolean tc_id_known_;
   CORBA::Boolean tc_name_known_;
diff --git a/TAO/tao/UIOP_Profile.cpp b/TAO/tao/UIOP_Profile.cpp
index 0f13a9d6433..4518f180aad 100644
--- a/TAO/tao/UIOP_Profile.cpp
+++ b/TAO/tao/UIOP_Profile.cpp
@@ -10,7 +10,6 @@
 #include "tao/Environment.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
-#include "tao/POA.h"
 #include "tao/debug.h"
 
 ACE_RCSID(tao, UIOP_Profile, "$Id$")
@@ -165,7 +164,7 @@ TAO_UIOP_Profile::parse_string (const char *string,
 
   start = ++cp;  // increment past the object key separator
 
-  TAO_POA::decode_string_to_sequence (this->object_key_, start);
+  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, start);
 
   return 1;
 }
@@ -228,8 +227,8 @@ char *
 TAO_UIOP_Profile::to_string (CORBA::Environment &)
 {
   CORBA::String_var key;
-  TAO_POA::encode_sequence_to_string (key.inout(),
-                                      this->object_key_);
+  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
+                                             this->object_key_);
 
   u_int buflen = (ACE_OS::strlen (::prefix_) +
                   3 /* "loc" */ +
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index f2a59f20edf..4d20479bafb 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -52,7 +52,6 @@
 
 #include "tao/PolicyC.h"
 #include "tao/CurrentC.h"
-#include "tao/POA.h"
 
 // TAO specific files, avoid them as much as possible.
 #include "tao/PortableInterceptor.h"
@@ -62,13 +61,10 @@
 #include "tao/Stub.h"
 #include "tao/params.h"
 #include "tao/ORB_Core.h"
-#include "tao/Operation_Table.h"
 #include "tao/debug.h"
 
 #include "tao/Client_Strategy_Factory.h"
 #include "tao/Server_Strategy_Factory.h"
-#include "tao/Active_Object_Map.h"
-//#include "tao/GIOP.h"
 #include "tao/Invocation.h"
 
 #include "tao/Managed_Types.h"
@@ -90,7 +86,6 @@
 #include "tao/BoundsC.h"
 #include "tao/TAOC.h"
 #include "tao/MessagingC.h"
-#include "tao/MessagingS.h"
 
 #if !defined (ACE_NESTED_CLASS)
 #if defined (ACE_WIN32)