*** empty log message ***

27 files changed, 456 insertions, 1197 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 95e25fec3b3..40b190b67bb 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,25 @@
+Thu Apr 16 01:25:18 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* tao/poa.idl: Fixed the idl file.
+
+	* tao/PolicyS.cpp (_tao_collocated_Policy): _tao_collocated_Policy
+ 	  must inherit from CORBA_Policy and not from CORBA::Policy.  This
+ 	  is because the VC++ compiler cannot deal with inheriting from
+ 	  nested typedefs.
+
+	* tao/Policy{C,S}.h: Added TAO_Export macros. Also fixed the
+ 	  #include files.
+
+	* tao/POAS.*: Added code for _get_policy_type_skel() and
+ 	  policy_type() by hand.
+
+	* tao/POAC.*: Removed code for PortableServer::Policy.
+
+	* tao/POA.cpp: Added the policy_type() method to the policy
+ 	  classes.
+
+	* TAO: Changed PortableServer::Policy to CORBA::Policy.
+
 Wed Apr 15 22:29:29 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
 
 	* TAO_IDL/be/{be_visitor_structure, be_visitor_union,
diff --git a/TAO/examples/Simulator/DOVEMIB/svr.cpp b/TAO/examples/Simulator/DOVEMIB/svr.cpp
index f38ba02bcbc..c4ee548327d 100644
--- a/TAO/examples/Simulator/DOVEMIB/svr.cpp
+++ b/TAO/examples/Simulator/DOVEMIB/svr.cpp
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
 	root_poa->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
   
-      PortableServer::PolicyList policies (2);
+      CORBA::PolicyList policies (2);
       policies.length (2);  
       policies[0] =
 	root_poa->create_id_assignment_policy (PortableServer::USER_ID,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index c30f128ec04..c9fa52eb353 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -131,8 +131,7 @@ Cubit_Task::initialize_orb (void)
         this->root_poa_->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      // CORBA::PolicyList policies (2);
-      PortableServer::PolicyList policies (2);
+      CORBA::PolicyList policies (2);
       policies.length (2);
 
       // Id Assignment policy
@@ -161,8 +160,7 @@ Cubit_Task::initialize_orb (void)
            i < policies.length () && TAO_TRY_ENV.exception () == 0;
            ++i)
         {
-          // CORBA::Policy_ptr policy = policies[i];
-          PortableServer::Policy_ptr policy = policies[i];
+          CORBA::Policy_ptr policy = policies[i];
           policy->destroy (TAO_TRY_ENV);
         }
       TAO_CHECK_ENV;
@@ -474,8 +472,7 @@ Cubit_Factory_Task::initialize_orb (void)
         this->root_poa_->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      // CORBA::PolicyList policies (2);
-      PortableServer::PolicyList policies (2);
+      CORBA::PolicyList policies (2);
       policies.length (2);
 
       // Id Assignment policy
@@ -504,8 +501,7 @@ Cubit_Factory_Task::initialize_orb (void)
            i < policies.length () && TAO_TRY_ENV.exception () == 0;
            ++i)
         {
-          // CORBA::Policy_ptr policy = policies[i];
-          PortableServer::Policy_ptr policy = policies[i];
+          CORBA::Policy_ptr policy = policies[i];
           policy->destroy (TAO_TRY_ENV);
         }
       TAO_CHECK_ENV;
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index 30bd361cd76..faa39069abc 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -3,9 +3,6 @@
 // CORBA
 #include "tao/corba.h"
 
-// POA
-#include "tao/POA.h"
-
 // Exception macros
 #include "tao/poa_macros.h"
 
@@ -40,15 +37,15 @@ TAO_Thread_Policy::value (CORBA::Environment &env)
   return this->value_;
 }
 
-PortableServer::Policy_ptr
+CORBA::Policy_ptr
 TAO_Thread_Policy::copy (CORBA::Environment &env)
 {
   auto_ptr<TAO_Thread_Policy> new_policy (new TAO_Thread_Policy (*this));
 
-  PortableServer::Policy_var result = new_policy->_this (env);
+  CORBA::Policy_var result = new_policy->_this (env);
 
   if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
+    return CORBA::Policy::_nil ();
   else
     {
       // Make sure that the auto_ptr does not delete the
@@ -78,6 +75,13 @@ TAO_Thread_Policy::destroy (CORBA::Environment &env)
   delete this;
 }
 
+CORBA::PolicyType 
+TAO_Thread_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
 PortableServer::POA_ptr
 TAO_Thread_Policy::_default_POA (CORBA::Environment &env)
 {
@@ -104,14 +108,14 @@ TAO_Lifespan_Policy::value (CORBA::Environment &env)
   return this->value_;
 }
 
-PortableServer::Policy_ptr
+CORBA::Policy_ptr
 TAO_Lifespan_Policy::copy (CORBA::Environment &env)
 {
   auto_ptr<TAO_Lifespan_Policy> new_policy (new TAO_Lifespan_Policy (*this));
 
-  PortableServer::Policy_var result = new_policy->_this (env);
+  CORBA::Policy_var result = new_policy->_this (env);
   if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
+    return CORBA::Policy::_nil ();
   else
     {
       // Make sure that the auto_ptr does not delete the
@@ -141,6 +145,13 @@ TAO_Lifespan_Policy::destroy (CORBA::Environment &env)
   delete this;
 }
 
+CORBA::PolicyType 
+TAO_Lifespan_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
 PortableServer::POA_ptr
 TAO_Lifespan_Policy::_default_POA (CORBA::Environment &env)
 {
@@ -167,14 +178,14 @@ TAO_Id_Uniqueness_Policy::value (CORBA::Environment &env)
   return this->value_;
 }
 
-PortableServer::Policy_ptr
+CORBA::Policy_ptr
 TAO_Id_Uniqueness_Policy::copy (CORBA::Environment &env)
 {
   auto_ptr<TAO_Id_Uniqueness_Policy> new_policy (new TAO_Id_Uniqueness_Policy (*this));
 
-  PortableServer::Policy_var result = new_policy->_this (env);
+  CORBA::Policy_var result = new_policy->_this (env);
   if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
+    return CORBA::Policy::_nil ();
   else
     {
       // Make sure that the auto_ptr does not delete the
@@ -204,6 +215,13 @@ TAO_Id_Uniqueness_Policy::destroy (CORBA::Environment &env)
   delete this;
 }
 
+CORBA::PolicyType 
+TAO_Id_Uniqueness_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
 PortableServer::POA_ptr
 TAO_Id_Uniqueness_Policy::_default_POA (CORBA::Environment &env)
 {
@@ -230,14 +248,14 @@ TAO_Id_Assignment_Policy::value (CORBA::Environment &env)
   return this->value_;
 }
 
-PortableServer::Policy_ptr
+CORBA::Policy_ptr
 TAO_Id_Assignment_Policy::copy (CORBA::Environment &env)
 {
   auto_ptr<TAO_Id_Assignment_Policy> new_policy (new TAO_Id_Assignment_Policy (*this));
 
-  PortableServer::Policy_var result = new_policy->_this (env);
+  CORBA::Policy_var result = new_policy->_this (env);
   if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
+    return CORBA::Policy::_nil ();
   else
     {
       // Make sure that the auto_ptr does not delete the
@@ -267,6 +285,13 @@ TAO_Id_Assignment_Policy::destroy (CORBA::Environment &env)
   delete this;
 }
 
+CORBA::PolicyType 
+TAO_Id_Assignment_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
 PortableServer::POA_ptr
 TAO_Id_Assignment_Policy::_default_POA (CORBA::Environment &env)
 {
@@ -293,14 +318,14 @@ TAO_Implicit_Activation_Policy::value (CORBA::Environment &env)
   return this->value_;
 }
 
-PortableServer::Policy_ptr
+CORBA::Policy_ptr
 TAO_Implicit_Activation_Policy::copy (CORBA::Environment &env)
 {
   auto_ptr<TAO_Implicit_Activation_Policy> new_policy (new TAO_Implicit_Activation_Policy (*this));
 
-  PortableServer::Policy_var result = new_policy->_this (env);
+  CORBA::Policy_var result = new_policy->_this (env);
   if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
+    return CORBA::Policy::_nil ();
   else
     {
       // Make sure that the auto_ptr does not delete the
@@ -330,6 +355,13 @@ TAO_Implicit_Activation_Policy::destroy (CORBA::Environment &env)
   delete this;
 }
 
+CORBA::PolicyType 
+TAO_Implicit_Activation_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
 PortableServer::POA_ptr
 TAO_Implicit_Activation_Policy::_default_POA (CORBA::Environment &env)
 {
@@ -356,14 +388,14 @@ TAO_Servant_Retention_Policy::value (CORBA::Environment &env)
   return this->value_;
 }
 
-PortableServer::Policy_ptr
+CORBA::Policy_ptr
 TAO_Servant_Retention_Policy::copy (CORBA::Environment &env)
 {
   auto_ptr<TAO_Servant_Retention_Policy> new_policy (new TAO_Servant_Retention_Policy (*this));
 
-  PortableServer::Policy_var result = new_policy->_this (env);
+  CORBA::Policy_var result = new_policy->_this (env);
   if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
+    return CORBA::Policy::_nil ();
   else
     {
       // Make sure that the auto_ptr does not delete the
@@ -393,6 +425,13 @@ TAO_Servant_Retention_Policy::destroy (CORBA::Environment &env)
   delete this;
 }
 
+CORBA::PolicyType 
+TAO_Servant_Retention_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
 PortableServer::POA_ptr
 TAO_Servant_Retention_Policy::_default_POA (CORBA::Environment &env)
 {
@@ -419,14 +458,14 @@ TAO_Request_Processing_Policy::value (CORBA::Environment &env)
   return this->value_;
 }
 
-PortableServer::Policy_ptr
+CORBA::Policy_ptr
 TAO_Request_Processing_Policy::copy (CORBA::Environment &env)
 {
   auto_ptr<TAO_Request_Processing_Policy> new_policy (new TAO_Request_Processing_Policy (*this));
 
-  PortableServer::Policy_var result = new_policy->_this (env);
+  CORBA::Policy_var result = new_policy->_this (env);
   if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
+    return CORBA::Policy::_nil ();
   else
     {
       // Make sure that the auto_ptr does not delete the
@@ -456,6 +495,13 @@ TAO_Request_Processing_Policy::destroy (CORBA::Environment &env)
   delete this;
 }
 
+CORBA::PolicyType 
+TAO_Request_Processing_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
 PortableServer::POA_ptr
 TAO_Request_Processing_Policy::_default_POA (CORBA::Environment &env)
 {
@@ -474,7 +520,7 @@ TAO_POA_Policies::TAO_POA_Policies (void)
 }
 
 void
-TAO_POA_Policies::parse_policies (const PortableServer::PolicyList &policies,
+TAO_POA_Policies::parse_policies (const CORBA::PolicyList &policies,
                                   CORBA::Environment &env)
 {
   for (CORBA::ULong i = 0;
@@ -522,7 +568,7 @@ TAO_POA_Policies::validity_check (void)
 }
 
 void
-TAO_POA_Policies::parse_policy (const PortableServer::Policy_ptr policy,
+TAO_POA_Policies::parse_policy (const CORBA::Policy_ptr policy,
                                 CORBA::Environment &env)
 {
   PortableServer::ThreadPolicy_var thread
@@ -897,7 +943,7 @@ TAO_POA::lock (void)
 PortableServer::POA_ptr
 TAO_POA::create_POA (const char *adapter_name,
                      PortableServer::POAManager_ptr poa_manager,
-                     const PortableServer::PolicyList &policies,
+                     const CORBA::PolicyList &policies,
                      CORBA::Environment &env)
 {
   // If any of the policy objects specified are not valid for the ORB
@@ -3259,7 +3305,7 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
                                         CORBA::Environment &env)
 {
   // Default policies
-  PortableServer::PolicyList default_policies;
+  CORBA::PolicyList default_policies;
 
   // This assumes that the lock on the parent is recursive
   PortableServer::POA_var child = parent->create_POA (name,
@@ -3803,8 +3849,8 @@ template class ACE_Read_Guard<ACE_Lock>;
 template class ACE_Unbounded_Set<TAO_POA *>;
 template class ACE_Unbounded_Set_Iterator<TAO_POA *>;
 template class ACE_Write_Guard<ACE_Lock>;
-template class TAO_Object_Manager<PortableServer::Policy>;
-template class TAO_Unbounded_Object_Sequence<PortableServer::Policy>;
+template class TAO_Object_Manager<CORBA::Policy>;
+template class TAO_Unbounded_Object_Sequence<CORBA::Policy>;
 template class auto_ptr<TAO_Id_Assignment_Policy>;
 template class auto_ptr<TAO_Id_Uniqueness_Policy>;
 template class auto_ptr<TAO_Implicit_Activation_Policy>;
@@ -3840,8 +3886,8 @@ template class ACE_Node<TAO_POA *>;
 #pragma instantiate ACE_Unbounded_Set<TAO_POA *>
 #pragma instantiate ACE_Unbounded_Set_Iterator<TAO_POA *>
 #pragma instantiate ACE_Write_Guard<ACE_Lock>
-#pragma instantiate TAO_Object_Manager<PortableServer::Policy>
-#pragma instantiate TAO_Unbounded_Object_Sequence<PortableServer::Policy>
+#pragma instantiate TAO_Object_Manager<CORBA::Policy>
+#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA::Policy>
 #pragma instantiate auto_ptr<TAO_Id_Assignment_Policy>
 #pragma instantiate auto_ptr<TAO_Id_Uniqueness_Policy>
 #pragma instantiate auto_ptr<TAO_Implicit_Activation_Policy>
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
index 857ac2f4c39..73ace7a8471 100644
--- a/TAO/tao/POA.h
+++ b/TAO/tao/POA.h
@@ -60,10 +60,12 @@ public:
 
   virtual PortableServer::ThreadPolicyValue value (CORBA::Environment &env);
 
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
+  virtual CORBA::Policy_ptr copy (CORBA::Environment &env);
 
   virtual void destroy (CORBA::Environment &env);
 
+  virtual CORBA::PolicyType policy_type (CORBA::Environment &environment);
+
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
 
 protected:
@@ -82,10 +84,12 @@ public:
 
   virtual PortableServer::LifespanPolicyValue value (CORBA::Environment &env);
 
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
+  virtual CORBA::Policy_ptr copy (CORBA::Environment &env);
 
   virtual void destroy (CORBA::Environment &env);
 
+  virtual CORBA::PolicyType policy_type (CORBA::Environment &environment);
+
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
 
 protected:
@@ -104,10 +108,12 @@ public:
 
   virtual PortableServer::IdUniquenessPolicyValue value (CORBA::Environment &env);
 
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
+  virtual CORBA::Policy_ptr copy (CORBA::Environment &env);
 
   virtual void destroy (CORBA::Environment &env);
 
+  virtual CORBA::PolicyType policy_type (CORBA::Environment &environment);
+
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
 
 protected:
@@ -126,10 +132,12 @@ public:
 
   virtual PortableServer::IdAssignmentPolicyValue value (CORBA::Environment &env);
 
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
+  virtual CORBA::Policy_ptr copy (CORBA::Environment &env);
 
   virtual void destroy (CORBA::Environment &env);
 
+  virtual CORBA::PolicyType policy_type (CORBA::Environment &environment);
+
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
 
 protected:
@@ -148,10 +156,12 @@ public:
 
   virtual PortableServer::ImplicitActivationPolicyValue value (CORBA::Environment &env);
 
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
+  virtual CORBA::Policy_ptr copy (CORBA::Environment &env);
 
   virtual void destroy (CORBA::Environment &env);
 
+  virtual CORBA::PolicyType policy_type (CORBA::Environment &environment);
+
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
 
 protected:
@@ -170,10 +180,12 @@ public:
 
   virtual PortableServer::ServantRetentionPolicyValue value (CORBA::Environment &env);
 
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
+  virtual CORBA::Policy_ptr copy (CORBA::Environment &env);
 
   virtual void destroy (CORBA::Environment &env);
 
+  virtual CORBA::PolicyType policy_type (CORBA::Environment &environment);
+
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
 
 protected:
@@ -192,10 +204,12 @@ public:
 
   virtual PortableServer::RequestProcessingPolicyValue value (CORBA::Environment &env);
 
-  virtual PortableServer::Policy_ptr copy (CORBA::Environment &env);
+  virtual CORBA::Policy_ptr copy (CORBA::Environment &env);
 
   virtual void destroy (CORBA::Environment &env);
 
+  virtual CORBA::PolicyType policy_type (CORBA::Environment &environment);
+
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);  
 
 protected:
@@ -231,12 +245,12 @@ public:
   virtual PortableServer::RequestProcessingPolicyValue request_processing (void) const;
   virtual void request_processing (PortableServer::RequestProcessingPolicyValue value);
 
-  virtual void parse_policies (const PortableServer::PolicyList &policies,
+  virtual void parse_policies (const CORBA::PolicyList &policies,
                                CORBA::Environment &env);
 
 protected:
 
-  virtual void parse_policy (const PortableServer::Policy_ptr policy,
+  virtual void parse_policy (const CORBA::Policy_ptr policy,
                              CORBA::Environment &env);
 
   virtual int validity_check (void);
@@ -319,7 +333,7 @@ public:
 
   virtual PortableServer::POA_ptr create_POA (const char *adapter_name,
                                               PortableServer::POAManager_ptr poa_manager,
-                                              const PortableServer::PolicyList &policies,
+                                              const CORBA::PolicyList &policies,
                                               CORBA::Environment &env);
 
   virtual PortableServer::POA_ptr find_POA (const char *adapter_name,
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index e238c9fde54..ecfd1638379 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -8,8 +8,6 @@
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "tao/corba.h"
-#include "POAC.h"
-#include "POAS.h"
 
 #if !defined (__ACE_INLINE__)
 #include "POAC.i"
@@ -105,158 +103,6 @@ static const CORBA::Long _oc_PortableServer_CurrentBase[] =
 static CORBA::TypeCode _tc__tc_PortableServer_CurrentBase (CORBA::tk_objref, sizeof (_oc_PortableServer_CurrentBase), (char *) &_oc_PortableServer_CurrentBase, CORBA::B_FALSE);
 CORBA::TypeCode_ptr PortableServer::_tc_CurrentBase = &_tc__tc_PortableServer_CurrentBase;
 
-PortableServer::Policy_ptr PortableServer::Policy::_duplicate (PortableServer::Policy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-
-  return obj;
-} // end of _duplicate
-
-PortableServer::Policy_ptr PortableServer::Policy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return PortableServer::Policy::_nil ();
-  if (!obj->_is_a ("IDL:PortableServer/Policy:1.0", env))
-    return PortableServer::Policy::_nil ();
-  if (!obj->_is_collocated () || !obj->_servant())
-  {
-    PortableServer::Policy_ptr new_obj = new PortableServer::Policy (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-
-  STUB_Object *stub = obj->_servant ()->_create_stub (env);
-  if (env.exception () != 0)
-    return PortableServer::Policy::_nil ();
-  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/Policy:1.0");
-  return new POA_PortableServer::_tao_collocated_Policy(
-      ACE_reinterpret_cast(POA_PortableServer::Policy_ptr, servant),
-      stub
-    );
-}
-
-PortableServer::Policy_ptr PortableServer::Policy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  // create the CORBA level proxy
-  CORBA::Object_ptr objref = new CORBA_Object (data);
-  if (objref == 0)
-    {
-      data->Release ();
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return PortableServer::Policy::_nil ();
-    }
-  return PortableServer::Policy::_narrow (objref, env);
-}
-
-static const TAO_Param_Data PortableServer_Policy_copy_paramdata [] =
-{
-  {PortableServer::_tc_Policy, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data PortableServer_Policy_copy_calldata =
-{"copy", 1, 1, PortableServer_Policy_copy_paramdata, 0, 0};
-
-PortableServer::Policy_ptr  PortableServer::Policy::copy (CORBA::Environment &env)
-{
-  CORBA::Object_ptr retval = CORBA::Object::_nil ();
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return PortableServer::Policy::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &PortableServer_Policy_copy_calldata, &retval);
-  return PortableServer::Policy::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_Policy_destroy_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data PortableServer_Policy_destroy_calldata =
-{"destroy", 1, 1, PortableServer_Policy_destroy_paramdata, 0, 0};
-
-void  PortableServer::Policy::destroy (CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_static_call (env, &PortableServer_Policy_destroy_calldata, 0);
-  return; // no value
-
-}
-
-CORBA::Boolean PortableServer::Policy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-        return 1; // success using local knowledge
-  else
-        return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
-}
-
-static const CORBA::Long _oc_PortableServer_Policy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x6f6c6963, 0x793a312e, 0x30000000,  // repository ID = IDL:PortableServer/Policy:1.0
-  7, 0x506f6c69, 0x63790000,  // name = Policy,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_Policy (CORBA::tk_objref, sizeof (_oc_PortableServer_Policy), (char *) &_oc_PortableServer_Policy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_Policy = &_tc__tc_PortableServer_Policy;
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY_CS_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY_CS_
-
-static const CORBA::Long _oc_PortableServer__tao_seq_Policy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x6f6c6963, 0x793a312e, 0x30000000,  // repository ID = IDL:PortableServer/Policy:1.0
-    7, 0x506f6c69, 0x63790000,  // name = Policy,
-  0,
-};
-static CORBA::TypeCode _tc__tc_PortableServer__tao_seq_Policy (CORBA::tk_sequence, sizeof (_oc_PortableServer__tao_seq_Policy), (char *) &_oc_PortableServer__tao_seq_Policy, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc__tao_seq_Policy = &_tc__tc_PortableServer__tao_seq_Policy;
-
-
-#endif // end #if !defined
-
-static const CORBA::Long _oc_PortableServer_PolicyList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x6f6c6963, 0x794c6973, 0x743a312e, 0x30000000,  // repository ID = IDL:PortableServer/PolicyList:1.0
-  11, 0x506f6c69, 0x63794c69, 0x73740000,  // name = PolicyList
-  CORBA::tk_sequence, // typecode kind
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, 0x49444c3a, 0x506f7274, 0x61626c65, 0x53657276, 0x65722f50, 0x6f6c6963, 0x793a312e, 0x30000000,  // repository ID = IDL:PortableServer/Policy:1.0
-    7, 0x506f6c69, 0x63790000,  // name = Policy,
-  0,
-};
-static CORBA::TypeCode _tc__tc_PortableServer_PolicyList (CORBA::tk_alias, sizeof (_oc_PortableServer_PolicyList), (char *) &_oc_PortableServer_PolicyList, CORBA::B_FALSE);
-CORBA::TypeCode_ptr PortableServer::_tc_PolicyList = &_tc__tc_PortableServer_PolicyList;
-
-
 #if !defined (_PORTABLESERVER__TAO_SEQ_OCTET_CS_)
 #define _PORTABLESERVER__TAO_SEQ_OCTET_CS_
 
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index 884168a3e81..95ff6546480 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -140,191 +140,6 @@ class CurrentBase;
 
   static CORBA::TypeCode_ptr _tc_CurrentBase;
 
-
-#if !defined (_PORTABLESERVER_POLICY___PTR_CH_)
-#define _PORTABLESERVER_POLICY___PTR_CH_
-
-class Policy;
-  typedef Policy *Policy_ptr;
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POLICY___VAR_CH_)
-#define _PORTABLESERVER_POLICY___VAR_CH_
-
-  class TAO_Export Policy_var
-  {
-  public:
-    Policy_var (void); // default constructor
-    Policy_var (Policy_ptr);
-    Policy_var (const Policy_var &); // copy constructor
-    ~Policy_var (void); // destructor
-
-    Policy_var &operator= (Policy_ptr);
-    Policy_var &operator= (const Policy_var &);
-    Policy_ptr operator-> (void) const;
-
-    operator const Policy_ptr &() const;
-    operator Policy_ptr &();
-    // in, inout, out, _retn
-    Policy_ptr in (void) const;
-    Policy_ptr &inout (void);
-    Policy_ptr &out (void);
-    Policy_ptr _retn (void);
-    Policy_ptr ptr (void) const;
-
-  private:
-    Policy_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POLICY___OUT_CH_)
-#define _PORTABLESERVER_POLICY___OUT_CH_
-
-  class TAO_Export Policy_out
-  {
-  public:
-    Policy_out (Policy_ptr &);
-    Policy_out (Policy_var &);
-    Policy_out (Policy_out &);
-    Policy_out &operator= (Policy_out &);
-    Policy_out &operator= (const Policy_var &);
-    Policy_out &operator= (Policy_ptr);
-    operator Policy_ptr &();
-    Policy_ptr &ptr (void);
-    Policy_ptr operator-> (void);
-
-  private:
-    Policy_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POLICY_CH_)
-#define _PORTABLESERVER_POLICY_CH_
-
-  class TAO_Export Policy: public virtual CORBA::Object
-  {
-  public:
-    // the static operations
-    static Policy_ptr _duplicate (Policy_ptr obj);
-    static Policy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static Policy_ptr _nil (void);
-    static Policy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual Policy_ptr  copy (CORBA::Environment &env);
-    virtual void  destroy (CORBA::Environment &env);
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
-  protected:
-    Policy (
-        STUB_Object *objref = 0,
-        TAO_ServantBase *servant = 0,
-        CORBA::Boolean collocated = CORBA::B_FALSE
-      );
-  public:
-    virtual ~Policy (void);
-  private:
-    Policy (const Policy&);
-    void operator= (const Policy&);
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_Policy;
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY_CH_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY_CH_
-
-  // *************************************************************
-  // _tao_seq_Policy
-  // *************************************************************
-
-  typedef TAO_Unbounded_Object_Sequence<Policy > _tao_seq_Policy;
-  typedef _tao_seq_Policy* _tao_seq_Policy_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_Policy;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY___VAR_CH_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY___VAR_CH_
-
-// *************************************************************
-  // class PortableServer::_tao_seq_Policy_var
-  // *************************************************************
-
-  class TAO_Export _tao_seq_Policy_var
-  {
-  public:
-    _tao_seq_Policy_var (void); // default constructor
-    _tao_seq_Policy_var (_tao_seq_Policy *);
-    _tao_seq_Policy_var (const _tao_seq_Policy_var &); // copy constructor
-    ~_tao_seq_Policy_var (void); // destructor
-
-    _tao_seq_Policy_var &operator= (_tao_seq_Policy *);
-    _tao_seq_Policy_var &operator= (const _tao_seq_Policy_var &);
-    _tao_seq_Policy *operator-> (void);
-    const _tao_seq_Policy *operator-> (void) const;
-
-    operator const _tao_seq_Policy &() const;
-    operator _tao_seq_Policy &();
-    operator _tao_seq_Policy &() const;
-    TAO_Object_Manager <Policy > operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
-    const _tao_seq_Policy &in (void) const;
-    _tao_seq_Policy &inout (void);
-    _tao_seq_Policy *&out (void);
-    _tao_seq_Policy *_retn (void);
-    _tao_seq_Policy *ptr (void) const;
-
-  private:
-    _tao_seq_Policy *ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY___OUT_CH_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY___OUT_CH_
-
-  class TAO_Export _tao_seq_Policy_out
-  {
-  public:
-    _tao_seq_Policy_out (_tao_seq_Policy *&);
-    _tao_seq_Policy_out (_tao_seq_Policy_var &);
-    _tao_seq_Policy_out (_tao_seq_Policy_out &);
-    _tao_seq_Policy_out &operator= (_tao_seq_Policy_out &);
-    _tao_seq_Policy_out &operator= (_tao_seq_Policy *);
-    operator _tao_seq_Policy *&();
-    _tao_seq_Policy *&ptr (void);
-    _tao_seq_Policy *operator-> (void);
-    TAO_Object_Manager <Policy > operator[] (CORBA::ULong index);
-
-  private:
-    _tao_seq_Policy *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const _tao_seq_Policy_var &);
-  };
-
-
-#endif // end #if !defined
-
-  typedef _tao_seq_Policy PolicyList;
-  typedef _tao_seq_Policy_var PolicyList_var;
-  typedef _tao_seq_Policy_out PolicyList_out;
-
-  static CORBA::TypeCode_ptr _tc_PolicyList;
-
   class POA;
 
 #if !defined (_PORTABLESERVER_POA___PTR_CH_)
@@ -582,7 +397,7 @@ class ThreadPolicy;
 #if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
 #define _PORTABLESERVER_THREADPOLICY_CH_
 
-  class TAO_Export ThreadPolicy: public virtual Policy
+  class TAO_Export ThreadPolicy: public virtual CORBA::Policy
   {
   public:
     // the static operations
@@ -688,7 +503,7 @@ class LifespanPolicy;
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY_CH_
 
-  class TAO_Export LifespanPolicy: public virtual Policy
+  class TAO_Export LifespanPolicy: public virtual CORBA::Policy
   {
   public:
     // the static operations
@@ -794,7 +609,7 @@ class IdUniquenessPolicy;
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
 
-  class TAO_Export IdUniquenessPolicy: public virtual Policy
+  class TAO_Export IdUniquenessPolicy: public virtual CORBA::Policy
   {
   public:
     // the static operations
@@ -900,7 +715,7 @@ class IdAssignmentPolicy;
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
 
-  class TAO_Export IdAssignmentPolicy: public virtual Policy
+  class TAO_Export IdAssignmentPolicy: public virtual CORBA::Policy
   {
   public:
     // the static operations
@@ -1006,7 +821,7 @@ class ImplicitActivationPolicy;
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
 
-  class TAO_Export ImplicitActivationPolicy: public virtual Policy
+  class TAO_Export ImplicitActivationPolicy: public virtual CORBA::Policy
   {
   public:
     // the static operations
@@ -1112,7 +927,7 @@ class ServantRetentionPolicy;
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
 
-  class TAO_Export ServantRetentionPolicy: public virtual Policy
+  class TAO_Export ServantRetentionPolicy: public virtual CORBA::Policy
   {
   public:
     // the static operations
@@ -1219,7 +1034,7 @@ class RequestProcessingPolicy;
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
 
-  class TAO_Export RequestProcessingPolicy: public virtual Policy
+  class TAO_Export RequestProcessingPolicy: public virtual CORBA::Policy
   {
   public:
     // the static operations
@@ -2149,7 +1964,7 @@ class POA;
 
 #endif // end #if !defined
 
-    virtual POA_ptr  create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const PolicyList &policies, CORBA::Environment &env) = 0;
+    virtual POA_ptr  create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA::Environment &env) = 0;
     virtual POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA::Environment &env) = 0;
     virtual void  destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0;
     virtual ThreadPolicy_ptr  create_thread_policy (ThreadPolicyValue value, CORBA::Environment &env) = 0;
diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i
index 272e6c80df5..a7d79e1689a 100644
--- a/TAO/tao/POAC.i
+++ b/TAO/tao/POAC.i
@@ -1,3 +1,5 @@
+// $Id$
+//
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO ORB and the TAO IDL Compiler have been developed by Washington 
 // University Computer Science's Distributed Object Computing Group.
@@ -198,395 +200,6 @@ PortableServer::CurrentBase_out::operator-> (void)
 
 #endif // end #if !defined
 
-ACE_INLINE
-PortableServer::Policy::Policy(
-    STUB_Object *objref,
-    TAO_ServantBase *servant,
-    CORBA::Boolean collocated
-  )
- : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::Policy::~Policy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::Policy_ptr
-PortableServer::Policy::_nil (void)
-{
-  return (PortableServer::Policy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_POLICY___VAR_CI_)
-#define _PORTABLESERVER_POLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::Policy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::Policy_var::Policy_var (void) // default constructor
-	: ptr_ (PortableServer::Policy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::Policy_var::Policy_var (PortableServer::Policy_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::Policy_ptr 
-PortableServer::Policy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::Policy_var::Policy_var (const PortableServer::Policy_var &p) // copy constructor
-	: ptr_ (PortableServer::Policy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::Policy_var::~Policy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::Policy_var &
-PortableServer::Policy_var::operator= (PortableServer::Policy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::Policy_var &
-PortableServer::Policy_var::operator= (const PortableServer::Policy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::Policy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::Policy_var::operator const PortableServer::Policy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::Policy_var::operator PortableServer::Policy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr 
-PortableServer::Policy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr
-PortableServer::Policy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr &
-PortableServer::Policy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr &
-PortableServer::Policy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::Policy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr 
-PortableServer::Policy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::Policy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::Policy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_POLICY___OUT_CI_)
-#define _PORTABLESERVER_POLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::Policy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::Policy_out::Policy_out (PortableServer::Policy_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = PortableServer::Policy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::Policy_out::Policy_out (PortableServer::Policy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::Policy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::Policy_out::Policy_out (PortableServer::Policy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::Policy_out &
-PortableServer::Policy_out::operator= (PortableServer::Policy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::Policy_out &
-PortableServer::Policy_out::operator= (const PortableServer::Policy_var &p)
-{
-  this->ptr_ = PortableServer::Policy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::Policy_out &
-PortableServer::Policy_out::operator= (PortableServer::Policy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::Policy_out::operator PortableServer::Policy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr &
-PortableServer::Policy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::Policy_ptr 
-PortableServer::Policy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY___VAR_CI_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::_tao_seq_Policy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_var::_tao_seq_Policy_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_var::_tao_seq_Policy_var (PortableServer::_tao_seq_Policy *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_var::_tao_seq_Policy_var (const PortableServer::_tao_seq_Policy_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new PortableServer::_tao_seq_Policy(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_var::~_tao_seq_Policy_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy_var &
-PortableServer::_tao_seq_Policy_var::operator= (PortableServer::_tao_seq_Policy *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy_var &
-PortableServer::_tao_seq_Policy_var::operator= (const PortableServer::_tao_seq_Policy_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new PortableServer::_tao_seq_Policy (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const PortableServer::_tao_seq_Policy *
-PortableServer::_tao_seq_Policy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy *
-PortableServer::_tao_seq_Policy_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Policy_var::operator const PortableServer::_tao_seq_Policy &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Policy_var::operator PortableServer::_tao_seq_Policy &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Policy_var::operator PortableServer::_tao_seq_Policy &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager <PortableServer::Policy > 
-PortableServer::_tao_seq_Policy_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const PortableServer::_tao_seq_Policy &
-PortableServer::_tao_seq_Policy_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy &
-PortableServer::_tao_seq_Policy_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE PortableServer::_tao_seq_Policy *&
-PortableServer::_tao_seq_Policy_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy *
-PortableServer::_tao_seq_Policy_var::_retn (void)
-{
-  PortableServer::_tao_seq_Policy *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy *
-PortableServer::_tao_seq_Policy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY___OUT_CI_)
-#define _PORTABLESERVER__TAO_SEQ_POLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::_tao_seq_Policy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_out::_tao_seq_Policy_out (PortableServer::_tao_seq_Policy *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_out::_tao_seq_Policy_out (PortableServer::_tao_seq_Policy_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-PortableServer::_tao_seq_Policy_out::_tao_seq_Policy_out (PortableServer::_tao_seq_Policy_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::_tao_seq_Policy_out &
-PortableServer::_tao_seq_Policy_out::operator= (PortableServer::_tao_seq_Policy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy_out &
-PortableServer::_tao_seq_Policy_out::operator= (PortableServer::_tao_seq_Policy *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableServer::_tao_seq_Policy_out::operator PortableServer::_tao_seq_Policy *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy *&
-PortableServer::_tao_seq_Policy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::_tao_seq_Policy *
-PortableServer::_tao_seq_Policy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager <PortableServer::Policy > 
-PortableServer::_tao_seq_Policy_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif // end #if !defined
-
-
 #if !defined (_PORTABLESERVER_POA___VAR_CI_)
 #define _PORTABLESERVER_POA___VAR_CI_
 
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index fd17f5e33f5..b4f087d5356 100644
--- a/TAO/tao/POAS.cpp
+++ b/TAO/tao/POAS.cpp
@@ -8,7 +8,6 @@
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "tao/corba.h"
-#include "POAS.h"
 
 #if !defined (__ACE_INLINE__)
 #include "POAS.i"
@@ -142,223 +141,11 @@ POA_PortableServer::CurrentBase::_this (CORBA_Environment &_env)
   return new POA_PortableServer::_tao_collocated_CurrentBase (this, stub);
 }
 
-static const TAO_operation_db_entry PortableServer_Policy_operations [] = {
-  {"copy", &POA_PortableServer::Policy::copy_skel},
-  {"destroy", &POA_PortableServer::Policy::destroy_skel},
-  {"_is_a", &POA_PortableServer::Policy::_is_a_skel}
-};
-
-static const CORBA::Long _tao_PortableServer_Policy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (9);
-static char _tao_PortableServer_Policy_optable_pool [_tao_PortableServer_Policy_optable_size];
-static ACE_Static_Allocator_Base _tao_PortableServer_Policy_allocator (_tao_PortableServer_Policy_optable_pool, _tao_PortableServer_Policy_optable_size);
-static TAO_Dynamic_Hash_OpTable tao_PortableServer_Policy_optable (PortableServer_Policy_operations, 3, 6, &_tao_PortableServer_Policy_allocator);
-
-// skeleton constructor
-POA_PortableServer::Policy::Policy (void)
-{
-  this->optable_ = &tao_PortableServer_Policy_optable;
-}
-
-static const TAO_Param_Data_Skel PortableServer_Policy_copy_paramdata [] =
-{
-  {PortableServer::_tc_Policy, 0, 0}
-}; // PortableServer_Policy_copy_paramdata
-
-static const TAO_Call_Data_Skel PortableServer_Policy_copy_calldata =
-{"copy", 1, 1, PortableServer_Policy_copy_paramdata};
-
-void POA_PortableServer::Policy::copy_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::Policy *_tao_impl = (POA_PortableServer::Policy *)_tao_object_reference;
-  CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_Policy_copy_calldata,
-    &_tao_retval
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_retval = _tao_impl->copy (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_Policy_copy_calldata,
-    &_tao_retval
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_Policy_destroy_paramdata [] =
-{
-  {CORBA::_tc_void, 0, 0}
-}; // PortableServer_Policy_destroy_paramdata
-
-static const TAO_Call_Data_Skel PortableServer_Policy_destroy_calldata =
-{"destroy", 1, 1, PortableServer_Policy_destroy_paramdata};
-
-void POA_PortableServer::Policy::destroy_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &_tao_environment
-)
-{
-  POA_PortableServer::Policy *_tao_impl = (POA_PortableServer::Policy *)_tao_object_reference;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_Policy_destroy_calldata,
-    0
-  );
-  if (_tao_environment.exception ()) return;
-  _tao_impl->destroy (
-    _tao_environment
-  );
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_Policy_destroy_calldata,
-    0
-  );
-}
-
-static const TAO_Param_Data_Skel PortableServer_Policy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_Policy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_Policy_is_a_paramdata};
-void POA_PortableServer::Policy::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &_tao_environment
-  )
-{
-  POA_PortableServer::Policy_ptr  _tao_impl = (POA_PortableServer::Policy_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  char *_tao_value = 0;
-  _tao_server_request.demarshal (
-    _tao_environment,
-    &PortableServer_Policy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  if (_tao_environment.exception () != 0) return;
-  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
-  _tao_server_request.marshal (
-    _tao_environment,
-    &PortableServer_Policy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value
-  );
-  CORBA::string_free (_tao_value);
-}
-
-CORBA::Boolean POA_PortableServer::Policy::_is_a (
-    const char* value,
-    CORBA::Environment &_tao_environment
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
-      return CORBA::B_TRUE;
-    else
-      return CORBA::B_FALSE;
-}
-
-void* POA_PortableServer::Policy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::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_PortableServer::Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-  }
-else
-  	skel (req, this, context, env);
-}
-
-const char* POA_PortableServer::Policy::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/Policy:1.0";
-}
-
-POA_PortableServer::_tao_collocated_Policy::_tao_collocated_Policy (
-    POA_PortableServer::Policy_ptr  servant,
-    STUB_Object *stub
-  )
-  : ACE_NESTED_CLASS (PortableServer, Policy) (stub, servant, CORBA::B_TRUE),
-    CORBA_Object (stub, servant, CORBA::B_TRUE),
-    servant_ (servant)
-{
-}
-
-POA_PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_Policy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_PortableServer::_tao_collocated_Policy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      _tao_environment
-    );
-}
-
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_Policy::copy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  return this->servant_->copy (
-       _tao_environment
-    );
-}
-
-void POA_PortableServer::_tao_collocated_Policy::destroy (
-    CORBA::Environment &_tao_environment
-  )
-{
-  this->servant_->destroy (
-       _tao_environment
-    );
-}
-
-
-PortableServer::Policy*
-POA_PortableServer::Policy::_this (CORBA_Environment &_env)
-{
-  STUB_Object *stub = this->_create_stub (_env);
-  if (_env.exception () != 0)
-    return 0;
-  return new POA_PortableServer::_tao_collocated_Policy (this, stub);
-}
-
 static const TAO_operation_db_entry PortableServer_ThreadPolicy_operations [] = {
   {"_get_value", &POA_PortableServer::ThreadPolicy::_get_value_skel},
   {"copy", &POA_PortableServer::ThreadPolicy::copy_skel},
   {"destroy", &POA_PortableServer::ThreadPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::ThreadPolicy::_get_policy_type_skel},
   {"_is_a", &POA_PortableServer::ThreadPolicy::_is_a_skel}
 };
 
@@ -461,7 +248,7 @@ void* POA_PortableServer::ThreadPolicy::_downcast (
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ThreadPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ThreadPolicy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
+    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;
@@ -514,7 +301,7 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_ThreadPolicy::_is_a (
 }
 
 
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_ThreadPolicy::copy (
+CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ThreadPolicy::copy (
     CORBA::Environment &_tao_environment
   )
 {
@@ -532,6 +319,13 @@ void POA_PortableServer::_tao_collocated_ThreadPolicy::destroy (
     );
 }
 
+CORBA::PolicyType POA_PortableServer::_tao_collocated_ThreadPolicy::policy_type (
+    CORBA::Environment &_tao_environment
+  )
+{
+  return this->servant_->policy_type (_tao_environment);
+}
+
 PortableServer::ThreadPolicyValue
 POA_PortableServer::_tao_collocated_ThreadPolicy::value (
     CORBA::Environment &_tao_environment
@@ -553,6 +347,7 @@ static const TAO_operation_db_entry PortableServer_LifespanPolicy_operations []
   {"_get_value", &POA_PortableServer::LifespanPolicy::_get_value_skel},
   {"copy", &POA_PortableServer::LifespanPolicy::copy_skel},
   {"destroy", &POA_PortableServer::LifespanPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::LifespanPolicy::_get_policy_type_skel},
   {"_is_a", &POA_PortableServer::LifespanPolicy::_is_a_skel}
 };
 
@@ -655,7 +450,7 @@ void* POA_PortableServer::LifespanPolicy::_downcast (
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/LifespanPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::LifespanPolicy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
+    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;
@@ -707,7 +502,7 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_LifespanPolicy::_is_a (
     );
 }
 
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_LifespanPolicy::copy (
+CORBA::Policy_ptr POA_PortableServer::_tao_collocated_LifespanPolicy::copy (
     CORBA::Environment &_tao_environment
   )
 {
@@ -725,6 +520,13 @@ void POA_PortableServer::_tao_collocated_LifespanPolicy::destroy (
     );
 }
 
+CORBA::PolicyType POA_PortableServer::_tao_collocated_LifespanPolicy::policy_type (
+    CORBA::Environment &_tao_environment
+  )
+{
+  return this->servant_->policy_type (_tao_environment);
+}
+
 PortableServer::LifespanPolicyValue
 POA_PortableServer::_tao_collocated_LifespanPolicy::value (
     CORBA::Environment &_tao_environment
@@ -746,6 +548,7 @@ static const TAO_operation_db_entry PortableServer_IdUniquenessPolicy_operations
   {"_get_value", &POA_PortableServer::IdUniquenessPolicy::_get_value_skel},
   {"copy", &POA_PortableServer::IdUniquenessPolicy::copy_skel},
   {"destroy", &POA_PortableServer::IdUniquenessPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel},
   {"_is_a", &POA_PortableServer::IdUniquenessPolicy::_is_a_skel}
 };
 
@@ -848,7 +651,7 @@ void* POA_PortableServer::IdUniquenessPolicy::_downcast (
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/IdUniquenessPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::IdUniquenessPolicy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
+    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;
@@ -900,7 +703,7 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_is_a (
     );
 }
 
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_IdUniquenessPolicy::copy (
+CORBA::Policy_ptr POA_PortableServer::_tao_collocated_IdUniquenessPolicy::copy (
     CORBA::Environment &_tao_environment
   )
 {
@@ -918,6 +721,13 @@ void POA_PortableServer::_tao_collocated_IdUniquenessPolicy::destroy (
     );
 }
 
+CORBA::PolicyType POA_PortableServer::_tao_collocated_IdUniquenessPolicy::policy_type (
+    CORBA::Environment &_tao_environment
+  )
+{
+  return this->servant_->policy_type (_tao_environment);
+}
+
 PortableServer::IdUniquenessPolicyValue
 POA_PortableServer::_tao_collocated_IdUniquenessPolicy::value (
     CORBA::Environment &_tao_environment
@@ -939,6 +749,7 @@ static const TAO_operation_db_entry PortableServer_IdAssignmentPolicy_operations
   {"_get_value", &POA_PortableServer::IdAssignmentPolicy::_get_value_skel},
   {"copy", &POA_PortableServer::IdAssignmentPolicy::copy_skel},
   {"destroy", &POA_PortableServer::IdAssignmentPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel},
   {"_is_a", &POA_PortableServer::IdAssignmentPolicy::_is_a_skel}
 };
 
@@ -1041,7 +852,7 @@ void* POA_PortableServer::IdAssignmentPolicy::_downcast (
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/IdAssignmentPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::IdAssignmentPolicy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
+    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;
@@ -1093,7 +904,7 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_is_a (
     );
 }
 
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_IdAssignmentPolicy::copy (
+CORBA::Policy_ptr POA_PortableServer::_tao_collocated_IdAssignmentPolicy::copy (
     CORBA::Environment &_tao_environment
   )
 {
@@ -1111,6 +922,13 @@ void POA_PortableServer::_tao_collocated_IdAssignmentPolicy::destroy (
     );
 }
 
+CORBA::PolicyType POA_PortableServer::_tao_collocated_IdAssignmentPolicy::policy_type (
+    CORBA::Environment &_tao_environment
+  )
+{
+  return this->servant_->policy_type (_tao_environment);
+}
+
 PortableServer::IdAssignmentPolicyValue
 POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value (
     CORBA::Environment &_tao_environment
@@ -1132,6 +950,7 @@ static const TAO_operation_db_entry PortableServer_ImplicitActivationPolicy_oper
   {"_get_value", &POA_PortableServer::ImplicitActivationPolicy::_get_value_skel},
   {"copy", &POA_PortableServer::ImplicitActivationPolicy::copy_skel},
   {"destroy", &POA_PortableServer::ImplicitActivationPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel},
   {"_is_a", &POA_PortableServer::ImplicitActivationPolicy::_is_a_skel}
 };
 
@@ -1234,7 +1053,7 @@ void* POA_PortableServer::ImplicitActivationPolicy::_downcast (
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ImplicitActivationPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ImplicitActivationPolicy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
+    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;
@@ -1286,7 +1105,7 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_is
     );
 }
 
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::copy (
+CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::copy (
     CORBA::Environment &_tao_environment
   )
 {
@@ -1304,6 +1123,13 @@ void POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::destroy (
     );
 }
 
+CORBA::PolicyType POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::policy_type (
+    CORBA::Environment &_tao_environment
+  )
+{
+  return this->servant_->policy_type (_tao_environment);
+}
+
 PortableServer::ImplicitActivationPolicyValue
 POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value (
     CORBA::Environment &_tao_environment
@@ -1325,6 +1151,7 @@ static const TAO_operation_db_entry PortableServer_ServantRetentionPolicy_operat
   {"_get_value", &POA_PortableServer::ServantRetentionPolicy::_get_value_skel},
   {"copy", &POA_PortableServer::ServantRetentionPolicy::copy_skel},
   {"destroy", &POA_PortableServer::ServantRetentionPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel},
   {"_is_a", &POA_PortableServer::ServantRetentionPolicy::_is_a_skel}
 };
 
@@ -1427,7 +1254,7 @@ void* POA_PortableServer::ServantRetentionPolicy::_downcast (
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantRetentionPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ServantRetentionPolicy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
+    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;
@@ -1479,7 +1306,7 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_is_a
     );
 }
 
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_ServantRetentionPolicy::copy (
+CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ServantRetentionPolicy::copy (
     CORBA::Environment &_tao_environment
   )
 {
@@ -1497,6 +1324,13 @@ void POA_PortableServer::_tao_collocated_ServantRetentionPolicy::destroy (
     );
 }
 
+CORBA::PolicyType POA_PortableServer::_tao_collocated_ServantRetentionPolicy::policy_type (
+    CORBA::Environment &_tao_environment
+  )
+{
+  return this->servant_->policy_type (_tao_environment);
+}
+
 PortableServer::ServantRetentionPolicyValue
 POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value (
     CORBA::Environment &_tao_environment
@@ -1518,6 +1352,7 @@ static const TAO_operation_db_entry PortableServer_RequestProcessingPolicy_opera
   {"_get_value", &POA_PortableServer::RequestProcessingPolicy::_get_value_skel},
   {"copy", &POA_PortableServer::RequestProcessingPolicy::copy_skel},
   {"destroy", &POA_PortableServer::RequestProcessingPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel},
   {"_is_a", &POA_PortableServer::RequestProcessingPolicy::_is_a_skel}
 };
 
@@ -1620,7 +1455,7 @@ void* POA_PortableServer::RequestProcessingPolicy::_downcast (
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/RequestProcessingPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::RequestProcessingPolicy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
-    return ACE_static_cast (POA_PortableServer::Policy_ptr, this);
+    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;
@@ -1672,7 +1507,7 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_is_
     );
 }
 
-PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_RequestProcessingPolicy::copy (
+CORBA::Policy_ptr POA_PortableServer::_tao_collocated_RequestProcessingPolicy::copy (
     CORBA::Environment &_tao_environment
   )
 {
@@ -1690,6 +1525,13 @@ void POA_PortableServer::_tao_collocated_RequestProcessingPolicy::destroy (
     );
 }
 
+CORBA::PolicyType POA_PortableServer::_tao_collocated_RequestProcessingPolicy::policy_type (
+    CORBA::Environment &_tao_environment
+  )
+{
+  return this->servant_->policy_type (_tao_environment);
+}
+
 PortableServer::RequestProcessingPolicyValue
 POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value (
     CORBA::Environment &_tao_environment
@@ -2601,7 +2443,7 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_POA::_is_a (
 PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::create_POA (
     const char* adapter_name,
     PortableServer::POAManager_ptr  a_POAManager,
-    const PortableServer::PolicyList & policies,
+    const CORBA::PolicyList & policies,
     CORBA::Environment &_tao_environment
   )
 {
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
index d8f873cc63c..bd4bd339a98 100644
--- a/TAO/tao/POAS.h
+++ b/TAO/tao/POAS.h
@@ -18,7 +18,8 @@
 #if !defined (TAO_IDL_POAS_H)
 #define TAO_IDL_POAS_H
 
-#include "POAC.h"
+#include "tao/POAC.h"
+#include "tao/PolicyS.h"
 
 class POA_PortableServer
 {
@@ -69,69 +70,9 @@ public:
 
 #endif // end #if !defined
 
-
-  class Policy;
-  typedef Policy *Policy_ptr;
-  class Policy :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    Policy (void);
-      public:
-    virtual ~Policy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &_tao_environment);
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual PortableServer::Policy_ptr  copy ( CORBA::Environment &env) = 0; // pure virtual
-    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    virtual void destroy ( CORBA::Environment &env) = 0; // pure virtual
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment);
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
-
-    PortableServer::Policy *_this (CORBA::Environment &_tao_environment);
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-
-#if !defined (_PORTABLESERVER_POLICY___COLLOCATED_SH_)
-#define _PORTABLESERVER_POLICY___COLLOCATED_SH_
-
-  class _tao_collocated_Policy    : public virtual PortableServer::Policy
-  {
-  public:
-    _tao_collocated_Policy (
-        Policy_ptr  servant,
-        STUB_Object *stub
-      );
-    Policy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &_tao_environment
-      );
-    virtual PortableServer::Policy_ptr copy (
-        CORBA::Environment &_tao_environment
-      );
-    virtual void destroy (
-        CORBA::Environment &_tao_environment
-      );
-  
-  private:
-    Policy_ptr servant_;
-  };
-
-
-#endif // end #if !defined
-
-
   class ThreadPolicy;
   typedef ThreadPolicy *ThreadPolicy_ptr;
-  class ThreadPolicy : public virtual Policy
+  class ThreadPolicy : public virtual POA_CORBA::Policy
   {
   protected:
     ThreadPolicy (void);
@@ -154,6 +95,13 @@ public:
 
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
 
+    static void _get_policy_type_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &_tao_env
+      );
+
     PortableServer::ThreadPolicy *_this (CORBA::Environment &_tao_environment);
     virtual const char* _interface_repository_id (void) const;
   };
@@ -163,7 +111,7 @@ public:
 #define _PORTABLESERVER_THREADPOLICY___COLLOCATED_SH_
 
   class _tao_collocated_ThreadPolicy    : public virtual PortableServer::ThreadPolicy,
-      public virtual _tao_collocated_Policy
+      public virtual POA_CORBA::_tao_collocated_Policy
   {
   public:
     _tao_collocated_ThreadPolicy (
@@ -178,13 +126,15 @@ public:
     virtual PortableServer::ThreadPolicyValue value (
         CORBA::Environment &env
       );
-    virtual PortableServer::Policy_ptr copy (
+    virtual CORBA::Policy_ptr copy (
         CORBA::Environment &_tao_environment
       );
     virtual void destroy (
         CORBA::Environment &_tao_environment
       );
-  
+    virtual CORBA::PolicyType policy_type (
+        CORBA::Environment &_tao_environment
+       );  
   private:
     ThreadPolicy_ptr servant_;
   };
@@ -195,7 +145,7 @@ public:
 
   class LifespanPolicy;
   typedef LifespanPolicy *LifespanPolicy_ptr;
-  class LifespanPolicy : public virtual Policy
+  class LifespanPolicy : public virtual POA_CORBA::Policy
   {
   protected:
     LifespanPolicy (void);
@@ -218,6 +168,14 @@ public:
 
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
 
+    static void _get_policy_type_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &_tao_env
+      );
+
+
     PortableServer::LifespanPolicy *_this (CORBA::Environment &_tao_environment);
     virtual const char* _interface_repository_id (void) const;
   };
@@ -227,7 +185,7 @@ public:
 #define _PORTABLESERVER_LIFESPANPOLICY___COLLOCATED_SH_
 
   class _tao_collocated_LifespanPolicy    : public virtual PortableServer::LifespanPolicy,
-      public virtual _tao_collocated_Policy
+      public virtual POA_CORBA::_tao_collocated_Policy
   {
   public:
     _tao_collocated_LifespanPolicy (
@@ -242,12 +200,15 @@ public:
     virtual PortableServer::LifespanPolicyValue value (
         CORBA::Environment &env
       );
-    virtual PortableServer::Policy_ptr copy (
+    virtual CORBA::Policy_ptr copy (
         CORBA::Environment &_tao_environment
       );
     virtual void destroy (
         CORBA::Environment &_tao_environment
       );
+    virtual CORBA::PolicyType policy_type (
+        CORBA::Environment &_tao_environment
+       );  
   
   private:
     LifespanPolicy_ptr servant_;
@@ -259,7 +220,7 @@ public:
 
   class IdUniquenessPolicy;
   typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
-  class IdUniquenessPolicy : public virtual Policy
+  class IdUniquenessPolicy : public virtual POA_CORBA::Policy
   {
   protected:
     IdUniquenessPolicy (void);
@@ -282,6 +243,14 @@ public:
 
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
 
+    static void _get_policy_type_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &_tao_env
+      );
+
+
     PortableServer::IdUniquenessPolicy *_this (CORBA::Environment &_tao_environment);
     virtual const char* _interface_repository_id (void) const;
   };
@@ -291,7 +260,7 @@ public:
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___COLLOCATED_SH_
 
   class _tao_collocated_IdUniquenessPolicy    : public virtual PortableServer::IdUniquenessPolicy,
-      public virtual _tao_collocated_Policy
+      public virtual POA_CORBA::_tao_collocated_Policy
   {
   public:
     _tao_collocated_IdUniquenessPolicy (
@@ -306,12 +275,15 @@ public:
     virtual PortableServer::IdUniquenessPolicyValue value (
         CORBA::Environment &env
       );
-    virtual PortableServer::Policy_ptr copy (
+    virtual CORBA::Policy_ptr copy (
         CORBA::Environment &_tao_environment
       );
     virtual void destroy (
         CORBA::Environment &_tao_environment
       );
+    virtual CORBA::PolicyType policy_type (
+        CORBA::Environment &_tao_environment
+       );  
   
   private:
     IdUniquenessPolicy_ptr servant_;
@@ -323,7 +295,7 @@ public:
 
   class IdAssignmentPolicy;
   typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
-  class IdAssignmentPolicy : public virtual Policy
+  class IdAssignmentPolicy : public virtual POA_CORBA::Policy
   {
   protected:
     IdAssignmentPolicy (void);
@@ -346,6 +318,14 @@ public:
 
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
 
+    static void _get_policy_type_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &_tao_env
+      );
+
+
     PortableServer::IdAssignmentPolicy *_this (CORBA::Environment &_tao_environment);
     virtual const char* _interface_repository_id (void) const;
   };
@@ -355,7 +335,7 @@ public:
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___COLLOCATED_SH_
 
   class _tao_collocated_IdAssignmentPolicy    : public virtual PortableServer::IdAssignmentPolicy,
-      public virtual _tao_collocated_Policy
+      public virtual POA_CORBA::_tao_collocated_Policy
   {
   public:
     _tao_collocated_IdAssignmentPolicy (
@@ -370,12 +350,15 @@ public:
     virtual PortableServer::IdAssignmentPolicyValue value (
         CORBA::Environment &env
       );
-    virtual PortableServer::Policy_ptr copy (
+    virtual CORBA::Policy_ptr copy (
         CORBA::Environment &_tao_environment
       );
     virtual void destroy (
         CORBA::Environment &_tao_environment
       );
+    virtual CORBA::PolicyType policy_type (
+        CORBA::Environment &_tao_environment
+       );  
   
   private:
     IdAssignmentPolicy_ptr servant_;
@@ -387,7 +370,7 @@ public:
 
   class ImplicitActivationPolicy;
   typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
-  class ImplicitActivationPolicy : public virtual Policy
+  class ImplicitActivationPolicy : public virtual POA_CORBA::Policy
   {
   protected:
     ImplicitActivationPolicy (void);
@@ -410,6 +393,14 @@ public:
 
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
 
+    static void _get_policy_type_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &_tao_env
+      );
+
+
     PortableServer::ImplicitActivationPolicy *_this (CORBA::Environment &_tao_environment);
     virtual const char* _interface_repository_id (void) const;
   };
@@ -419,7 +410,7 @@ public:
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___COLLOCATED_SH_
 
   class _tao_collocated_ImplicitActivationPolicy    : public virtual PortableServer::ImplicitActivationPolicy,
-      public virtual _tao_collocated_Policy
+      public virtual POA_CORBA::_tao_collocated_Policy
   {
   public:
     _tao_collocated_ImplicitActivationPolicy (
@@ -434,12 +425,15 @@ public:
     virtual PortableServer::ImplicitActivationPolicyValue value (
         CORBA::Environment &env
       );
-    virtual PortableServer::Policy_ptr copy (
+    virtual CORBA::Policy_ptr copy (
         CORBA::Environment &_tao_environment
       );
     virtual void destroy (
         CORBA::Environment &_tao_environment
       );
+    virtual CORBA::PolicyType policy_type (
+        CORBA::Environment &_tao_environment
+       );  
   
   private:
     ImplicitActivationPolicy_ptr servant_;
@@ -451,7 +445,7 @@ public:
 
   class ServantRetentionPolicy;
   typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-  class ServantRetentionPolicy : public virtual Policy
+  class ServantRetentionPolicy : public virtual POA_CORBA::Policy
   {
   protected:
     ServantRetentionPolicy (void);
@@ -474,6 +468,14 @@ public:
 
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
 
+    static void _get_policy_type_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &_tao_env
+      );
+
+
     PortableServer::ServantRetentionPolicy *_this (CORBA::Environment &_tao_environment);
     virtual const char* _interface_repository_id (void) const;
   };
@@ -483,7 +485,7 @@ public:
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___COLLOCATED_SH_
 
   class _tao_collocated_ServantRetentionPolicy    : public virtual PortableServer::ServantRetentionPolicy,
-      public virtual _tao_collocated_Policy
+      public virtual POA_CORBA::_tao_collocated_Policy
   {
   public:
     _tao_collocated_ServantRetentionPolicy (
@@ -498,12 +500,15 @@ public:
     virtual PortableServer::ServantRetentionPolicyValue value (
         CORBA::Environment &env
       );
-    virtual PortableServer::Policy_ptr copy (
+    virtual CORBA::Policy_ptr copy (
         CORBA::Environment &_tao_environment
       );
     virtual void destroy (
         CORBA::Environment &_tao_environment
       );
+    virtual CORBA::PolicyType policy_type (
+        CORBA::Environment &_tao_environment
+       );  
   
   private:
     ServantRetentionPolicy_ptr servant_;
@@ -515,7 +520,7 @@ public:
 
   class RequestProcessingPolicy;
   typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-  class RequestProcessingPolicy : public virtual Policy
+  class RequestProcessingPolicy : public virtual POA_CORBA::Policy
   {
   protected:
     RequestProcessingPolicy (void);
@@ -538,6 +543,14 @@ public:
 
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env);
 
+    static void _get_policy_type_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &_tao_env
+      );
+
+
     PortableServer::RequestProcessingPolicy *_this (CORBA::Environment &_tao_environment);
     virtual const char* _interface_repository_id (void) const;
   };
@@ -547,7 +560,7 @@ public:
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___COLLOCATED_SH_
 
   class _tao_collocated_RequestProcessingPolicy    : public virtual PortableServer::RequestProcessingPolicy,
-      public virtual _tao_collocated_Policy
+      public virtual POA_CORBA::_tao_collocated_Policy
   {
   public:
     _tao_collocated_RequestProcessingPolicy (
@@ -562,12 +575,15 @@ public:
     virtual PortableServer::RequestProcessingPolicyValue value (
         CORBA::Environment &env
       );
-    virtual PortableServer::Policy_ptr copy (
+    virtual CORBA::Policy_ptr copy (
         CORBA::Environment &_tao_environment
       );
     virtual void destroy (
         CORBA::Environment &_tao_environment
       );
+    virtual CORBA::PolicyType policy_type (
+        CORBA::Environment &_tao_environment
+       );  
   
   private:
     RequestProcessingPolicy_ptr servant_;
@@ -899,7 +915,7 @@ public:
     virtual void* _downcast (
         const char* logical_type_id
       );
-    virtual PortableServer::POA_ptr  create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const PortableServer::PolicyList &policies,  CORBA::Environment &env) = 0; // pure virtual
+    virtual PortableServer::POA_ptr  create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies,  CORBA::Environment &env) = 0; // pure virtual
 
     virtual PortableServer::POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it,  CORBA::Environment &env) = 0; // pure virtual
 
@@ -986,7 +1002,7 @@ public:
     virtual PortableServer::POA_ptr create_POA (
         const char* adapter_name,
         PortableServer::POAManager_ptr  a_POAManager,
-        const PortableServer::PolicyList & policies,
+        const CORBA::PolicyList & policies,
         CORBA::Environment &_tao_environment
       );
     virtual PortableServer::POA_ptr find_POA (
diff --git a/TAO/tao/POAS.i b/TAO/tao/POAS.i
index 781dfd5d1b7..cedc12be11e 100644
--- a/TAO/tao/POAS.i
+++ b/TAO/tao/POAS.i
@@ -1,3 +1,5 @@
+// $Id$
+//
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO ORB and the TAO IDL Compiler have been developed by Washington 
 // University Computer Science's Distributed Object Computing Group.
@@ -12,23 +14,23 @@ POA_PortableServer::CurrentBase::~CurrentBase (void)
 }
 // skeleton destructor
 ACE_INLINE
-POA_PortableServer::Policy::~Policy (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
 POA_PortableServer::ThreadPolicy::~ThreadPolicy (void)
 {
 }
 ACE_INLINE void POA_PortableServer::ThreadPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 ACE_INLINE void POA_PortableServer::ThreadPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+}
+ACE_INLINE void POA_PortableServer::ThreadPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+{
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 // skeleton destructor
 ACE_INLINE
@@ -37,13 +39,18 @@ POA_PortableServer::LifespanPolicy::~LifespanPolicy (void)
 }
 ACE_INLINE void POA_PortableServer::LifespanPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 ACE_INLINE void POA_PortableServer::LifespanPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+}
+ACE_INLINE void POA_PortableServer::LifespanPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+{
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 // skeleton destructor
 ACE_INLINE
@@ -52,13 +59,18 @@ POA_PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 }
 ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+}
+ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+{
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 // skeleton destructor
 ACE_INLINE
@@ -67,13 +79,18 @@ POA_PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 }
 ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+}
+ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+{
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 // skeleton destructor
 ACE_INLINE
@@ -82,13 +99,18 @@ POA_PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 }
 ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+}
+ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+{
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 // skeleton destructor
 ACE_INLINE
@@ -97,13 +119,18 @@ POA_PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 }
 ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+}
+ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+{
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 // skeleton destructor
 ACE_INLINE
@@ -112,13 +139,18 @@ POA_PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 }
 ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_PortableServer::Policy::copy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
-  POA_PortableServer::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
-  POA_PortableServer::Policy::destroy_skel (req, (POA_PortableServer::Policy_ptr) impl, context, env);
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+}
+ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+{
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
 // skeleton destructor
 ACE_INLINE
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 010811c2f10..239bb6ad82f 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -9,8 +9,7 @@
 // Information on TAO is available at
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PolicyC.h"
-#include "PolicyS.h"
+#include "tao/corba.h"
 
 #if !defined (__ACE_INLINE__)
 #include "PolicyC.i"
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index c981670cad5..41b34e08a01 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -12,8 +12,6 @@
 #if !defined (_TAO_IDL_POLICYC_H_)
 #define _TAO_IDL_POLICYC_H_
 
-#include "tao/corba.h"
-
 #if !defined (_CORBA_POLICY___PTR_CH_)
 #define _CORBA_POLICY___PTR_CH_
 
@@ -26,7 +24,7 @@ typedef CORBA_Policy *CORBA_Policy_ptr;
 #if !defined (_CORBA_POLICY___VAR_CH_)
 #define _CORBA_POLICY___VAR_CH_
 
-class  CORBA_Policy_var
+class TAO_Export  CORBA_Policy_var
 {
 public:
   CORBA_Policy_var (void); // default constructor
@@ -58,7 +56,7 @@ private:
 #if !defined (_CORBA_POLICY___OUT_CH_)
 #define _CORBA_POLICY___OUT_CH_
 
-class  CORBA_Policy_out
+class TAO_Export  CORBA_Policy_out
 {
 public:
   CORBA_Policy_out (CORBA_Policy_ptr &);
@@ -82,7 +80,7 @@ private:
 #if !defined (_CORBA_POLICY_CH_)
 #define _CORBA_POLICY_CH_
 
-class  CORBA_Policy : public virtual CORBA::Object
+class TAO_Export  CORBA_Policy : public virtual CORBA::Object
 {
 public:
   // the static operations
@@ -126,7 +124,7 @@ private:
 // CORBA_PolicyList
 // *************************************************************
 
-class  CORBA_PolicyList : public TAO_Unbounded_Object_Sequence<CORBA_Policy>
+class TAO_Export  CORBA_PolicyList : public TAO_Unbounded_Object_Sequence<CORBA_Policy>
 {
 public:
   CORBA_PolicyList (void); // default ctor
@@ -154,7 +152,7 @@ static CORBA::TypeCode_ptr _tc_PolicyList_seq;
 // class CORBA::PolicyList_var
 // *************************************************************
 
-class  CORBA_PolicyList_var
+class TAO_Export  CORBA_PolicyList_var
 {
 public:
   CORBA_PolicyList_var (void); // default constructor
@@ -189,7 +187,7 @@ private:
 #if !defined (_CORBA_POLICYLIST___OUT_CH_)
 #define _CORBA_POLICYLIST___OUT_CH_
 
-class  CORBA_PolicyList_out
+class TAO_Export  CORBA_PolicyList_out
 {
 public:
   CORBA_PolicyList_out (CORBA_PolicyList *&);
diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp
index 9976a0d112d..36f2fe27ac0 100644
--- a/TAO/tao/PolicyS.cpp
+++ b/TAO/tao/PolicyS.cpp
@@ -9,7 +9,7 @@
 // Information on TAO is available at
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PolicyS.h"
+#include "tao/corba.h"
 
 #if !defined (__ACE_INLINE__)
 #include "PolicyS.i"
@@ -215,7 +215,7 @@ POA_CORBA::_tao_collocated_Policy::_tao_collocated_Policy (
     POA_CORBA::Policy_ptr  servant,
     STUB_Object *stub
   )
-  : CORBA::Policy (stub, servant, CORBA::B_TRUE),
+  : CORBA_Policy (stub, servant, CORBA::B_TRUE),
     CORBA_Object (stub, servant, CORBA::B_TRUE),
     servant_ (servant)
 {
diff --git a/TAO/tao/PolicyS.h b/TAO/tao/PolicyS.h
index d3fbb385bb7..0cd5b473d5f 100644
--- a/TAO/tao/PolicyS.h
+++ b/TAO/tao/PolicyS.h
@@ -14,12 +14,12 @@
 
 #include "PolicyC.h"
 
-class  POA_CORBA
+class TAO_Export  POA_CORBA
 {
 public:
   class Policy;
   typedef Policy *Policy_ptr;
-  class  Policy :  public virtual PortableServer::ServantBase
+  class TAO_Export  Policy :  public virtual PortableServer::ServantBase
   {
   protected:
     Policy (void);
@@ -73,7 +73,7 @@ public:
 #if !defined (_CORBA_POLICY___COLLOCATED_SH_)
 #define _CORBA_POLICY___COLLOCATED_SH_
 
-  class  _tao_collocated_Policy     : public virtual CORBA::Policy
+  class TAO_Export  _tao_collocated_Policy     : public virtual CORBA_Policy
   {
   public:
     _tao_collocated_Policy (
diff --git a/TAO/tao/TAO.cpp b/TAO/tao/TAO.cpp
index ce890089874..ee05cb69b7e 100644
--- a/TAO/tao/TAO.cpp
+++ b/TAO/tao/TAO.cpp
@@ -93,8 +93,7 @@ TAO_ORB_Manager::init_child_poa (int argc,
 
   // Create the default policies - user-supplied ID, and persistent
   // objects.
-  // CORBA::PolicyList policies (2);
-  PortableServer::PolicyList policies (2);
+  CORBA::PolicyList policies (2);
   policies.length (2);
 
   // Id Assignment policy
@@ -126,8 +125,7 @@ TAO_ORB_Manager::init_child_poa (int argc,
        i < policies.length () && env.exception () == 0;
        ++i)
     {
-      // CORBA::Policy_ptr policy = policies[i];
-      PortableServer::Policy_ptr policy = policies[i];
+      CORBA::Policy_ptr policy = policies[i];
       policy->destroy (env);
     }
   TAO_CHECK_ENV_RETURN (env, -1);
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index e85ffba0dc1..23e693e23e5 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -212,6 +212,14 @@ SOURCE=.\POAS.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\PolicyC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PolicyS.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Principal.cpp

 # End Source File

 # Begin Source File

@@ -400,6 +408,14 @@ SOURCE=.\poaS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\PolicyC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PolicyS.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Principal.h

 # End Source File

 # Begin Source File

@@ -536,6 +552,14 @@ SOURCE=.\poaS.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\PolicyC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\PolicyS.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Request.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 61ea982e9c2..ebeab429556 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -182,12 +182,11 @@ extern CORBA::TypeCode TC_opaque;
 #include "tao/Server_Request.h"
 #include "tao/Typecode.h"
 
-#include "tao/PolicyC.h"
-
 // Marshaling
 #include "tao/Marshal.h"
 #include "tao/CDR.h"
 
+#include "tao/PolicyC.h"
 #include "tao/POA.h"
 
 extern TAO_Export int operator== (const PortableServer::ObjectId &l,
diff --git a/TAO/tao/poa.idl b/TAO/tao/poa.idl
index 8d131600045..b72c8b5e18e 100644
--- a/TAO/tao/poa.idl
+++ b/TAO/tao/poa.idl
@@ -16,22 +16,33 @@
 
 // IDL
 #pragma prefix "omg.org"
-module PortableServer
+
+// IDL
+module CORBA
 {
-  typedef string Identifier;
-  typedef string RepositoryId;
-  interface CurrentBase{};
-  // ****change**** end   definitions from CORBA needed for standalone compile
+  // Basic Policy definition
+
+  typedef unsigned long PolicyType;
 
-  // basic Policy definition
   interface Policy
     {
+      readonly attribute PolicyType policy_type;
       Policy copy( );
       void destroy( );
     };
 
   typedef sequence <Policy>  PolicyList;
 
+  interface Current{};
+
+  // ....
+};
+
+module PortableServer
+{
+  typedef string Identifier;
+  typedef string RepositoryId;
+
   // forward reference
   interface POA;
 
@@ -52,7 +63,7 @@ module PortableServer
     ORB_CTRL_MODEL,
     SINGLE_THREAD_MODEL
   };
-  interface ThreadPolicy : Policy
+  interface ThreadPolicy : CORBA::Policy
     {
       readonly attribute ThreadPolicyValue value;
     };
@@ -61,7 +72,7 @@ module PortableServer
     TRANSIENT,
     PERSISTENT
   };
-  interface LifespanPolicy : Policy
+  interface LifespanPolicy : CORBA::Policy
     {
       readonly attribute LifespanPolicyValue value;
     };
@@ -70,7 +81,7 @@ module PortableServer
     UNIQUE_ID,
     MULTIPLE_ID
   };
-  interface IdUniquenessPolicy : Policy
+  interface IdUniquenessPolicy : CORBA::Policy
     {
       readonly attribute IdUniquenessPolicyValue value;
     };
@@ -79,7 +90,7 @@ module PortableServer
     USER_ID,
     SYSTEM_ID
   };
-  interface IdAssignmentPolicy : Policy
+  interface IdAssignmentPolicy : CORBA::Policy
     {
       readonly attribute IdAssignmentPolicyValue value;
     };
@@ -88,7 +99,7 @@ module PortableServer
     IMPLICIT_ACTIVATION,
     NO_IMPLICIT_ACTIVATION
   };
-  interface ImplicitActivationPolicy : Policy
+  interface ImplicitActivationPolicy : CORBA::Policy
     {
       readonly attribute ImplicitActivationPolicyValue value;
     };
@@ -97,7 +108,7 @@ module PortableServer
     RETAIN,
     NON_RETAIN
   };
-  interface ServantRetentionPolicy : Policy
+  interface ServantRetentionPolicy : CORBA::Policy
     {
       readonly attribute ServantRetentionPolicyValue value;
     };
@@ -107,7 +118,7 @@ module PortableServer
     USE_DEFAULT_SERVANT,
     USE_SERVANT_MANAGER
   };
-  interface RequestProcessingPolicy : Policy
+  interface RequestProcessingPolicy : CORBA::Policy
     {
       readonly attribute RequestProcessingPolicyValue value;
     };
@@ -216,7 +227,7 @@ module PortableServer
 
       POA create_POA(in string adapter_name,
 		     in POAManager a_POAManager,
-		     in PolicyList policies)
+		     in CORBA::PolicyList policies)
 	raises (AdapterAlreadyExists, InvalidPolicy);
 
       POA find_POA(in string adapter_name,  in boolean activate_it)
@@ -353,7 +364,7 @@ module PortableServer
   //
   // **************************************************
 
-  interface Current : CurrentBase
+  interface Current : CORBA::Current
     {
       exception NoContext { };
 
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp
index c30f128ec04..c9fa52eb353 100644
--- a/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -131,8 +131,7 @@ Cubit_Task::initialize_orb (void)
         this->root_poa_->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      // CORBA::PolicyList policies (2);
-      PortableServer::PolicyList policies (2);
+      CORBA::PolicyList policies (2);
       policies.length (2);
 
       // Id Assignment policy
@@ -161,8 +160,7 @@ Cubit_Task::initialize_orb (void)
            i < policies.length () && TAO_TRY_ENV.exception () == 0;
            ++i)
         {
-          // CORBA::Policy_ptr policy = policies[i];
-          PortableServer::Policy_ptr policy = policies[i];
+          CORBA::Policy_ptr policy = policies[i];
           policy->destroy (TAO_TRY_ENV);
         }
       TAO_CHECK_ENV;
@@ -474,8 +472,7 @@ Cubit_Factory_Task::initialize_orb (void)
         this->root_poa_->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      // CORBA::PolicyList policies (2);
-      PortableServer::PolicyList policies (2);
+      CORBA::PolicyList policies (2);
       policies.length (2);
 
       // Id Assignment policy
@@ -504,8 +501,7 @@ Cubit_Factory_Task::initialize_orb (void)
            i < policies.length () && TAO_TRY_ENV.exception () == 0;
            ++i)
         {
-          // CORBA::Policy_ptr policy = policies[i];
-          PortableServer::Policy_ptr policy = policies[i];
+          CORBA::Policy_ptr policy = policies[i];
           policy->destroy (TAO_TRY_ENV);
         }
       TAO_CHECK_ENV;
diff --git a/TAO/tests/NestedUpcall/server.cpp b/TAO/tests/NestedUpcall/server.cpp
index 161e5e98e7b..3d75ce6d0d1 100644
--- a/TAO/tests/NestedUpcall/server.cpp
+++ b/TAO/tests/NestedUpcall/server.cpp
@@ -53,7 +53,7 @@ main (int argc, char* argv[])
 	root_poa->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      PortableServer::PolicyList policies (2);
+      CORBA::PolicyList policies (2);
       policies.length (2);  
       policies[0] =
 	root_poa->create_id_assignment_policy (PortableServer::USER_ID,
diff --git a/TAO/tests/POA/Default_Servant/server.cpp b/TAO/tests/POA/Default_Servant/server.cpp
index ba398514034..87f80689d52 100644
--- a/TAO/tests/POA/Default_Servant/server.cpp
+++ b/TAO/tests/POA/Default_Servant/server.cpp
@@ -50,8 +50,7 @@ main (int argc, char **argv)
       return -1;
     }
   
-  // CORBA::PolicyList policies (5);
-  PortableServer::PolicyList policies (5);
+  CORBA::PolicyList policies (5);
   policies.length (5);  
 
   // ID Assignment Policy
@@ -114,8 +113,7 @@ main (int argc, char **argv)
        i < policies.length () && env.exception () == 0;
        ++i)
     {
-      // CORBA::Policy_ptr policy = policies[i];
-      PortableServer::Policy_ptr policy = policies[i];
+      CORBA::Policy_ptr policy = policies[i];
       policy->destroy (env);
     }  
   if (env.exception () != 0)
diff --git a/TAO/tests/POA/Explicit_Activation/server.cpp b/TAO/tests/POA/Explicit_Activation/server.cpp
index 05c068e52ab..696173acb5e 100644
--- a/TAO/tests/POA/Explicit_Activation/server.cpp
+++ b/TAO/tests/POA/Explicit_Activation/server.cpp
@@ -59,8 +59,7 @@ main (int argc, char **argv)
     }
 
   // Policies for the firstPOA to be created.
-  // CORBA::PolicyList policies (2); 
-  PortableServer::PolicyList policies (2);
+  CORBA::PolicyList policies (2); 
   policies.length (2);
 
   // Id Assignment Policy
@@ -99,8 +98,7 @@ main (int argc, char **argv)
        i < policies.length () && env.exception () == 0;
        ++i)
     {
-      // CORBA::Policy_ptr policy = policies[i];
-      PortableServer::Policy_ptr policy = policies[i];
+      CORBA::Policy_ptr policy = policies[i];
       policy->destroy (env);
     }
   if (env.exception () != 0)
diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp
index 100d75ca5ed..a79381d0005 100644
--- a/TAO/tests/POA/NewPOA/NewPOA.cpp
+++ b/TAO/tests/POA/NewPOA/NewPOA.cpp
@@ -52,8 +52,7 @@ main (int argc, char **argv)
     }
 
   // Policies for the new POAs
-  // CORBA::PolicyList policies (2);
-  PortableServer::PolicyList policies (2);
+  CORBA::PolicyList policies (2);
   policies.length (2);
 
   // Threading policy
@@ -127,8 +126,7 @@ main (int argc, char **argv)
        i < policies.length () && env.exception () == 0;
        ++i)
     {
-      // CORBA::Policy_ptr policy = policies[i];
-      PortableServer::Policy_ptr policy = policies[i];
+      CORBA::Policy_ptr policy = policies[i];
       policy->destroy (env);
     }
 
diff --git a/TAO/tests/POA/On_Demand_Activation/server.cpp b/TAO/tests/POA/On_Demand_Activation/server.cpp
index 41bdc42bc4a..81a9068e883 100644
--- a/TAO/tests/POA/On_Demand_Activation/server.cpp
+++ b/TAO/tests/POA/On_Demand_Activation/server.cpp
@@ -55,8 +55,7 @@ main (int argc, char **argv)
       return -1;
     }
 
-  // CORBA::PolicyList policies (4);
-  PortableServer::PolicyList policies (4);
+  CORBA::PolicyList policies (4);
   policies.length (4);
 
     // ID Assignment Policy
@@ -145,8 +144,7 @@ main (int argc, char **argv)
        i < policies.length () && env.exception () == 0;
        ++i)
     {
-      // CORBA::Policy_ptr policy = policies[i];
-      PortableServer::Policy_ptr policy = policies[i];
+      CORBA::Policy_ptr policy = policies[i];
       policy->destroy (env);
     }
   if (env.exception () != 0)
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index a4d09b8f250..7984102acf4 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
         oa_ptr->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      PortableServer::PolicyList policies (2);
+      CORBA::PolicyList policies (2);
       policies.length (2);
       policies[0] =
         oa_ptr->create_id_assignment_policy (PortableServer::USER_ID,
diff --git a/TAO/tests/Thruput/TAO/server.cpp b/TAO/tests/Thruput/TAO/server.cpp
index 3c1fd293442..2dd6c47d77c 100644
--- a/TAO/tests/Thruput/TAO/server.cpp
+++ b/TAO/tests/Thruput/TAO/server.cpp
@@ -106,7 +106,7 @@ main (int argc, char **argv)
       return 1;
     }
 
-  PortableServer::PolicyList policies (2);
+  CORBA::PolicyList policies (2);
   policies.length (2);  
   policies[0] =
     root_poa->create_id_assignment_policy (PortableServer::USER_ID,