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

14 files changed, 811 insertions, 1241 deletions

diff --git a/TAO/tao/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
new file mode 100644
index 00000000000..3c81a5f2fa3
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
@@ -0,0 +1,54 @@
+--- orig/AdapterActivatorC.h	2004-11-17 09:21:58.954374400 +0100
++++ AdapterActivatorC.h	2004-11-17 09:22:10.591107200 +0100
+@@ -73,6 +73,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_root/root_ch.cpp:63
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ namespace TAO
+ {
+   class Collocation_Proxy_Broker;
+@@ -227,6 +229,8 @@
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/AdapterActivatorC.cpp	2004-11-17 09:21:58.954374400 +0100
++++ AdapterActivatorC.cpp	2004-11-17 09:22:10.731308800 +0100
+@@ -45,6 +45,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -234,3 +236,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/AdapterActivatorA.cpp	2004-11-17 09:21:58.974403200 +0100
++++ AdapterActivatorA.cpp	2004-11-17 09:22:10.841467200 +0100
+@@ -32,6 +32,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
+ {
+     TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -154,3 +156,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ForwardRequest.diff b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
new file mode 100644
index 00000000000..03b758513c6
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
@@ -0,0 +1,54 @@
+--- orig/ForwardRequestC.h	2005-01-27 13:51:06.723408000 +0100
++++ ForwardRequestC.h	2005-01-27 13:53:01.788864000 +0100
+@@ -66,6 +66,8 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:48
+ 
+@@ -158,6 +160,8 @@
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ #if defined (__ACE_INLINE__)
+ #include "ForwardRequestC.inl"
+ #endif /* defined INLINE */
+--- orig/ForwardRequestC.cpp	2005-01-27 13:51:06.723408000 +0100
++++ ForwardRequestC.cpp	2005-01-27 13:52:38.184923200 +0100
+@@ -43,6 +43,8 @@
+ #include "ForwardRequestC.inl"
+ #endif /* !defined INLINE */
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
+@@ -294,3 +296,5 @@
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ForwardRequestA.cpp	2005-01-27 13:51:06.723408000 +0100
++++ ForwardRequestA.cpp	2005-01-27 13:52:23.373625600 +0100
+@@ -29,6 +29,8 @@
+ #include "tao/Typecode.h"
+ #include "tao/Any_Dual_Impl_T.h"
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // TAO_IDL - Generated from 
+ // be\be_visitor_exception/any_op_cs.cpp:50
+ 
+@@ -129,3 +131,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ImR_Locator.diff b/TAO/tao/PortableServer/diffs/ImR_Locator.diff
deleted file mode 100644
index 72f87b6e23f..00000000000
--- a/TAO/tao/PortableServer/diffs/ImR_Locator.diff
+++ /dev/null
@@ -1,586 +0,0 @@
---- orig/ImR_LocatorC.h	2003-04-25 17:36:28.000000000 -0500
-+++ ./ImR_LocatorC.h	2003-04-25 17:38:32.000000000 -0500
-@@ -30,17 +30,15 @@
- 
- #ifndef _TAO_IDL_ORIG_IMR_LOCATORC_H_
- #define _TAO_IDL_ORIG_IMR_LOCATORC_H_
--
- #include "ace/pre.h"
--
--#include "tao/corba.h"
-+#include "portableserver_export.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
- 
--#include "portableserver_export.h"
-+
- 
- #include "ImplRepoC.h"
- 
-@@ -72,31 +70,31 @@
- 
- TAO_NAMESPACE  ImplementationRepository
- {
--  
-+
-   // TAO_IDL - Generated from
-   // be/be_interface.cpp:570
- 
- #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR__ODDS_N_ENDS_CH_)
- #define _IMPLEMENTATIONREPOSITORY_LOCATOR__ODDS_N_ENDS_CH_
--  
-+
-   class Locator;
-   typedef Locator *Locator_ptr;
-   struct tao_Locator_life;
--  
-+
-   typedef
-     TAO_Objref_Var_T<
-         Locator,
-         tao_Locator_life
-       >
-     Locator_var;
--  
-+
-   typedef
-     TAO_Objref_Out_T<
-         Locator,
-         tao_Locator_life
-       >
-     Locator_out;
--  
-+
-   struct TAO_PortableServer_Export tao_Locator_life
-   {
-     static Locator_ptr tao_duplicate (Locator_ptr);
-@@ -107,7 +105,7 @@
-         TAO_OutputCDR &
-       );
-   };
--  
-+
-   struct TAO_PortableServer_Export tao_Locator_cast
-   {
-     static Locator_ptr tao_narrow (
-@@ -118,18 +116,18 @@
-   };
- 
- #endif /* end #if !defined */
--  
-+
-   // TAO_IDL - Generated from
-   // be/be_visitor_interface/interface_ch.cpp:50
- 
- #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_CH_)
- #define _IMPLEMENTATIONREPOSITORY_LOCATOR_CH_
--  
-+
-   class _TAO_Locator_Proxy_Impl;
-   class _TAO_Locator_Remote_Proxy_Impl;
-   class _TAO_Locator_Proxy_Broker;
-   class _TAO_Locator_Remote_Proxy_Broker;
--  
-+
-   class TAO_PortableServer_Export Locator
-     : public virtual ImplementationRepository::Administration
-   {
-@@ -137,30 +135,30 @@
-     typedef Locator_ptr _ptr_type;
-     typedef Locator_var _var_type;
-     static int _tao_class_id;
--    
-+
-     // The static operations.
-     static Locator_ptr _duplicate (Locator_ptr obj);
--    
-+
-     static Locator_ptr _narrow (
-         CORBA::Object_ptr obj
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-       );
--    
-+
-     static Locator_ptr _unchecked_narrow (
-         CORBA::Object_ptr obj
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-       );
--    
-+
-     static Locator_ptr _nil (void)
-       {
-         return (Locator_ptr)0;
-       }
--    
-+
-     static void _tao_any_destructor (void *);
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual void activate_server_in_location (
-         const char * server,
-         const char * location
-@@ -171,10 +169,10 @@
-         , ImplementationRepository::NotFound
-         , ImplementationRepository::CannotActivate
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual void remove_server_in_location (
-         const char * server,
-         const char * location
-@@ -184,10 +182,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual void shutdown_server_in_location (
-         const char * server,
-         const char * location
-@@ -197,10 +195,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual void server_is_shutting_down_in_location (
-         const char * server,
-         const char * location
-@@ -210,10 +208,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual CORBA::ULong register_activator (
-         const char * location,
-         CORBA::Object_ptr object_ref
-@@ -223,10 +221,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::AlreadyRegistered
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual CORBA::ULong unregister_activator (
-         const char * location,
-         CORBA::Object_ptr object_ref
-@@ -236,70 +234,70 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_interface/interface_ch.cpp:207
--    
-+
-     virtual CORBA::Boolean _is_a (
-         const char *type_id
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-       );
--    
-+
-     virtual void *_tao_QueryInterface (ptr_arith_t type);
--    
-+
-     virtual const char* _interface_repository_id (void) const;
-     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-   private:
-     _TAO_Locator_Proxy_Broker *the_TAO_Locator_Proxy_Broker_;
--  
-+
-   protected:
-     Locator (int collocated = 0);
--    
-+
-     // These methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode.
-     virtual void ImplementationRepository_Locator_setup_collocation (int collocated);
--    
-+
-     Locator (IOP::IOR *ior,
-       TAO_ORB_Core *orb_core = 0);
--      
-+
-     Locator (
--        TAO_Stub *objref, 
-+        TAO_Stub *objref,
-         CORBA::Boolean _tao_collocated = 0,
-         TAO_Abstract_ServantBase *servant = 0,
-         TAO_ORB_Core *orb_core = 0
-       );
-     virtual ~Locator (void);
--    
-+
-     friend class _TAO_Locator_Remote_Proxy_Impl;
-     friend class _TAO_Locator_ThruPOA_Proxy_Impl;
-     friend class _TAO_Locator_Direct_Proxy_Impl;
--  
-+
-   private:
-     Locator (const Locator &);
-     void operator= (const Locator &);
-   };
--  
-+
-   // The Proxy Implementations are used by each interface to
-   // perform a call. Each different implementation encapsulates
-   // an invocation logic.
--  
--  
-+
-+
-   ///////////////////////////////////////////////////////////////////////
-   //                    Base Proxy Impl. Declaration
-   //
--  
-+
-   // TAO_IDL - Generated from
-   // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
--  
-+
-   class TAO_PortableServer_Export _TAO_Locator_Proxy_Impl
-     : public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl
-   {
-   public:
-     virtual ~_TAO_Locator_Proxy_Impl (void) {}
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
--    
-+
-     virtual void activate_server_in_location (
-         CORBA::Object *_collocated_tao_target_,
-         const char * server,
-@@ -311,10 +309,10 @@
-         , ImplementationRepository::NotFound
-         , ImplementationRepository::CannotActivate
-       )) = 0;
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
--    
-+
-     virtual void remove_server_in_location (
-         CORBA::Object *_collocated_tao_target_,
-         const char * server,
-@@ -325,10 +323,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       )) = 0;
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
--    
-+
-     virtual void shutdown_server_in_location (
-         CORBA::Object *_collocated_tao_target_,
-         const char * server,
-@@ -339,10 +337,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       )) = 0;
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
--    
-+
-     virtual void server_is_shutting_down_in_location (
-         CORBA::Object *_collocated_tao_target_,
-         const char * server,
-@@ -353,10 +351,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       )) = 0;
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
--    
-+
-     virtual CORBA::ULong register_activator (
-         CORBA::Object *_collocated_tao_target_,
-         const char * location,
-@@ -367,10 +365,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::AlreadyRegistered
-       )) = 0;
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
--    
-+
-     virtual CORBA::ULong unregister_activator (
-         CORBA::Object *_collocated_tao_target_,
-         const char * location,
-@@ -381,23 +379,23 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       )) = 0;
--  
-+
-   protected:
-     _TAO_Locator_Proxy_Impl (void);
-   };
--  
-+
-   //
-   //               End Base Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
--  
--  
-+
-+
-   ///////////////////////////////////////////////////////////////////////
-   //                Remote Proxy Impl. Declaration
-   //
--  
-+
-   // TAO_IDL - Generated from
-   // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
--  
-+
-   class TAO_PortableServer_Export _TAO_Locator_Remote_Proxy_Impl
-     : public virtual _TAO_Locator_Proxy_Impl,
-       public virtual TAO_Remote_Object_Proxy_Impl,
-@@ -405,12 +403,12 @@
-   {
-   public:
-     _TAO_Locator_Remote_Proxy_Impl (void);
--    
-+
-     virtual ~_TAO_Locator_Remote_Proxy_Impl (void) {}
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/proxy_impl_xh.cpp:24
--    
-+
-     virtual void activate_server_in_location (
-         CORBA::Object *_collocated_tao_target_,
-         const char * server,
-@@ -422,10 +420,10 @@
-         , ImplementationRepository::NotFound
-         , ImplementationRepository::CannotActivate
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/proxy_impl_xh.cpp:24
--    
-+
-     virtual void remove_server_in_location (
-         CORBA::Object *_collocated_tao_target_,
-         const char * server,
-@@ -436,10 +434,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/proxy_impl_xh.cpp:24
--    
-+
-     virtual void shutdown_server_in_location (
-         CORBA::Object *_collocated_tao_target_,
-         const char * server,
-@@ -450,10 +448,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/proxy_impl_xh.cpp:24
--    
-+
-     virtual void server_is_shutting_down_in_location (
-         CORBA::Object *_collocated_tao_target_,
-         const char * server,
-@@ -464,10 +462,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/proxy_impl_xh.cpp:24
--    
-+
-     virtual CORBA::ULong register_activator (
-         CORBA::Object *_collocated_tao_target_,
-         const char * location,
-@@ -478,10 +476,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::AlreadyRegistered
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/proxy_impl_xh.cpp:24
--    
-+
-     virtual CORBA::ULong unregister_activator (
-         CORBA::Object *_collocated_tao_target_,
-         const char * location,
-@@ -493,23 +491,23 @@
-         , ImplementationRepository::NotFound
-       ));
-   };
--  
-+
-   //
-   //             End Remote Proxy Impl. Declaration
-   ///////////////////////////////////////////////////////////////////////
--  
-+
-   // The Proxy Brokers are used by each interface to get
--  // the right proxy for performing a call. In the new 
-+  // the right proxy for performing a call. In the new
-   // collocation scheme, the proxy to be used can vary on
-   // a call by call basis.
--  
-+
-   ///////////////////////////////////////////////////////////////////////
--  //                 Base Proxy Broker Declaration 
-+  //                 Base Proxy Broker Declaration
-   //
--  
-+
-   // TAO_IDL - Generated from
-   // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
--  
-+
-   class TAO_PortableServer_Export _TAO_Locator_Proxy_Broker
-   {
-   public:
-@@ -518,56 +516,56 @@
-         Locator *object
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-       ) = 0;
--    
-+
-   protected:
-     _TAO_Locator_Proxy_Broker (void);
--    
-+
-   };
--  
-+
-   //
--  //              End Base Proxy Broker Declaration 
-+  //              End Base Proxy Broker Declaration
-   ///////////////////////////////////////////////////////////////////////
--  
--    
-+
-+
-   ///////////////////////////////////////////////////////////////////////
--  //                 Remote Proxy Broker Declaration 
-+  //                 Remote Proxy Broker Declaration
-   //
--  
-+
-   // TAO_IDL - Generated from
-   // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
--  
-+
-   class TAO_PortableServer_Export _TAO_Locator_Remote_Proxy_Broker
-     : public virtual _TAO_Locator_Proxy_Broker
-   {
--  public: 
-+  public:
-     _TAO_Locator_Remote_Proxy_Broker (void);
--    
-+
-     virtual ~_TAO_Locator_Remote_Proxy_Broker (void);
--    
-+
-     virtual _TAO_Locator_Proxy_Impl &select_proxy (
-         Locator *object
-         ACE_ENV_ARG_DECL
-       );
--    
-+
-   private:
-     _TAO_Locator_Remote_Proxy_Impl remote_proxy_impl_;
--  
-+
-   public:
-     // This member function is used to get an handle to the unique instance
-     // of the Remote Proxy Broker that is available for a given
-     // interface.
-     static _TAO_Locator_Remote_Proxy_Broker *the_TAO_Locator_Remote_Proxy_Broker (void);
-   };
--  
-+
-   //
--  //              End Remote Proxy Broker Declaration 
-+  //              End Remote Proxy Broker Declaration
-   ///////////////////////////////////////////////////////////////////////
- 
- #endif /* end #if !defined */
--  
-+
-   // TAO_IDL - Generated from
-   // be/be_visitor_typecode/typecode_decl.cpp:44
--  
-+
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Locator;
- 
- // TAO_IDL - Generated from
-@@ -627,4 +625,3 @@
- 
- #include "ace/post.h"
- #endif /* ifndef */
--
---- orig/ImR_LocatorC.i	2003-04-25 17:36:27.000000000 -0500
-+++ ./ImR_LocatorC.i	2003-04-25 17:30:46.000000000 -0500
-@@ -69,12 +69,12 @@
- // TAO_IDL - Generated from
- // be/be_visitor_interface/cdr_op_ci.cpp:72
- 
--TAO_PortableServer_Export CORBA::Boolean operator<< (
-+TAO_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
-     const ImplementationRepository::Locator_ptr
-   );
- 
--TAO_PortableServer_Export CORBA::Boolean operator>> (
-+TAO_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
-     ImplementationRepository::Locator_ptr &
-   );
diff --git a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
new file mode 100644
index 00000000000..9fb17abb8fd
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
@@ -0,0 +1,67 @@
+--- orig/ImplicitActivationPolicyC.h	2004-11-17 09:22:00.456534400 +0100
++++ ImplicitActivationPolicyC.h	2004-11-17 09:22:11.171942400 +0100
+@@ -96,6 +96,7 @@
+     NO_IMPLICIT_ACTIVATION
+   };
+   
++#if (TAO_HAS_MINIMUM_POA == 0)
+   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
+   
+   // TAO_IDL - Generated from
+@@ -223,11 +224,13 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:66
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+ } // module PortableServer
+ 
+ // TAO_IDL - Generated from
+ // be\be_visitor_traits.cpp:59
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
+ // Traits specializations.
+ namespace TAO
+ {
+@@ -273,6 +276,8 @@
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ImplicitActivationPolicyC.cpp	2004-11-17 09:22:00.456534400 +0100
++++ ImplicitActivationPolicyC.cpp	2004-11-17 09:22:11.332172800 +0100
+@@ -45,6 +45,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -260,3 +262,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ImplicitActivationPolicyA.cpp	2004-11-17 09:22:00.476563200 +0100
++++ ImplicitActivationPolicyA.cpp	2004-11-17 09:22:11.392259200 +0100
+@@ -33,6 +33,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -259,3 +261,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/POAManager.diff b/TAO/tao/PortableServer/diffs/POAManager.diff
new file mode 100644
index 00000000000..2618d3e92a0
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/POAManager.diff
@@ -0,0 +1,20 @@
+--- orig/POAManagerC.h	2004-11-17 09:22:01.508046400 +0100
++++ POAManagerC.h	2004-11-17 09:22:11.702705600 +0100
+@@ -221,6 +221,8 @@
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+     virtual void hold_requests (
+         ::CORBA::Boolean wait_for_completion
+         ACE_ENV_ARG_DECL_WITH_DEFAULTS
+@@ -255,6 +257,8 @@
+         ::PortableServer::POAManager::AdapterInactive
+       )) = 0;
+     
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff
new file mode 100644
index 00000000000..546b8559e00
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/PS_Forward.diff
@@ -0,0 +1,28 @@
+--- orig/PS_ForwardC.h	2004-11-17 09:22:02.980163200 +0100
++++ PS_ForwardC.h	2004-11-17 09:22:12.273526400 +0100
+@@ -68,11 +68,25 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+
++class TAO_ServantBase;
++class TAO_ServantBase_var;
++class TAO_RefCountServantBase;
++class TAO_Local_ServantBase;
++class TAO_Root_POA;
++class TAO_DynamicImplementation;
++
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:48
+
+ namespace PortableServer
+ {
++   typedef TAO_ServantBase ServantBase;
++   typedef TAO_ServantBase_var ServantBase_var;
++   typedef TAO_RefCountServantBase RefCountServantBase;
++   typedef ServantBase *Servant;
++
++   typedef TAO_Local_ServantBase LocalServantBase;
++   typedef TAO_DynamicImplementation DynamicImplementation;
+
+   // TAO_IDL - Generated from
+   // be\be_visitor_typedef/typedef_ch.cpp:435
diff --git a/TAO/tao/PortableServer/diffs/PortableServer.diff b/TAO/tao/PortableServer/diffs/PortableServer.diff
index 56aea45a11d..153959fae6d 100644
--- a/TAO/tao/PortableServer/diffs/PortableServer.diff
+++ b/TAO/tao/PortableServer/diffs/PortableServer.diff
@@ -1,753 +1,303 @@
---- orig/PortableServerC.h	Tue Feb  5 16:29:50 2002
-+++ PortableServerC.h	Wed Feb  6 19:07:49 2002
-@@ -23,14 +23,17 @@
- #define _TAO_IDL_ORIG_PORTABLESERVERC_H_
+--- orig/PortableServerC.h	2005-02-13 15:33:37.043569600 +0100
++++ PortableServerC.h	2005-02-15 09:40:51.890892800 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
  
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -36,6 +36,10 @@
  
+ #include "ace/config-all.h"
+ 
++#ifndef TAO_PORTABLESERVER_SAFE_INCLUDE
++#error "You should not include PortableServerC.h directly, use PortableServer.h"
++#endif /* !TAO_PORTABLESERVER_SAFE_INCLUDE */
++
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
+@@ -480,6 +484,8 @@
+     // TAO_IDL - Generated from
+     // be\be_visitor_exception/exception_ch.cpp:51
  
- #include "portableserver_export.h"
--#include "CurrentC.h"
-+#include "tao/CurrentC.h"
-+#include "tao/Sequence.h"
-+#include "tao/Exception.h"
-+#include "tao/PolicyC.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -55,8 +58,23 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
-+class TAO_ServantBase;
-+class TAO_ServantBase_var;
-+class TAO_RefCountServantBase;
-+class TAO_Local_ServantBase;
-+class TAO_DynamicImplementation;
-+class TAO_POA;
-+
- TAO_NAMESPACE  PortableServer
- {
-+  typedef TAO_ServantBase ServantBase;
-+  typedef TAO_ServantBase_var ServantBase_var;
-+  typedef TAO_RefCountServantBase RefCountServantBase;
-+  typedef ServantBase *Servant;
-+
-+  typedef TAO_Local_ServantBase LocalServantBase;
-+  typedef TAO_DynamicImplementation DynamicImplementation;
-+
-   class POA;
-   
- #if !defined (_PORTABLESERVER_POA___PTR_CH_)
-@@ -422,6 +440,7 @@
-   
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
-   
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-   
- #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
- #define _PORTABLESERVER_FORWARDREQUEST_CH_
-@@ -468,6 +487,9 @@
-   
- #endif /* end #if !defined */
-   
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-   
- #if !defined (_PORTABLESERVER_NOTAGROUPOBJECT_CH_)
- #define _PORTABLESERVER_NOTAGROUPOBJECT_CH_
-@@ -673,6 +695,8 @@
-   
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDs;
-   
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID;
-   
-   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID;
-@@ -693,6 +717,8 @@
-     SINGLE_THREAD_MODEL
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-   typedef ThreadPolicyValue &ThreadPolicyValue_out;
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
-   
-@@ -833,6 +859,8 @@
-   
- #endif /* end #if !defined */
-   
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-   enum LifespanPolicyValue
-   {
-     TRANSIENT,
-@@ -1277,6 +1305,8 @@
-     NO_IMPLICIT_ACTIVATION
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
-   
-@@ -1417,12 +1447,16 @@
-   
- #endif /* end #if !defined */
-   
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-   enum ServantRetentionPolicyValue
-   {
-     RETAIN,
-     NON_RETAIN
-   };
-   
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
-   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
-   
-@@ -1563,6 +1597,8 @@
-   
- #endif /* end #if !defined */
-   
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-   enum RequestProcessingPolicyValue
-   {
-     USE_ACTIVE_OBJECT_MAP_ONLY,
-@@ -1570,6 +1606,8 @@
-     USE_SERVANT_MANAGER
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
-   
-@@ -1710,6 +1748,7 @@
-   
+ #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
+ #define _PORTABLESERVER_POA_NOSERVANT_CH_
+     
+@@ -527,6 +533,8 @@
+ 
  #endif /* end #if !defined */
-   
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-   
- #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_)
- #define _PORTABLESERVER_POAMANAGER___PTR_CH_
-@@ -1877,6 +1916,8 @@
-         , PortableServer::POAManager::AdapterInactive
-       )) = 0;
      
-+#if (TAO_HAS_MINIMUM_POA == 0)
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
-     virtual void hold_requests (
-         CORBA::Boolean wait_for_completion
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -1905,6 +1946,8 @@
-         , PortableServer::POAManager::AdapterInactive
-       )) = 0;
+     // TAO_IDL - Generated from
+     // be\be_visitor_exception/exception_ch.cpp:51
+ 
+@@ -870,6 +878,7 @@
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
      
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-     virtual ::PortableServer::POAManager::State get_state (
-         
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-@@ -1930,6 +1973,7 @@
-   
- #endif /* end #if !defined */
-   
 +#if (TAO_HAS_MINIMUM_POA == 0)
-   
- #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
- #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
-@@ -2314,10 +2358,16 @@
-         PortableServer::POA_ptr adapter
+     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
+         ::PortableServer::ThreadPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-       )
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
+@@ -877,6 +886,7 @@
        ACE_THROW_SPEC ((
          CORBA::SystemException
-         , PortableServer::ForwardRequest
        )) = 0;
-+#else
-+      ACE_THROW_SPEC ((
-+        CORBA::SystemException
-+      )) = 0;
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
      
-     virtual void etherealize (
-         const PortableServer::ObjectId & oid,
-@@ -2435,6 +2485,9 @@
-     : public virtual PortableServer::ServantManager
-   {
-   public:
-+
-+    typedef void *Cookie;
-+
-   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-     typedef ServantLocator_ptr _ptr_type;
-     typedef ServantLocator_var _var_type;
-@@ -2467,10 +2520,16 @@
-         PortableServer::ServantLocator::Cookie & the_cookie
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+@@ -914,6 +924,7 @@
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
++#if (TAO_HAS_MINIMUM_POA == 0)
+     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
+         ::PortableServer::ImplicitActivationPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-       )
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
+@@ -921,10 +932,12 @@
        ACE_THROW_SPEC ((
          CORBA::SystemException
-         , PortableServer::ForwardRequest
        )) = 0;
-+#else
-+      ACE_THROW_SPEC ((
-+        CORBA::SystemException
-+      )) = 0;
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-     
-     virtual void postinvoke (
-         const PortableServer::ObjectId & oid,
-@@ -2580,6 +2639,7 @@
-   
- #endif /* end #if !defined */
-   
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
-   
- #if !defined (_PORTABLESERVER_POA_CH_)
- #define _PORTABLESERVER_POA_CH_
-@@ -2613,6 +2673,10 @@
-         return (POA_ptr)0;
-       }
      
-+    virtual TAO_POA* _tao_poa_downcast(void)
-+      {
-+        return 0;
-+      }
-     
- #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
- #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
-@@ -2728,6 +2792,7 @@
- 
- #endif /* end #if !defined */
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
      
 +#if (TAO_HAS_MINIMUM_POA == 0)
-     
- #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
- #define _PORTABLESERVER_POA_NOSERVANT_CH_
-@@ -2765,6 +2830,7 @@
- 
- #endif /* end #if !defined */
-     
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-     
- #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
- #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
-@@ -2839,7 +2905,6 @@
- 
- #endif /* end #if !defined */
-     
--    
- #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
- #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
-     
-@@ -3018,6 +3083,8 @@
-         CORBA::SystemException
-       )) = 0;
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
-         PortableServer::ThreadPolicyValue value
+     virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
+         ::PortableServer::ServantRetentionPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -3026,6 +3093,8 @@
+@@ -932,10 +945,12 @@
+       ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
-     
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-     virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-         PortableServer::LifespanPolicyValue value
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -3050,6 +3119,8 @@
-         CORBA::SystemException
-       )) = 0;
+     
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
      
 +#if (TAO_HAS_MINIMUM_POA == 0)
-+
-     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
-         PortableServer::ImplicitActivationPolicyValue value
+     virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
+         ::PortableServer::RequestProcessingPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -3074,6 +3145,8 @@
+@@ -943,6 +958,7 @@
+       ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
-     
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
+     
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+@@ -987,6 +1003,8 @@
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
++#if (TAO_HAS_MINIMUM_POA == 0)
 +
-     virtual char * the_name (
-         
+     virtual ::PortableServer::AdapterActivator_ptr the_activator (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-@@ -3106,6 +3179,7 @@
+       )
+@@ -1004,10 +1022,12 @@
+       ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
+     
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
      
 +#if (TAO_HAS_MINIMUM_POA == 0)
-     virtual ::PortableServer::AdapterActivator_ptr the_activator (
-         
+     virtual ::PortableServer::ServantManager_ptr get_servant_manager (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-@@ -3159,6 +3233,8 @@
-         , PortableServer::POA::WrongPolicy
+       )
+@@ -1027,10 +1047,13 @@
+         CORBA::SystemException,
+         ::PortableServer::POA::WrongPolicy
        )) = 0;
-     
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-     virtual ::PortableServer::ObjectId * activate_object (
-         PortableServer::Servant p_servant
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -3279,6 +3355,8 @@
-         CORBA::SystemException
-       )) = 0;
+     
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
      
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
-     virtual ::PortableServer::ObjectId * create_id_for_reference (
-         CORBA::Object_ptr the_ref
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -3317,6 +3395,8 @@
-         , PortableServer::NotAGroupObject
+     virtual ::PortableServer::Servant get_servant (
+         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+       )
+@@ -1052,6 +1075,8 @@
+         ::PortableServer::POA::WrongPolicy
        )) = 0;
      
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-     virtual void *_tao_QueryInterface (ptr_arith_t type);
-     
-     virtual const char* _interface_repository_id (void) const;
-@@ -3519,6 +3599,10 @@
- #endif /* end #if !defined */
-   
-   
-+  TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id);
-+  TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
-+  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id);
-+  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
- }
- TAO_NAMESPACE_CLOSE // module PortableServer
- 
-@@ -3526,10 +3610,18 @@
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&);
-+
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
-+
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::NotAGroupObject &); // copying version
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::NotAGroupObject*); // noncopying version
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::NotAGroupObject *&); // deprecated
-@@ -3540,12 +3632,18 @@
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::IDs *&);
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
-@@ -3553,6 +3651,8 @@
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- #ifndef __ACE_INLINE__
- 
- 
-@@ -3570,9 +3670,15 @@
- 
- #endif /* _TAO_CDR_OP_PortableServer_ObjectId_H_ */
- 
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::NotAGroupObject &);
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &);
- 
-@@ -3593,18 +3699,26 @@
- 
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
- 
- #endif /* __ACE_INLINE__ */
- 
---- orig/PortableServerC.i	Tue Feb  5 16:29:50 2002
-+++ PortableServerC.i	Tue Feb  5 17:04:22 2002
-@@ -627,6 +627,8 @@
- // Inline operations for exception PortableServer::ForwardRequest
- // *************************************************************
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // *************************************************************
- // Inline operations for exception PortableServer::NotAGroupObject
- // *************************************************************
-@@ -1025,6 +1027,10 @@
- 
- #endif /* end #if !defined */
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
- 
- #if !defined (_PORTABLESERVER_THREADPOLICY___CI_)
- #define _PORTABLESERVER_THREADPOLICY___CI_
-@@ -1054,6 +1060,8 @@
- #endif /* end #if !defined */
- 
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
+@@ -1313,11 +1338,15 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_exception/any_op_ch.cpp:52
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_)
- #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_
- 
-@@ -1074,6 +1082,8 @@
- 
- #endif /* end #if !defined */
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- // *************************************************************
- // Inline operations for exception PortableServer::POAManager::AdapterInactive
- // *************************************************************
-@@ -1113,6 +1123,8 @@
- 
- #endif /* end #if !defined */
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- // *************************************************************
- // Inline operations for exception PortableServer::POA::AdapterAlreadyExists
- // *************************************************************
-@@ -1186,6 +1198,8 @@
- 
- #endif /* _TAO_CDR_OP_PortableServer_ObjectId_I_ */
- 
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate)
- {
-   // first marshal the repository ID
-@@ -1214,6 +1228,10 @@
-     return 0;
- }
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&); // deprecated
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::NoServant *&);
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate)
- {
-   // first marshal the repository ID
-@@ -1243,6 +1261,10 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_exception/any_op_ch.cpp:52
  
- #endif /* _TAO_CDR_OP_PortableServer_IDs_I_ */
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = _tao_enumval;
-@@ -1262,6 +1284,8 @@
-   return _tao_result;
- }
+@@ -1385,4 +1414,3 @@
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = _tao_enumval;
-@@ -1319,6 +1343,8 @@
-   return _tao_result;
- }
+ #endif /* ifndef */
  
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
+-
+--- orig/PortableServerC.cpp	2005-02-13 15:33:37.043569600 +0100
++++ PortableServerC.cpp	2005-02-15 09:48:26.875128000 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -29,7 +29,7 @@
+ // be\be_codegen.cpp:302
+ 
+ 
+-#include "PortableServerC.h"
++#include "PortableServer.h"
+ #include "tao/CDR.h"
+ #include "tao/ORB_Core.h"
+ #include "tao/Typecode.h"
+@@ -50,7 +50,6 @@
+ // Arg traits specializations.
+ namespace TAO
  {
-   CORBA::ULong _tao_temp = _tao_enumval;
-@@ -1375,4 +1401,4 @@
+-
+ #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
+ #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
    
-   return _tao_result;
+@@ -69,7 +68,6 @@
+ #endif /* end #if !defined */
  }
--
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
---- orig/PortableServerC.cpp	Tue Feb  5 16:29:50 2002
-+++ PortableServerC.cpp	Tue Feb  5 17:15:19 2002
-@@ -31,6 +31,8 @@
- #include "tao/ClientInterceptorAdapter.h"
- #endif  /* TAO_HAS_INTERCEPTORS == 1 */
- 
-+#include "POA.h"
-+
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
- #endif /* __BORLANDC__ */
-@@ -39,6 +41,29 @@
- #include "PortableServerC.i"
- #endif /* !defined INLINE */
- 
-+char *
-+PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id)
-+{
-+  return TAO_POA::ObjectId_to_string (id);
-+}
-+
-+CORBA::WChar *
-+PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id)
-+{
-+  return TAO_POA::ObjectId_to_wstring (id);
-+}
-+
-+PortableServer::ObjectId *
-+PortableServer::string_to_ObjectId (const char *id)
-+{
-+  return TAO_POA::string_to_ObjectId (id);
-+}
-+
-+PortableServer::ObjectId *
-+PortableServer::wstring_to_ObjectId (const CORBA::WChar *id)
-+{
-+  return TAO_POA::wstring_to_ObjectId (id);
-+}
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
- 
-@@ -268,6 +293,8 @@
- TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId)
- TAO_NAMESPACE_END
  
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- // Default constructor.
- PortableServer::ForwardRequest::ForwardRequest (void)
-   : CORBA_UserException ("IDL:omg.org/PortableServer/ForwardRequest:1.0")
-@@ -438,6 +465,10 @@
-   return ::PortableServer::_tc_ForwardRequest;
- }
+-
+ // TAO_IDL - Generated from 
+ // be\be_visitor_sequence/sequence_cs.cpp:65
  
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Default constructor.
- PortableServer::NotAGroupObject::NotAGroupObject (void)
-   : CORBA_UserException ("IDL:omg.org/PortableServer/NotAGroupObject:1.0")
-@@ -733,6 +764,8 @@
- TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IDs, &_tc_TAO_tc_PortableServer_IDs)
- TAO_NAMESPACE_END
+@@ -599,6 +597,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_exception/exception_cs.cpp:63
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- TAO_NAMESPACE_TYPE (const CORBA::ULong)
- TAO_NAMESPACE_BEGIN (PortableServer)
- TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREAD_POLICY_ID, 16U)
-@@ -761,6 +794,9 @@
- TAO_NAMESPACE_BEGIN (PortableServer)
- TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PROCESSING_POLICY_ID, 22U)
- TAO_NAMESPACE_END
-+
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -1124,6 +1160,8 @@
-   return "IDL:omg.org/PortableServer/ThreadPolicy:1.0";
- }
+ PortableServer::POA::NoServant::NoServant (void)
+   : CORBA::UserException (
+         "IDL:omg.org/PortableServer/POA/NoServant:2.3",
+@@ -728,6 +728,8 @@
+ ::CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant =
+   &_tc_TAO_tc_PortableServer_POA_NoServant;
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
- static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -2207,6 +2245,8 @@
-   return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0";
+ // TAO_IDL - Generated from 
+ // be\be_visitor_exception/exception_cs.cpp:63
+ 
+--- orig/PortableServerA.cpp	2005-02-13 15:33:37.063598400 +0100
++++ PortableServerA.cpp	2005-02-13 19:56:05.000000000 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -25,7 +25,7 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#include "PortableServerC.h"
++#include "PortableServer.h"
+ #include "tao/Typecode.h"
+ #include "tao/CDR.h"
+ #include "tao/Any.h"
+@@ -73,6 +73,8 @@
+     &_tc_TAO_tc_PortableServer_POAList;
  }
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -3318,6 +3358,8 @@
-   return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0";
- }
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- int PortableServer::POAManager::_tao_class_id = 0;
- 
- PortableServer::POAManager_ptr
-@@ -3697,6 +3739,7 @@
-   ACE_THROW (CORBA::MARSHAL ());
- }
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
  
-+#if (TAO_HAS_MINIMUM_POA == 0)
- int PortableServer::AdapterActivator::_tao_class_id = 0;
- 
- PortableServer::AdapterActivator_ptr
-@@ -4925,6 +4968,8 @@
-   return "IDL:omg.org/PortableServer/ServantLocator:2.3";
+@@ -179,6 +181,8 @@
+       );
  }
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
- int PortableServer::POA::_tao_class_id = 0;
+ // TAO_IDL - Generated from
+ // be\be_visitor_interface/any_op_cs.cpp:50
  
- PortableServer::POA_ptr
-@@ -5470,6 +5515,8 @@
-   this->index = _tao_index;
- }
+@@ -467,6 +471,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_exception/any_op_cs.cpp:50
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- // Default constructor.
- PortableServer::POA::NoServant::NoServant (void)
-   : CORBA_UserException ("IDL:omg.org/PortableServer/POA/NoServant:1.0")
-@@ -5548,6 +5595,8 @@
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- // Default constructor.
- PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
-   : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0")
-@@ -6498,6 +6547,8 @@
-   return 0;
- }
- 
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-@@ -6588,6 +6639,10 @@
-   return 0;
+ ACE_TEMPLATE_SPECIALIZATION
+ CORBA::Boolean
+ TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
+@@ -536,6 +542,8 @@
+       );
  }
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- void operator<<= (CORBA::Any &_tao_any, const PortableServer::NotAGroupObject &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-@@ -6816,6 +6871,8 @@
-   #  pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ // TAO_IDL - Generated from 
+ // be\be_visitor_exception/any_op_cs.cpp:50
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- void operator<<= (CORBA::Any &_tao_any, PortableServer::LifespanPolicyValue _tao_elem)
- {
-   TAO_OutputCDR stream;
-@@ -6957,6 +7014,8 @@
-   #  pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+@@ -985,11 +993,15 @@
+         PortableServer::POA::InvalidPolicy
+       >;
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- void operator<<= (CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicyValue _tao_elem)
- {
-   TAO_OutputCDR stream;
-@@ -7098,6 +7157,8 @@
-   #  pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+   template class
+     TAO::Any_Dual_Impl_T<
+         PortableServer::POA::NoServant
+       >;
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
-     template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>;
-@@ -7105,6 +7166,8 @@
-   #  pragma instantiate TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+   template class
+     TAO::Any_Dual_Impl_T<
+         PortableServer::POA::ObjectAlreadyActive
+@@ -1047,11 +1059,15 @@
+         PortableServer::POA::InvalidPolicy \
+       >
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
-     template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>;
-@@ -7133,6 +7196,8 @@
-   #  pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ # pragma instantiate \
+     TAO::Any_Dual_Impl_T< \
+         PortableServer::POA::NoServant \
+       >
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
-     template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>;
-@@ -7220,6 +7285,8 @@
-   return 0; // error
- }
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
-     const PortableServer::IDs &_tao_sequence
-@@ -7267,3 +7334,4 @@
-   return 0; // error
- }
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+ # pragma instantiate \
+     TAO::Any_Dual_Impl_T< \
+         PortableServer::POA::ObjectAlreadyActive \
diff --git a/TAO/tao/PortableServer/diffs/PortableServer_include.diff b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
new file mode 100644
index 00000000000..a237f1baabf
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
@@ -0,0 +1,11 @@
+--- orig/PortableServer_includeC.h	2004-12-02 09:59:06.116356400 +0100
++++ PortableServer_includeC.h	2004-12-02 09:59:42.268340400 +0100
+@@ -45,7 +45,7 @@
+ #include "tao/SystemException.h"
+ #include "tao/Environment.h"
+ 
+-#include "tao/PortableServer/PortableServerC.h"
++#include "tao/PortableServer/PortableServer.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
new file mode 100644
index 00000000000..421ec97a17d
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
@@ -0,0 +1,67 @@
+--- orig/RequestProcessingPolicyC.h	2004-11-17 09:22:03.380739200 +0100
++++ RequestProcessingPolicyC.h	2004-11-17 09:22:12.363656000 +0100
+@@ -97,6 +97,7 @@
+     USE_SERVANT_MANAGER
+   };
+   
++#if (TAO_HAS_MINIMUM_POA == 0)
+   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
+   
+   // TAO_IDL - Generated from
+@@ -224,11 +225,13 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:66
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+ } // module PortableServer
+ 
+ // TAO_IDL - Generated from
+ // be\be_visitor_traits.cpp:59
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
+ // Traits specializations.
+ namespace TAO
+ {
+@@ -274,6 +277,8 @@
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/RequestProcessingPolicyC.cpp	2004-11-17 09:22:03.380739200 +0100
++++ RequestProcessingPolicyC.cpp	2004-11-17 09:22:12.433756800 +0100
+@@ -45,6 +45,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -260,3 +262,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/RequestProcessingPolicyA.cpp	2004-11-17 09:22:03.400768000 +0100
++++ RequestProcessingPolicyA.cpp	2004-11-17 09:22:12.483828800 +0100
+@@ -101,6 +101,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
+ {
+     TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -264,3 +266,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantActivator.diff b/TAO/tao/PortableServer/diffs/ServantActivator.diff
new file mode 100644
index 00000000000..91ff7b102cc
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ServantActivator.diff
@@ -0,0 +1,54 @@
+--- orig/ServantActivatorC.h	2004-11-17 09:22:03.941545600 +0100
++++ ServantActivatorC.h	2004-11-17 09:22:12.654073600 +0100
+@@ -74,6 +74,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_root/root_ch.cpp:63
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ namespace TAO
+ {
+   class Collocation_Proxy_Broker;
+@@ -244,6 +246,8 @@
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ServantActivatorC.cpp	2004-11-17 09:22:03.941545600 +0100
++++ ServantActivatorC.cpp	2004-11-17 09:22:12.724174400 +0100
+@@ -46,6 +46,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -239,3 +241,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ServantActivatorA.cpp	2004-11-17 09:22:03.961574400 +0100
++++ ServantActivatorA.cpp	2004-11-17 09:22:12.764232000 +0100
+@@ -32,6 +32,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_ServantActivator[] =
+ {
+     TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -154,3 +156,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff
new file mode 100644
index 00000000000..3e8e6299418
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ServantLocator.diff
@@ -0,0 +1,63 @@
+--- orig/ServantLocatorC.h	2004-11-17 09:22:04.502352000 +0100
++++ ServantLocatorC.h	2004-11-17 09:22:12.914448000 +0100
+@@ -74,6 +74,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_root/root_ch.cpp:63
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ namespace TAO
+ {
+   class Collocation_Proxy_Broker;
+@@ -121,6 +123,8 @@
+     : public virtual ::PortableServer::ServantManager
+   {
+   public:
++    typedef void *Cookie;
++
+     typedef ServantLocator_ptr _ptr_type;
+     typedef ServantLocator_var _var_type;
+     
+@@ -246,6 +250,8 @@
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ServantLocatorC.cpp	2004-11-17 09:22:04.502352000 +0100
++++ ServantLocatorC.cpp	2004-11-17 09:22:12.984548800 +0100
+@@ -46,6 +46,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -239,3 +241,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ServantLocatorA.cpp	2004-11-17 09:22:04.522380800 +0100
++++ ServantLocatorA.cpp	2004-11-17 09:22:13.034620800 +0100
+@@ -32,6 +32,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_ServantLocator[] =
+ {
+     TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -153,3 +155,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantManager.diff b/TAO/tao/PortableServer/diffs/ServantManager.diff
new file mode 100644
index 00000000000..499ee690c1b
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ServantManager.diff
@@ -0,0 +1,53 @@
+--- orig/ServantManagerC.h	2004-11-17 09:22:04.832827200 +0100
++++ ServantManagerC.h	2004-11-17 09:22:13.154793600 +0100
+@@ -70,6 +70,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_root/root_ch.cpp:63
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ namespace TAO
+ {
+   class Collocation_Proxy_Broker;
+@@ -282,6 +284,8 @@
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ServantManagerC.cpp	2004-11-17 09:22:04.832827200 +0100
++++ ServantManagerC.cpp	2004-11-17 09:22:13.224894400 +0100
+@@ -51,6 +51,7 @@
+ {
+ }
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
+ 
+ // TAO_IDL - Generated from
+ // be\be_visitor_interface/interface_cs.cpp:60
+@@ -469,3 +470,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ServantManagerA.cpp	2004-11-17 09:22:04.852856000 +0100
++++ ServantManagerA.cpp	2004-11-17 09:22:13.284980800 +0100
+@@ -30,6 +30,8 @@
+ #include "tao/Any_Impl_T.h"
+ #include "tao/Any_Dual_Impl_T.h"
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
+@@ -249,3 +251,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
new file mode 100644
index 00000000000..356091795a3
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
@@ -0,0 +1,67 @@
+--- orig/ServantRetentionPolicyC.h	2004-11-17 09:22:05.163302400 +0100
++++ ServantRetentionPolicyC.h	2004-11-17 09:22:13.415168000 +0100
+@@ -96,6 +96,7 @@
+     NON_RETAIN
+   };
+   
++#if (TAO_HAS_MINIMUM_POA == 0)
+   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
+   
+   // TAO_IDL - Generated from
+@@ -223,11 +224,13 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:66
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+ } // module PortableServer
+ 
+ // TAO_IDL - Generated from
+ // be\be_visitor_traits.cpp:59
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
+ // Traits specializations.
+ namespace TAO
+ {
+@@ -273,6 +276,8 @@
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ServantRetentionPolicyC.cpp	2004-11-17 09:22:05.163302400 +0100
++++ ServantRetentionPolicyC.cpp	2004-11-17 09:22:13.485268800 +0100
+@@ -45,6 +45,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -260,3 +262,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ServantRetentionPolicyA.cpp	2004-11-17 09:22:05.173316800 +0100
++++ ServantRetentionPolicyA.cpp	2004-11-17 09:22:13.545355200 +0100
+@@ -33,6 +33,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -250,3 +252,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
new file mode 100644
index 00000000000..045b03391b3
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
@@ -0,0 +1,68 @@
+--- orig/ThreadPolicyC.h	2004-11-17 09:22:05.523820800 +0100
++++ ThreadPolicyC.h	2004-11-17 09:22:13.705585600 +0100
+@@ -96,6 +96,7 @@
+     SINGLE_THREAD_MODEL
+   };
+   
++#if (TAO_HAS_MINIMUM_POA == 0)
+   typedef ThreadPolicyValue &ThreadPolicyValue_out;
+   
+   // TAO_IDL - Generated from
+@@ -223,12 +224,14 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:66
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+ } // module PortableServer
+ 
+ // TAO_IDL - Generated from
+ // be\be_visitor_traits.cpp:59
+ 
+ // Traits specializations.
++#if (TAO_HAS_MINIMUM_POA == 0)
+ namespace TAO
+ {
+ 
+@@ -273,6 +276,8 @@
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ThreadPolicyC.cpp	2004-11-17 09:22:05.523820800 +0100
++++ ThreadPolicyC.cpp	2004-11-17 09:22:13.795715200 +0100
+@@ -45,6 +45,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -260,3 +262,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ThreadPolicyA.cpp	2004-11-17 09:22:05.543849600 +0100
++++ ThreadPolicyA.cpp	2004-11-17 09:22:13.845787200 +0100
+@@ -33,6 +33,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -245,3 +247,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_POA == 0 */