*** empty log message ***

5 files changed, 73 insertions, 1525 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index cb0d556ba10..16590a84a3e 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,10 @@
+Fri Mar 06 00:18:38 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* tao/poaS and poaC: Removed about a 1000 lines of stubs and
+ 	  skeletons code from poaC.cpp and poaS.cpp.  This code was not
+ 	  necessary because of the locality constraints on certain POA
+ 	  objects. This should help reduce the footprint of TAO.
+
 Thu Mar  5 19:54:27 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Naming/CosNaming_i.cpp: bind_context, rebind,
diff --git a/TAO/tao/poaC.cpp b/TAO/tao/poaC.cpp
index b0a8393565c..984e4ebe9a4 100644
--- a/TAO/tao/poaC.cpp
+++ b/TAO/tao/poaC.cpp
@@ -1081,9 +1081,9 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
     return PortableServer::POAManager::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
   {
-    PortableServer::POAManager_ptr
-    new_obj = new PortableServer::POAManager (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
+    // This can only be colocated
+    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));    
+    return PortableServer::POAManager::_nil ();
   } // end of if
 
   STUB_Object *stub = obj->_servant ()->_create_stub (env);
@@ -1145,102 +1145,6 @@ static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] =
 static CORBA::TypeCode _tc__tc_PortableServer_POAManager_AdapterInactive (CORBA::tk_struct, sizeof (_oc_PortableServer_POAManager_AdapterInactive), (unsigned char *) &_oc_PortableServer_POAManager_AdapterInactive, CORBA::B_FALSE);
 CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive = &_tc__tc_PortableServer_POAManager_AdapterInactive;
 
-static const TAO_Param_Data PortableServer_POAManager_activate_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POAManager_activate_calldata =
-{"activate", 1, 1, PortableServer_POAManager_activate_paramdata, 0, 0};
-
-void  PortableServer::POAManager::activate (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_call (env, &PortableServer_POAManager_activate_calldata, 0);
-  return; // no value
-
-}
-
-static const TAO_Param_Data PortableServer_POAManager_hold_requests_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {CORBA::_tc_boolean, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POAManager_hold_requests_calldata =
-{"hold_requests", 1, 2, PortableServer_POAManager_hold_requests_paramdata, 0, 0};
-
-void  PortableServer::POAManager::hold_requests (CORBA::Boolean wait_for_completion, 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_call (env, &PortableServer_POAManager_hold_requests_calldata, 0, &wait_for_completion);
-  return; // no value
-
-}
-
-static const TAO_Param_Data PortableServer_POAManager_discard_requests_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {CORBA::_tc_boolean, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POAManager_discard_requests_calldata =
-{"discard_requests", 1, 2, PortableServer_POAManager_discard_requests_paramdata, 0, 0};
-
-void  PortableServer::POAManager::discard_requests (CORBA::Boolean wait_for_completion, 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_call (env, &PortableServer_POAManager_discard_requests_calldata, 0, &wait_for_completion);
-  return; // no value
-
-}
-
-static const TAO_Param_Data PortableServer_POAManager_deactivate_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {CORBA::_tc_boolean, PARAM_IN, 0},
-  {CORBA::_tc_boolean, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POAManager_deactivate_calldata =
-{"deactivate", 1, 3, PortableServer_POAManager_deactivate_paramdata, 0, 0};
-
-void  PortableServer::POAManager::deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, 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_call (env, &PortableServer_POAManager_deactivate_calldata, 0, &etherealize_objects, &wait_for_completion);
-  return; // no value
-
-}
-
 CORBA::Boolean PortableServer::POAManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
@@ -1279,9 +1183,9 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
     return PortableServer::AdapterActivator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
   {
-    PortableServer::AdapterActivator_ptr
-    new_obj = new PortableServer::AdapterActivator (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
+    // This can only be colocated
+    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));    
+    return PortableServer::AdapterActivator::_nil ();
   } // end of if
 
   STUB_Object *stub = obj->_servant ()->_create_stub (env);
@@ -1309,33 +1213,6 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_bind (co
   return PortableServer::AdapterActivator::_narrow (objref, env);
 }
 
-static const TAO_Param_Data PortableServer_AdapterActivator_unknown_adapter_paramdata [] =
-{
-  {CORBA::_tc_boolean, PARAM_RETURN, 0},
-  {PortableServer::_tc_POA, PARAM_IN, 0},
-  {CORBA::_tc_string, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_AdapterActivator_unknown_adapter_calldata =
-{"unknown_adapter", 1, 3, PortableServer_AdapterActivator_unknown_adapter_paramdata, 0, 0};
-
-CORBA::Boolean  PortableServer::AdapterActivator::unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA::Environment &env)
-{
-  CORBA::Boolean retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return retval;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  CORBA::Object_ptr _tao_base_parent = parent; // cast it
-  istub->do_call (env, &PortableServer_AdapterActivator_unknown_adapter_calldata, &retval, &_tao_base_parent, &name);
-  return retval;
-
-}
-
 CORBA::Boolean PortableServer::AdapterActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
@@ -1374,9 +1251,9 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
     return PortableServer::ServantManager::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
   {
-    PortableServer::ServantManager_ptr
-    new_obj = new PortableServer::ServantManager (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
+    // This can only be colocated
+    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));    
+    return PortableServer::ServantManager::_nil ();
   } // end of if
 
   STUB_Object *stub = obj->_servant ()->_create_stub (env);
@@ -1442,9 +1319,9 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
     return PortableServer::ServantActivator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
   {
-    PortableServer::ServantActivator_ptr
-    new_obj = new PortableServer::ServantActivator (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
+    // This can only be colocated
+    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));    
+    return PortableServer::ServantActivator::_nil ();
   } // end of if
 
   STUB_Object *stub = obj->_servant ()->_create_stub (env);
@@ -1472,20 +1349,6 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_bind (co
   return PortableServer::ServantActivator::_narrow (objref, env);
 }
 
-PortableServer::Servant PortableServer::ServantActivator::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return 0;
-
-}
-
-void  PortableServer::ServantActivator::etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return;
-
-}
-
 CORBA::Boolean PortableServer::ServantActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
@@ -1525,9 +1388,9 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
     return PortableServer::ServantLocator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
   {
-    PortableServer::ServantLocator_ptr
-    new_obj = new PortableServer::ServantLocator (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
+    // This can only be colocated
+    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));    
+    return PortableServer::ServantLocator::_nil ();
   } // end of if
 
   STUB_Object *stub = obj->_servant ()->_create_stub (env);
@@ -1555,20 +1418,6 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_bind (const
   return PortableServer::ServantLocator::_narrow (objref, env);
 }
 
-PortableServer::Servant PortableServer::ServantLocator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie & the_cookie, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return 0;
-
-}
-
-void  PortableServer::ServantLocator::postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return;
-
-}
-
 CORBA::Boolean PortableServer::ServantLocator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
@@ -1608,9 +1457,9 @@ PortableServer::POA_ptr PortableServer::POA::_narrow (
     return PortableServer::POA::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
   {
-    PortableServer::POA_ptr
-    new_obj = new PortableServer::POA (obj->_get_parent ()); // construct obj ref using the stub object
-    return new_obj;
+    // This can only be colocated
+    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));    
+    return PortableServer::POA::_nil ();
   } // end of if
 
   STUB_Object *stub = obj->_servant ()->_create_stub (env);
@@ -2024,606 +1873,6 @@ static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] =
 static CORBA::TypeCode _tc__tc_PortableServer_POA_WrongPolicy (CORBA::tk_struct, sizeof (_oc_PortableServer_POA_WrongPolicy), (unsigned char *) &_oc_PortableServer_POA_WrongPolicy, CORBA::B_FALSE);
 CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy = &_tc__tc_PortableServer_POA_WrongPolicy;
 
-static const TAO_Param_Data PortableServer_POA_create_POA_paramdata [] =
-{
-  {PortableServer::_tc_POA, PARAM_RETURN, 0},
-  {CORBA::_tc_string, PARAM_IN, 0},
-  {PortableServer::_tc_POAManager, PARAM_IN, 0},
-  {PortableServer::_tc_PolicyList, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_create_POA_calldata =
-{"create_POA", 1, 4, PortableServer_POA_create_POA_paramdata, 0, 0};
-
-PortableServer::POA_ptr  PortableServer::POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const PortableServer::PolicyList &policies, 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::POA::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  CORBA::Object_ptr _tao_base_a_POAManager = a_POAManager; // cast it
-  istub->do_call (env, &PortableServer_POA_create_POA_calldata, &retval, &adapter_name, &_tao_base_a_POAManager, &policies);
-  return PortableServer::POA::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_POA_find_POA_paramdata [] =
-{
-  {PortableServer::_tc_POA, PARAM_RETURN, 0},
-  {CORBA::_tc_string, PARAM_IN, 0},
-  {CORBA::_tc_boolean, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_find_POA_calldata =
-{"find_POA", 1, 3, PortableServer_POA_find_POA_paramdata, 0, 0};
-
-PortableServer::POA_ptr  PortableServer::POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it, 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::POA::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_find_POA_calldata, &retval, &adapter_name, &activate_it);
-  return PortableServer::POA::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_POA_destroy_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {CORBA::_tc_boolean, PARAM_IN, 0},
-  {CORBA::_tc_boolean, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_destroy_calldata =
-{"destroy", 1, 3, PortableServer_POA_destroy_paramdata, 0, 0};
-
-void  PortableServer::POA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, 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_call (env, &PortableServer_POA_destroy_calldata, 0, &etherealize_objects, &wait_for_completion);
-  return; // no value
-
-}
-
-static const TAO_Param_Data PortableServer_POA_create_thread_policy_paramdata [] =
-{
-  {PortableServer::_tc_ThreadPolicy, PARAM_RETURN, 0},
-  {PortableServer::_tc_ThreadPolicyValue, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_create_thread_policy_calldata =
-{"create_thread_policy", 1, 2, PortableServer_POA_create_thread_policy_paramdata, 0, 0};
-
-PortableServer::ThreadPolicy_ptr  PortableServer::POA::create_thread_policy (PortableServer::ThreadPolicyValue value, 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::ThreadPolicy::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_create_thread_policy_calldata, &retval, &value);
-  return PortableServer::ThreadPolicy::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_POA_create_lifespan_policy_paramdata [] =
-{
-  {PortableServer::_tc_LifespanPolicy, PARAM_RETURN, 0},
-  {PortableServer::_tc_LifespanPolicyValue, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_create_lifespan_policy_calldata =
-{"create_lifespan_policy", 1, 2, PortableServer_POA_create_lifespan_policy_paramdata, 0, 0};
-
-PortableServer::LifespanPolicy_ptr  PortableServer::POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value, 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::LifespanPolicy::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_create_lifespan_policy_calldata, &retval, &value);
-  return PortableServer::LifespanPolicy::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_POA_create_id_uniqueness_policy_paramdata [] =
-{
-  {PortableServer::_tc_IdUniquenessPolicy, PARAM_RETURN, 0},
-  {PortableServer::_tc_IdUniquenessPolicyValue, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_create_id_uniqueness_policy_calldata =
-{"create_id_uniqueness_policy", 1, 2, PortableServer_POA_create_id_uniqueness_policy_paramdata, 0, 0};
-
-PortableServer::IdUniquenessPolicy_ptr  PortableServer::POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, 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::IdUniquenessPolicy::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_create_id_uniqueness_policy_calldata, &retval, &value);
-  return PortableServer::IdUniquenessPolicy::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_POA_create_id_assignment_policy_paramdata [] =
-{
-  {PortableServer::_tc_IdAssignmentPolicy, PARAM_RETURN, 0},
-  {PortableServer::_tc_IdAssignmentPolicyValue, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_create_id_assignment_policy_calldata =
-{"create_id_assignment_policy", 1, 2, PortableServer_POA_create_id_assignment_policy_paramdata, 0, 0};
-
-PortableServer::IdAssignmentPolicy_ptr  PortableServer::POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, 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::IdAssignmentPolicy::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_create_id_assignment_policy_calldata, &retval, &value);
-  return PortableServer::IdAssignmentPolicy::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_POA_create_implicit_activation_policy_paramdata [] =
-{
-  {PortableServer::_tc_ImplicitActivationPolicy, PARAM_RETURN, 0},
-  {PortableServer::_tc_ImplicitActivationPolicyValue, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_create_implicit_activation_policy_calldata =
-{"create_implicit_activation_policy", 1, 2, PortableServer_POA_create_implicit_activation_policy_paramdata, 0, 0};
-
-PortableServer::ImplicitActivationPolicy_ptr  PortableServer::POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, 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::ImplicitActivationPolicy::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_create_implicit_activation_policy_calldata, &retval, &value);
-  return PortableServer::ImplicitActivationPolicy::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_POA_create_servant_retention_policy_paramdata [] =
-{
-  {PortableServer::_tc_ServantRetentionPolicy, PARAM_RETURN, 0},
-  {PortableServer::_tc_ServantRetentionPolicyValue, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_create_servant_retention_policy_calldata =
-{"create_servant_retention_policy", 1, 2, PortableServer_POA_create_servant_retention_policy_paramdata, 0, 0};
-
-PortableServer::ServantRetentionPolicy_ptr  PortableServer::POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, 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::ServantRetentionPolicy::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_create_servant_retention_policy_calldata, &retval, &value);
-  return PortableServer::ServantRetentionPolicy::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_POA_create_request_processing_policy_paramdata [] =
-{
-  {PortableServer::_tc_RequestProcessingPolicy, PARAM_RETURN, 0},
-  {PortableServer::_tc_RequestProcessingPolicyValue, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_create_request_processing_policy_calldata =
-{"create_request_processing_policy", 1, 2, PortableServer_POA_create_request_processing_policy_paramdata, 0, 0};
-
-PortableServer::RequestProcessingPolicy_ptr  PortableServer::POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, 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::RequestProcessingPolicy::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_create_request_processing_policy_calldata, &retval, &value);
-  return PortableServer::RequestProcessingPolicy::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data _get_PortableServer_POA_the_name_paramdata [] =
-{
-  {CORBA::_tc_string, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_POA_the_name_calldata =
-{"_get_the_name", 1, 1, _get_PortableServer_POA_the_name_paramdata, 0, 0};
-
-char * PortableServer::POA::the_name(CORBA::Environment &env)
-{
-  char *retval = 0;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return 0;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &_get_PortableServer_POA_the_name_calldata, &retval);
-  return retval;
-
-}
-
-static const TAO_Param_Data _get_PortableServer_POA_the_parent_paramdata [] =
-{
-  {PortableServer::_tc_POA, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_POA_the_parent_calldata =
-{"_get_the_parent", 1, 1, _get_PortableServer_POA_the_parent_paramdata, 0, 0};
-
-PortableServer::POA_ptr  PortableServer::POA::the_parent(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::POA::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &_get_PortableServer_POA_the_parent_calldata, &retval);
-  return PortableServer::POA::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data _get_PortableServer_POA_the_POAManager_paramdata [] =
-{
-  {PortableServer::_tc_POAManager, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_POA_the_POAManager_calldata =
-{"_get_the_POAManager", 1, 1, _get_PortableServer_POA_the_POAManager_paramdata, 0, 0};
-
-PortableServer::POAManager_ptr  PortableServer::POA::the_POAManager(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::POAManager::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &_get_PortableServer_POA_the_POAManager_calldata, &retval);
-  return PortableServer::POAManager::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data _get_PortableServer_POA_the_activator_paramdata [] =
-{
-  {PortableServer::_tc_AdapterActivator, PARAM_RETURN, 0}};
-
-static const TAO_Call_Data _get_PortableServer_POA_the_activator_calldata =
-{"_get_the_activator", 1, 1, _get_PortableServer_POA_the_activator_paramdata, 0, 0};
-
-PortableServer::AdapterActivator_ptr  PortableServer::POA::the_activator(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::AdapterActivator::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &_get_PortableServer_POA_the_activator_calldata, &retval);
-  return PortableServer::AdapterActivator::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data _set_PortableServer_POA_the_activator_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {PortableServer::_tc_AdapterActivator, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data _set_PortableServer_POA_the_activator_calldata =
-{"_set_the_activator", 1, 2, _set_PortableServer_POA_the_activator_paramdata, 0, 0};
-
-void PortableServer::POA::the_activator(PortableServer::AdapterActivator_ptr the_activator, 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
-  CORBA::Object_ptr _tao_base_the_activator = the_activator; // cast it
-  istub->do_call (env, &_set_PortableServer_POA_the_activator_calldata, 0, &_tao_base_the_activator);
-
-}
-
-static const TAO_Param_Data PortableServer_POA_get_servant_manager_paramdata [] =
-{
-  {PortableServer::_tc_ServantManager, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_get_servant_manager_calldata =
-{"get_servant_manager", 1, 1, PortableServer_POA_get_servant_manager_paramdata, 0, 0};
-
-PortableServer::ServantManager_ptr  PortableServer::POA::get_servant_manager (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::ServantManager::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_get_servant_manager_calldata, &retval);
-  return PortableServer::ServantManager::_narrow (retval, env);
-
-}
-
-static const TAO_Param_Data PortableServer_POA_set_servant_manager_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {PortableServer::_tc_ServantManager, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_set_servant_manager_calldata =
-{"set_servant_manager", 1, 2, PortableServer_POA_set_servant_manager_paramdata, 0, 0};
-
-void  PortableServer::POA::set_servant_manager (PortableServer::ServantManager_ptr imgr, 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
-  CORBA::Object_ptr _tao_base_imgr = imgr; // cast it
-  istub->do_call (env, &PortableServer_POA_set_servant_manager_calldata, 0, &_tao_base_imgr);
-  return; // no value
-
-}
-
-PortableServer::Servant PortableServer::POA::get_servant (CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return 0;
-
-}
-
-void  PortableServer::POA::set_servant (PortableServer::Servant p_servant, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return;
-
-}
-
-PortableServer::ObjectId * PortableServer::POA::activate_object (PortableServer::Servant p_servant, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return 0;
-
-}
-
-void  PortableServer::POA::activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return;
-
-}
-
-static const TAO_Param_Data PortableServer_POA_deactivate_object_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {PortableServer::_tc_ObjectId, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_deactivate_object_calldata =
-{"deactivate_object", 1, 2, PortableServer_POA_deactivate_object_paramdata, 0, 0};
-
-void  PortableServer::POA::deactivate_object (const PortableServer::ObjectId &oid, 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_call (env, &PortableServer_POA_deactivate_object_calldata, 0, &oid);
-  return; // no value
-
-}
-
-static const TAO_Param_Data PortableServer_POA_create_reference_paramdata [] =
-{
-  {CORBA::_tc_Object, PARAM_RETURN, 0},
-  {PortableServer::_tc_RepositoryId, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_create_reference_calldata =
-{"create_reference", 1, 2, PortableServer_POA_create_reference_paramdata, 0, 0};
-
-CORBA::Object_ptr  PortableServer::POA::create_reference (const char *intf, CORBA::Environment &env)
-{
-  CORBA::Object_ptr retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return 0;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_create_reference_calldata, &retval, &intf);
-  return retval;
-
-}
-
-static const TAO_Param_Data PortableServer_POA_create_reference_with_id_paramdata [] =
-{
-  {CORBA::_tc_Object, PARAM_RETURN, 0},
-  {PortableServer::_tc_ObjectId, PARAM_IN, 0},
-  {PortableServer::_tc_RepositoryId, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_create_reference_with_id_calldata =
-{"create_reference_with_id", 1, 3, PortableServer_POA_create_reference_with_id_paramdata, 0, 0};
-
-CORBA::Object_ptr  PortableServer::POA::create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, CORBA::Environment &env)
-{
-  CORBA::Object_ptr retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return 0;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_create_reference_with_id_calldata, &retval, &oid, &intf);
-  return retval;
-
-}
-
-PortableServer::ObjectId * PortableServer::POA::servant_to_id (PortableServer::Servant p_servant, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return 0;
-
-}
-
-CORBA::Object_ptr  PortableServer::POA::servant_to_reference (PortableServer::Servant p_servant, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return 0;
-
-}
-
-PortableServer::Servant PortableServer::POA::reference_to_servant (CORBA::Object_ptr reference, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return 0;
-
-}
-
-static const TAO_Param_Data PortableServer_POA_reference_to_id_paramdata [] =
-{
-  {PortableServer::_tc_ObjectId, PARAM_RETURN, sizeof (PortableServer::ObjectId)},
-  {CORBA::_tc_Object, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_reference_to_id_calldata =
-{"reference_to_id", 1, 2, PortableServer_POA_reference_to_id_paramdata, 0, 0};
-
-PortableServer::ObjectId * PortableServer::POA::reference_to_id (CORBA::Object_ptr reference, CORBA::Environment &env)
-{
-  PortableServer::ObjectId *retval = 0;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return 0;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_reference_to_id_calldata, &retval, &reference);
-  return retval;
-
-}
-
-PortableServer::Servant PortableServer::POA::id_to_servant (const PortableServer::ObjectId &oid, CORBA::Environment &env)
-{
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  return 0;
-
-}
-
-static const TAO_Param_Data PortableServer_POA_id_to_reference_paramdata [] =
-{
-  {CORBA::_tc_Object, PARAM_RETURN, 0},
-  {PortableServer::_tc_ObjectId, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data PortableServer_POA_id_to_reference_calldata =
-{"id_to_reference", 1, 2, PortableServer_POA_id_to_reference_paramdata, 0, 0};
-
-CORBA::Object_ptr  PortableServer::POA::id_to_reference (const PortableServer::ObjectId &oid, CORBA::Environment &env)
-{
-  CORBA::Object_ptr retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return 0;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_POA_id_to_reference_calldata, &retval, &oid);
-  return retval;
-
-}
-
 CORBA::Boolean PortableServer::POA::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
@@ -2726,28 +1975,10 @@ static const CORBA::Long _oc_PortableServer_Current_NoContext[] =
 static CORBA::TypeCode _tc__tc_PortableServer_Current_NoContext (CORBA::tk_struct, sizeof (_oc_PortableServer_Current_NoContext), (unsigned char *) &_oc_PortableServer_Current_NoContext, CORBA::B_FALSE);
 CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = &_tc__tc_PortableServer_Current_NoContext;
 
-static const TAO_Param_Data PortableServer_Current_get_POA_paramdata [] =
-{
-  {PortableServer::_tc_POA, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data PortableServer_Current_get_POA_calldata =
-{"get_POA", 1, 1, PortableServer_Current_get_POA_paramdata, 0, 0};
-
 PortableServer::POA_ptr  PortableServer::Current::get_POA (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::POA::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &PortableServer_Current_get_POA_calldata, &retval);
-  return PortableServer::POA::_narrow (retval, env);
-
+  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+  return PortableServer::POA::_nil ();
 }
 
 static const TAO_Param_Data PortableServer_Current_get_object_id_paramdata [] =
diff --git a/TAO/tao/poaC.h b/TAO/tao/poaC.h
index 1281a967ca0..de487fb6043 100644
--- a/TAO/tao/poaC.h
+++ b/TAO/tao/poaC.h
@@ -1348,10 +1348,10 @@ class POAManager;
 
 #endif // end #if !defined
 
-    virtual void  activate (CORBA::Environment &env);
-    virtual void  hold_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env);
-    virtual void  discard_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env);
-    virtual void  deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env);
+    virtual void  activate (CORBA::Environment &env) = 0;
+    virtual void  hold_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0;
+    virtual void  discard_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0;
+    virtual void  deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0;
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
   protected:
     POAManager (
@@ -1449,7 +1449,7 @@ class AdapterActivator;
     static AdapterActivator_ptr _nil (void);
     static AdapterActivator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
 
-    virtual CORBA::Boolean  unknown_adapter (POA_ptr parent, const char *name, CORBA::Environment &env);
+    virtual CORBA::Boolean  unknown_adapter (POA_ptr parent, const char *name, CORBA::Environment &env) = 0;
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
   protected:
     AdapterActivator (
@@ -1644,8 +1644,8 @@ class ServantActivator;
     static ServantActivator_ptr _nil (void);
     static ServantActivator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
 
-    virtual Servant  incarnate (const ObjectId &oid, POA_ptr adapter, CORBA::Environment &env);
-    virtual void  etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA::Environment &env);
+    virtual Servant  incarnate (const ObjectId &oid, POA_ptr adapter, CORBA::Environment &env) = 0;
+    virtual void  etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA::Environment &env) = 0;
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
   protected:
     ServantActivator (
@@ -1746,8 +1746,8 @@ class ServantLocator;
     static ServantLocator_ptr _nil (void);
     static ServantLocator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
 
-    virtual Servant  preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA::Environment &env);
-    virtual void  postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA::Environment &env);
+    virtual Servant  preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA::Environment &env) = 0;
+    virtual void  postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA::Environment &env) = 0;
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
   protected:
     ServantLocator (
@@ -2144,36 +2144,36 @@ 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);
-    virtual POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA::Environment &env);
-    virtual void  destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env);
-    virtual ThreadPolicy_ptr  create_thread_policy (ThreadPolicyValue value, CORBA::Environment &env);
-    virtual LifespanPolicy_ptr  create_lifespan_policy (LifespanPolicyValue value, CORBA::Environment &env);
-    virtual IdUniquenessPolicy_ptr  create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA::Environment &env);
-    virtual IdAssignmentPolicy_ptr  create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA::Environment &env);
-    virtual ImplicitActivationPolicy_ptr  create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA::Environment &env);
-    virtual ServantRetentionPolicy_ptr  create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA::Environment &env);
-    virtual RequestProcessingPolicy_ptr  create_request_processing_policy (RequestProcessingPolicyValue value, CORBA::Environment &env);
-    virtual char * the_name (CORBA::Environment &env);
-    virtual POA_ptr  the_parent (CORBA::Environment &env);
-    virtual POAManager_ptr  the_POAManager (CORBA::Environment &env);
-    virtual AdapterActivator_ptr  the_activator (CORBA::Environment &env);
-    virtual void the_activator(AdapterActivator_ptr the_activator, CORBA::Environment &env);
-    virtual ServantManager_ptr  get_servant_manager (CORBA::Environment &env);
-    virtual void  set_servant_manager (ServantManager_ptr imgr, CORBA::Environment &env);
-    virtual Servant  get_servant (CORBA::Environment &env);
-    virtual void  set_servant (Servant p_servant, CORBA::Environment &env);
-    virtual ObjectId * activate_object (Servant p_servant, CORBA::Environment &env);
-    virtual void  activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA::Environment &env);
-    virtual void  deactivate_object (const ObjectId &oid, CORBA::Environment &env);
-    virtual CORBA::Object_ptr  create_reference (const char *intf, CORBA::Environment &env);
-    virtual CORBA::Object_ptr  create_reference_with_id (const ObjectId &oid, const char *intf, CORBA::Environment &env);
-    virtual ObjectId * servant_to_id (Servant p_servant, CORBA::Environment &env);
-    virtual CORBA::Object_ptr  servant_to_reference (Servant p_servant, CORBA::Environment &env);
-    virtual Servant  reference_to_servant (CORBA::Object_ptr reference, CORBA::Environment &env);
-    virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA::Environment &env);
-    virtual Servant  id_to_servant (const ObjectId &oid, CORBA::Environment &env);
-    virtual CORBA::Object_ptr  id_to_reference (const ObjectId &oid, CORBA::Environment &env);
+    virtual POA_ptr  create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const 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;
+    virtual LifespanPolicy_ptr  create_lifespan_policy (LifespanPolicyValue value, CORBA::Environment &env) = 0;
+    virtual IdUniquenessPolicy_ptr  create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA::Environment &env) = 0;
+    virtual IdAssignmentPolicy_ptr  create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA::Environment &env) = 0;
+    virtual ImplicitActivationPolicy_ptr  create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA::Environment &env) = 0;
+    virtual ServantRetentionPolicy_ptr  create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA::Environment &env) = 0;
+    virtual RequestProcessingPolicy_ptr  create_request_processing_policy (RequestProcessingPolicyValue value, CORBA::Environment &env) = 0;
+    virtual char * the_name (CORBA::Environment &env) = 0;
+    virtual POA_ptr  the_parent (CORBA::Environment &env) = 0;
+    virtual POAManager_ptr  the_POAManager (CORBA::Environment &env) = 0;
+    virtual AdapterActivator_ptr  the_activator (CORBA::Environment &env) = 0;
+    virtual void the_activator(AdapterActivator_ptr the_activator, CORBA::Environment &env) = 0;
+    virtual ServantManager_ptr  get_servant_manager (CORBA::Environment &env) = 0;
+    virtual void  set_servant_manager (ServantManager_ptr imgr, CORBA::Environment &env) = 0;
+    virtual Servant  get_servant (CORBA::Environment &env) = 0;
+    virtual void  set_servant (Servant p_servant, CORBA::Environment &env) = 0;
+    virtual ObjectId * activate_object (Servant p_servant, CORBA::Environment &env) = 0;
+    virtual void  activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA::Environment &env) = 0;
+    virtual void  deactivate_object (const ObjectId &oid, CORBA::Environment &env) = 0;
+    virtual CORBA::Object_ptr  create_reference (const char *intf, CORBA::Environment &env) = 0;
+    virtual CORBA::Object_ptr  create_reference_with_id (const ObjectId &oid, const char *intf, CORBA::Environment &env) = 0;
+    virtual ObjectId * servant_to_id (Servant p_servant, CORBA::Environment &env) = 0;
+    virtual CORBA::Object_ptr  servant_to_reference (Servant p_servant, CORBA::Environment &env) = 0;
+    virtual Servant  reference_to_servant (CORBA::Object_ptr reference, CORBA::Environment &env) = 0;
+    virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA::Environment &env) = 0;
+    virtual Servant  id_to_servant (const ObjectId &oid, CORBA::Environment &env) = 0;
+    virtual CORBA::Object_ptr  id_to_reference (const ObjectId &oid, CORBA::Environment &env) = 0;
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env);
   protected:
     POA (
diff --git a/TAO/tao/poaS.cpp b/TAO/tao/poaS.cpp
index 408fe1a407e..47c7d9c463d 100644
--- a/TAO/tao/poaS.cpp
+++ b/TAO/tao/poaS.cpp
@@ -1412,87 +1412,16 @@ POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &_env)
 }
 
 static const TAO_operation_db_entry PortableServer_POAManager_operations [] = {
-  {"activate", &POA_PortableServer::POAManager::activate_skel},
-  {"hold_requests", &POA_PortableServer::POAManager::hold_requests_skel},
-  {"discard_requests", &POA_PortableServer::POAManager::discard_requests_skel},
-  {"deactivate", &POA_PortableServer::POAManager::deactivate_skel},
   {"_is_a", &POA_PortableServer::POAManager::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_POAManager_optable (PortableServer_POAManager_operations, 5, 10);
+TAO_Dynamic_Hash_OpTable tao_PortableServer_POAManager_optable (PortableServer_POAManager_operations, 1, 2);
 // skeleton constructor
 POA_PortableServer::POAManager::POAManager (void)
 {
   this->optable_ = &tao_PortableServer_POAManager_optable;
 }
 
-void POA_PortableServer::POAManager::activate_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POAManager_ptr 	 impl = (POA_PortableServer::POAManager_ptr) _tao_object_reference;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  impl->activate(_tao_environment);
-  
-}
-
-void POA_PortableServer::POAManager::hold_requests_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POAManager_ptr 	 impl = (POA_PortableServer::POAManager_ptr) _tao_object_reference;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  CORBA::Boolean wait_for_completion;
-  (void) nvlist->add_item ("wait_for_completion", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_boolean, &wait_for_completion, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  impl->hold_requests(wait_for_completion, _tao_environment);
-  
-}
-
-void POA_PortableServer::POAManager::discard_requests_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POAManager_ptr 	 impl = (POA_PortableServer::POAManager_ptr) _tao_object_reference;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  CORBA::Boolean wait_for_completion;
-  (void) nvlist->add_item ("wait_for_completion", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_boolean, &wait_for_completion, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  impl->discard_requests(wait_for_completion, _tao_environment);
-  
-}
-
-void POA_PortableServer::POAManager::deactivate_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POAManager_ptr 	 impl = (POA_PortableServer::POAManager_ptr) _tao_object_reference;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (2, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  CORBA::Boolean etherealize_objects;
-  (void) nvlist->add_item ("etherealize_objects", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_boolean, &etherealize_objects, 0, _tao_environment); // ORB does not own
-  CORBA::Boolean wait_for_completion;
-  (void) nvlist->add_item ("wait_for_completion", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_boolean, &wait_for_completion, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  impl->deactivate(etherealize_objects, wait_for_completion, _tao_environment);
-  
-}
-
 void POA_PortableServer::POAManager::_is_a_skel (
     CORBA::ServerRequest &req, 
     void * _tao_object_reference,
@@ -1643,46 +1572,16 @@ POA_PortableServer::POAManager::_this (CORBA_Environment &_env)
 }
 
 static const TAO_operation_db_entry PortableServer_AdapterActivator_operations [] = {
-  {"unknown_adapter", &POA_PortableServer::AdapterActivator::unknown_adapter_skel},
   {"_is_a", &POA_PortableServer::AdapterActivator::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_AdapterActivator_optable (PortableServer_AdapterActivator_operations, 2, 4);
+TAO_Dynamic_Hash_OpTable tao_PortableServer_AdapterActivator_optable (PortableServer_AdapterActivator_operations, 1, 2);
 // skeleton constructor
 POA_PortableServer::AdapterActivator::AdapterActivator (void)
 {
   this->optable_ = &tao_PortableServer_AdapterActivator_optable;
 }
 
-void POA_PortableServer::AdapterActivator::unknown_adapter_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::AdapterActivator_ptr 	 impl = (POA_PortableServer::AdapterActivator_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Boolean *retval = new CORBA::Boolean;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (2, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::POA_ptr parent;
-  CORBA::Object_ptr _tao_base_parent;
-  (void) nvlist->add_item ("parent", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_POA, &_tao_base_parent, 0, _tao_environment); // ORB does not own
-  char *name;
-  (void) nvlist->add_item ("name", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_string, &name, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  parent = PortableServer::POA::_narrow (_tao_base_parent, _tao_environment);
-  if (_tao_environment.exception ()) return;
-   *retval = impl->unknown_adapter(parent, name, _tao_environment);
-  CORBA::release (parent);
-  CORBA::release (_tao_base_parent);
-  CORBA::string_free (name);
-  result = new CORBA::Any (CORBA::_tc_boolean, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
 void POA_PortableServer::AdapterActivator::_is_a_skel (
     CORBA::ServerRequest &req, 
     void * _tao_object_reference,
@@ -1918,30 +1817,16 @@ POA_PortableServer::ServantManager::_this (CORBA_Environment &_env)
 }
 
 static const TAO_operation_db_entry PortableServer_ServantActivator_operations [] = {
-  {"incarnate", &POA_PortableServer::ServantActivator::incarnate_skel},
-  {"etherealize", &POA_PortableServer::ServantActivator::etherealize_skel},
   {"_is_a", &POA_PortableServer::ServantActivator::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantActivator_optable (PortableServer_ServantActivator_operations, 3, 6);
+TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantActivator_optable (PortableServer_ServantActivator_operations, 1, 2);
 // skeleton constructor
 POA_PortableServer::ServantActivator::ServantActivator (void)
 {
   this->optable_ = &tao_PortableServer_ServantActivator_optable;
 }
 
-void POA_PortableServer::ServantActivator::incarnate_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
-void POA_PortableServer::ServantActivator::etherealize_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
 void POA_PortableServer::ServantActivator::_is_a_skel (
     CORBA::ServerRequest &req, 
     void * _tao_object_reference,
@@ -2084,30 +1969,16 @@ POA_PortableServer::ServantActivator::_this (CORBA_Environment &_env)
 }
 
 static const TAO_operation_db_entry PortableServer_ServantLocator_operations [] = {
-  {"preinvoke", &POA_PortableServer::ServantLocator::preinvoke_skel},
-  {"postinvoke", &POA_PortableServer::ServantLocator::postinvoke_skel},
   {"_is_a", &POA_PortableServer::ServantLocator::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantLocator_optable (PortableServer_ServantLocator_operations, 3, 6);
+TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantLocator_optable (PortableServer_ServantLocator_operations, 1, 2);
 // skeleton constructor
 POA_PortableServer::ServantLocator::ServantLocator (void)
 {
   this->optable_ = &tao_PortableServer_ServantLocator_optable;
 }
 
-void POA_PortableServer::ServantLocator::preinvoke_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
-void POA_PortableServer::ServantLocator::postinvoke_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
 void POA_PortableServer::ServantLocator::_is_a_skel (
     CORBA::ServerRequest &req, 
     void * _tao_object_reference,
@@ -2254,538 +2125,16 @@ POA_PortableServer::ServantLocator::_this (CORBA_Environment &_env)
 }
 
 static const TAO_operation_db_entry PortableServer_POA_operations [] = {
-  {"create_POA", &POA_PortableServer::POA::create_POA_skel},
-  {"find_POA", &POA_PortableServer::POA::find_POA_skel},
-  {"destroy", &POA_PortableServer::POA::destroy_skel},
-  {"create_thread_policy", &POA_PortableServer::POA::create_thread_policy_skel},
-  {"create_lifespan_policy", &POA_PortableServer::POA::create_lifespan_policy_skel},
-  {"create_id_uniqueness_policy", &POA_PortableServer::POA::create_id_uniqueness_policy_skel},
-  {"create_id_assignment_policy", &POA_PortableServer::POA::create_id_assignment_policy_skel},
-  {"create_implicit_activation_policy", &POA_PortableServer::POA::create_implicit_activation_policy_skel},
-  {"create_servant_retention_policy", &POA_PortableServer::POA::create_servant_retention_policy_skel},
-  {"create_request_processing_policy", &POA_PortableServer::POA::create_request_processing_policy_skel},
-  {"_get_the_name", &POA_PortableServer::POA::_get_the_name_skel},
-  {"_get_the_parent", &POA_PortableServer::POA::_get_the_parent_skel},
-  {"_get_the_POAManager", &POA_PortableServer::POA::_get_the_POAManager_skel},
-  {"_get_the_activator", &POA_PortableServer::POA::_get_the_activator_skel},
-  {"_set_the_activator", &POA_PortableServer::POA::_set_the_activator_skel},
-  {"get_servant_manager", &POA_PortableServer::POA::get_servant_manager_skel},
-  {"set_servant_manager", &POA_PortableServer::POA::set_servant_manager_skel},
-  {"get_servant", &POA_PortableServer::POA::get_servant_skel},
-  {"set_servant", &POA_PortableServer::POA::set_servant_skel},
-  {"activate_object", &POA_PortableServer::POA::activate_object_skel},
-  {"activate_object_with_id", &POA_PortableServer::POA::activate_object_with_id_skel},
-  {"deactivate_object", &POA_PortableServer::POA::deactivate_object_skel},
-  {"create_reference", &POA_PortableServer::POA::create_reference_skel},
-  {"create_reference_with_id", &POA_PortableServer::POA::create_reference_with_id_skel},
-  {"servant_to_id", &POA_PortableServer::POA::servant_to_id_skel},
-  {"servant_to_reference", &POA_PortableServer::POA::servant_to_reference_skel},
-  {"reference_to_servant", &POA_PortableServer::POA::reference_to_servant_skel},
-  {"reference_to_id", &POA_PortableServer::POA::reference_to_id_skel},
-  {"id_to_servant", &POA_PortableServer::POA::id_to_servant_skel},
-  {"id_to_reference", &POA_PortableServer::POA::id_to_reference_skel},
   {"_is_a", &POA_PortableServer::POA::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_POA_optable (PortableServer_POA_operations, 31, 62);
+TAO_Dynamic_Hash_OpTable tao_PortableServer_POA_optable (PortableServer_POA_operations, 1, 2);
 // skeleton constructor
 POA_PortableServer::POA::POA (void)
 {
   this->optable_ = &tao_PortableServer_POA_optable;
 }
 
-void POA_PortableServer::POA::create_POA_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (3, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  char *adapter_name;
-  (void) nvlist->add_item ("adapter_name", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_string, &adapter_name, 0, _tao_environment); // ORB does not own
-  PortableServer::POAManager_ptr a_POAManager;
-  CORBA::Object_ptr _tao_base_a_POAManager;
-  (void) nvlist->add_item ("a_POAManager", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_POAManager, &_tao_base_a_POAManager, 0, _tao_environment); // ORB does not own
-  PortableServer::PolicyList policies;
-  (void) nvlist->add_item ("policies", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_PolicyList, &policies, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  a_POAManager = PortableServer::POAManager::_narrow (_tao_base_a_POAManager, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->create_POA(adapter_name, a_POAManager, policies, _tao_environment);
-  CORBA::string_free (adapter_name);
-  CORBA::release (a_POAManager);
-  CORBA::release (_tao_base_a_POAManager);
-  result = new CORBA::Any (PortableServer::_tc_POA, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::find_POA_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (2, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  char *adapter_name;
-  (void) nvlist->add_item ("adapter_name", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_string, &adapter_name, 0, _tao_environment); // ORB does not own
-  CORBA::Boolean activate_it;
-  (void) nvlist->add_item ("activate_it", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_boolean, &activate_it, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->find_POA(adapter_name, activate_it, _tao_environment);
-  CORBA::string_free (adapter_name);
-  result = new CORBA::Any (PortableServer::_tc_POA, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::destroy_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (2, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  CORBA::Boolean etherealize_objects;
-  (void) nvlist->add_item ("etherealize_objects", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_boolean, &etherealize_objects, 0, _tao_environment); // ORB does not own
-  CORBA::Boolean wait_for_completion;
-  (void) nvlist->add_item ("wait_for_completion", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_boolean, &wait_for_completion, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  impl->destroy(etherealize_objects, wait_for_completion, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::create_thread_policy_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::ThreadPolicyValue value;
-  (void) nvlist->add_item ("value", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_ThreadPolicyValue, &value, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->create_thread_policy(value, _tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_ThreadPolicy, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::create_lifespan_policy_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::LifespanPolicyValue value;
-  (void) nvlist->add_item ("value", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_LifespanPolicyValue, &value, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->create_lifespan_policy(value, _tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_LifespanPolicy, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::create_id_uniqueness_policy_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::IdUniquenessPolicyValue value;
-  (void) nvlist->add_item ("value", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_IdUniquenessPolicyValue, &value, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->create_id_uniqueness_policy(value, _tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_IdUniquenessPolicy, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::create_id_assignment_policy_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::IdAssignmentPolicyValue value;
-  (void) nvlist->add_item ("value", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_IdAssignmentPolicyValue, &value, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->create_id_assignment_policy(value, _tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_IdAssignmentPolicy, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::create_implicit_activation_policy_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::ImplicitActivationPolicyValue value;
-  (void) nvlist->add_item ("value", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_ImplicitActivationPolicyValue, &value, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->create_implicit_activation_policy(value, _tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_ImplicitActivationPolicy, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::create_servant_retention_policy_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::ServantRetentionPolicyValue value;
-  (void) nvlist->add_item ("value", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_ServantRetentionPolicyValue, &value, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->create_servant_retention_policy(value, _tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_ServantRetentionPolicy, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::create_request_processing_policy_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::RequestProcessingPolicyValue value;
-  (void) nvlist->add_item ("value", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_RequestProcessingPolicyValue, &value, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->create_request_processing_policy(value, _tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_RequestProcessingPolicy, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::_get_the_name_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment)
-{
-  POA_PortableServer::POA_ptr impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  char **retval = new char*;
-    // this method has no incoming parameters. Nothing to parse
-  *retval = impl->the_name(_tao_environment);
-  result = new CORBA::Any (CORBA::_tc_string, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-}
-
-void POA_PortableServer::POA::_get_the_parent_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment)
-{
-  POA_PortableServer::POA_ptr impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // this method has no incoming parameters. Nothing to parse
-  *retval = impl->the_parent(_tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_POA, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-}
-
-void POA_PortableServer::POA::_get_the_POAManager_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment)
-{
-  POA_PortableServer::POA_ptr impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // this method has no incoming parameters. Nothing to parse
-  *retval = impl->the_POAManager(_tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_POAManager, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-}
-
-void POA_PortableServer::POA::_get_the_activator_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment)
-{
-  POA_PortableServer::POA_ptr impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // this method has no incoming parameters. Nothing to parse
-  *retval = impl->the_activator(_tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_AdapterActivator, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-}
-
-void POA_PortableServer::POA::_set_the_activator_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr)_tao_object_reference;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  PortableServer::AdapterActivator_ptr the_activator;
-  CORBA::Object_ptr _tao_base_the_activator;
-  (void) nvlist->add_item ("the_activator", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_AdapterActivator, &_tao_base_the_activator, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  the_activator = PortableServer::AdapterActivator::_narrow (_tao_base_the_activator, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  impl->the_activator(the_activator, _tao_environment);
-  CORBA::release (the_activator);
-  CORBA::release (_tao_base_the_activator);
-  
-}
-
-void POA_PortableServer::POA::get_servant_manager_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  *retval = CORBA::Object::_nil ();
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->get_servant_manager(_tao_environment);
-  result = new CORBA::Any (PortableServer::_tc_ServantManager, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::set_servant_manager_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::ServantManager_ptr imgr;
-  CORBA::Object_ptr _tao_base_imgr;
-  (void) nvlist->add_item ("imgr", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_ServantManager, &_tao_base_imgr, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  imgr = PortableServer::ServantManager::_narrow (_tao_base_imgr, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  impl->set_servant_manager(imgr, _tao_environment);
-  CORBA::release (imgr);
-  CORBA::release (_tao_base_imgr);
-  
-}
-
-void POA_PortableServer::POA::get_servant_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
-void POA_PortableServer::POA::set_servant_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
-void POA_PortableServer::POA::activate_object_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
-void POA_PortableServer::POA::activate_object_with_id_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
-void POA_PortableServer::POA::deactivate_object_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::ObjectId oid;
-  (void) nvlist->add_item ("oid", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_ObjectId, &oid, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  impl->deactivate_object(oid, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::create_reference_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  char *intf;
-  (void) nvlist->add_item ("intf", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_RepositoryId, &intf, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->create_reference(intf, _tao_environment);
-  CORBA::string_free (intf);
-  result = new CORBA::Any (CORBA::_tc_Object, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::create_reference_with_id_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (2, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::ObjectId oid;
-  (void) nvlist->add_item ("oid", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_ObjectId, &oid, 0, _tao_environment); // ORB does not own
-  char *intf;
-  (void) nvlist->add_item ("intf", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_RepositoryId, &intf, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->create_reference_with_id(oid, intf, _tao_environment);
-  CORBA::string_free (intf);
-  result = new CORBA::Any (CORBA::_tc_Object, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::servant_to_id_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
-void POA_PortableServer::POA::servant_to_reference_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
-void POA_PortableServer::POA::reference_to_servant_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
-void POA_PortableServer::POA::reference_to_id_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  PortableServer::ObjectId *retval;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  CORBA::Object_ptr reference;
-  (void) nvlist->add_item ("reference", CORBA::ARG_IN, _tao_environment)->value ()->replace (CORBA::_tc_Object, &reference, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  retval = impl->reference_to_id(reference, _tao_environment);
-  CORBA::release (reference);
-  result = new CORBA::Any (PortableServer::_tc_ObjectId, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_PortableServer::POA::id_to_servant_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-}
-
-void POA_PortableServer::POA::id_to_reference_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment)
-{
-  ACE_UNUSED_ARG (context);
-  CORBA::NVList_ptr 	 nvlist;
-  POA_PortableServer::POA_ptr 	 impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-    // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (1, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  PortableServer::ObjectId oid;
-  (void) nvlist->add_item ("oid", CORBA::ARG_IN, _tao_environment)->value ()->replace (PortableServer::_tc_ObjectId, &oid, 0, _tao_environment); // ORB does not own
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  *retval = impl->id_to_reference(oid, _tao_environment);
-  result = new CORBA::Any (CORBA::_tc_Object, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
 void POA_PortableServer::POA::_is_a_skel (
     CORBA::ServerRequest &req, 
     void * _tao_object_reference,
diff --git a/TAO/tao/poaS.h b/TAO/tao/poaS.h
index 4079e9db311..b79af82576e 100644
--- a/TAO/tao/poaS.h
+++ b/TAO/tao/poaS.h
@@ -15,7 +15,7 @@ class POA_PortableServer
 public:
   class CurrentBase;
   typedef CurrentBase *CurrentBase_ptr;
-  class CurrentBase :  public virtual PortableServer::LocalServantBase
+  class CurrentBase :  public virtual PortableServer::ServantBase
   {
   protected:
     CurrentBase (void);
@@ -62,7 +62,7 @@ public:
 
   class Policy;
   typedef Policy *Policy_ptr;
-  class Policy :  public virtual PortableServer::LocalServantBase
+  class Policy :  public virtual PortableServer::ServantBase
   {
   protected:
     Policy (void);
@@ -582,16 +582,12 @@ public:
         const char* logical_type_id
       );
     virtual void activate ( CORBA::Environment &env) = 0; // pure virtual
-    static void activate_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void hold_requests (CORBA::Boolean wait_for_completion,  CORBA::Environment &env) = 0; // pure virtual
-    static void hold_requests_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void discard_requests (CORBA::Boolean wait_for_completion,  CORBA::Environment &env) = 0; // pure virtual
-    static void discard_requests_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA::Environment &env) = 0; // pure virtual
-    static void deactivate_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);
 
@@ -657,7 +653,6 @@ public:
         const char* logical_type_id
       );
     virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name,  CORBA::Environment &env) = 0; // pure virtual
-    static void unknown_adapter_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);
 
@@ -759,10 +754,8 @@ public:
         const char* logical_type_id
       );
     virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter,  CORBA::Environment &env) = 0; // pure virtual
-    static void incarnate_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations,  CORBA::Environment &env) = 0; // pure virtual
-    static void etherealize_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);
 
@@ -830,10 +823,8 @@ public:
                                                const char *operation, 
                                                PortableServer::ServantLocator::Cookie & the_cookie,  
                                                CORBA::Environment &env) = 0; // pure virtual
-    static void preinvoke_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant,  CORBA::Environment &env) = 0; // pure virtual
-    static void postinvoke_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);
 
@@ -899,94 +890,64 @@ public:
         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
-    static void create_POA_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it,  CORBA::Environment &env) = 0; // pure virtual
-    static void find_POA_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA::Environment &env) = 0; // pure virtual
-    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::ThreadPolicy_ptr  create_thread_policy (PortableServer::ThreadPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-    static void create_thread_policy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::LifespanPolicy_ptr  create_lifespan_policy (PortableServer::LifespanPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-    static void create_lifespan_policy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::IdUniquenessPolicy_ptr  create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-    static void create_id_uniqueness_policy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::IdAssignmentPolicy_ptr  create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-    static void create_id_assignment_policy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::ImplicitActivationPolicy_ptr  create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-    static void create_implicit_activation_policy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::ServantRetentionPolicy_ptr  create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-    static void create_servant_retention_policy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::RequestProcessingPolicy_ptr  create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,  CORBA::Environment &env) = 0; // pure virtual
-    static void create_request_processing_policy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual char * the_name (CORBA::Environment &env) = 0;
-    static void _get_the_name_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::POA_ptr  the_parent (CORBA::Environment &env) = 0;
-    static void _get_the_parent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::POAManager_ptr  the_POAManager (CORBA::Environment &env) = 0;
-    static void _get_the_POAManager_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::AdapterActivator_ptr  the_activator (CORBA::Environment &env) = 0;
-    static void _get_the_activator_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA::Environment &env) = 0;
-    static void _set_the_activator_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::ServantManager_ptr  get_servant_manager ( CORBA::Environment &env) = 0; // pure virtual
-    static void get_servant_manager_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr,  CORBA::Environment &env) = 0; // pure virtual
-    static void set_servant_manager_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::Servant get_servant ( CORBA::Environment &env) = 0; // pure virtual
-    static void get_servant_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void set_servant (PortableServer::Servant p_servant,  CORBA::Environment &env) = 0; // pure virtual
-    static void set_servant_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant,  CORBA::Environment &env) = 0; // pure virtual
-    static void activate_object_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant,  CORBA::Environment &env) = 0; // pure virtual
-    static void activate_object_with_id_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual void deactivate_object (const PortableServer::ObjectId &oid,  CORBA::Environment &env) = 0; // pure virtual
-    static void deactivate_object_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual CORBA::Object_ptr create_reference (const char *intf,  CORBA::Environment &env) = 0; // pure virtual
-    static void create_reference_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf,  CORBA::Environment &env) = 0; // pure virtual
-    static void create_reference_with_id_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant,  CORBA::Environment &env) = 0; // pure virtual
-    static void servant_to_id_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,  CORBA::Environment &env) = 0; // pure virtual
-    static void servant_to_reference_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,  CORBA::Environment &env) = 0; // pure virtual
-    static void reference_to_servant_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference,  CORBA::Environment &env) = 0; // pure virtual
-    static void reference_to_id_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,  CORBA::Environment &env) = 0; // pure virtual
-    static void id_to_servant_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env);
 
     virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,  CORBA::Environment &env) = 0; // pure virtual
-    static void id_to_reference_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);