ChangeLogTag: Fri Apr 15 12:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

23 files changed, 2289 insertions, 1711 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index ec71992da77..2d172e8734f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -90,8 +90,8 @@ static void loadServersAsBinary(ACE_Configuration& config, Locator_Repository::S
       config.get_string_value (key, IOR, ior);
       config.get_integer_value(key, START_LIMIT, start_limit);
 
-      ImplementationRepository::ActivationMode amode = ACE_static_cast (
-        ImplementationRepository::ActivationMode, amodeint);
+      ImplementationRepository::ActivationMode amode =
+        static_cast <ImplementationRepository::ActivationMode> (amodeint);
 
       ImplementationRepository::EnvironmentList env_vars =
         ImR_Utils::parseEnvList(envstr);
diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
index 1ce70cdaf4d..15f06bcc7ef 100644
--- a/TAO/tao/ClientRequestInfo.h
+++ b/TAO/tao/ClientRequestInfo.h
@@ -31,7 +31,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "tao/PortableInterceptorC.h"
+#include "tao/ClientRequestInfoC.h"
 #include "tao/ORB_Constants.h"
 
 class TAO_ClientRequestInfo_i;
diff --git a/TAO/tao/CodecFactory_ORBInitializer.h b/TAO/tao/CodecFactory_ORBInitializer.h
index 29b42b0fb78..f785a9f9df3 100644
--- a/TAO/tao/CodecFactory_ORBInitializer.h
+++ b/TAO/tao/CodecFactory_ORBInitializer.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "PortableInterceptorC.h"
+#include "ORBInitializerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 2c11c4d823f..e354692645c 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -187,6 +187,8 @@ libTAO_la_SOURCES = \
   NVList.cpp \
   ORB.cpp \
   ORBInitInfo.cpp \
+  ORBInitInfoA.cpp \
+  ORBInitInfoC.cpp \
   ORBInitializerA.cpp \
   ORBInitializerC.cpp \
   ORBInitializer_Registry.cpp \
@@ -215,6 +217,8 @@ libTAO_la_SOURCES = \
   Pluggable_Messaging_Utils.cpp \
   PolicyA.cpp \
   PolicyC.cpp \
+  PolicyFactoryA.cpp \
+  PolicyFactoryC.cpp \
   PolicyFactory_Registry.cpp \
   Policy_ForwardA.cpp \
   Policy_ForwardC.cpp \
@@ -628,6 +632,9 @@ nobase_include_HEADERS = \
   ORB.i \
   ORBInitInfo.h \
   ORBInitInfo.inl \
+  ORBInitInfo.pidl \
+  ORBInitInfoC.h \
+  ORBInitInfoS.h \
   ORBInitializer.pidl \
   ORBInitializerC.h \
   ORBInitializerS.h \
@@ -683,6 +690,9 @@ nobase_include_HEADERS = \
   Policy.pidl \
   PolicyC.h \
   PolicyC.inl \
+  PolicyFactory.pidl \
+  PolicyFactoryC.h \
+  PolicyFactoryS.h \
   PolicyFactory_Registry.h \
   PolicyS.h \
   Policy_Forward.pidl \
diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h
index 776f7e4ac44..01a7385f4e0 100644
--- a/TAO/tao/ORBInitInfo.h
+++ b/TAO/tao/ORBInitInfo.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "PortableInterceptorC.h"
+#include "ORBInitInfoC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/ORBInitInfo.pidl b/TAO/tao/ORBInitInfo.pidl
new file mode 100644
index 00000000000..58281e6fa0d
--- /dev/null
+++ b/TAO/tao/ORBInitInfo.pidl
@@ -0,0 +1,73 @@
+// -*- IDL -*-
+
+/**
+ * @file ORBInitInfo.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the ORBInitInfo
+ *
+ * This file was used to generate the code in ORBInitInfoC.*
+ * The command used to generate code is:
+ *
+ *  tao_idl
+ *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
+ *          -Wb,export_include="tao/TAO_Export.h"
+ *          -Wb,export_macro=TAO_Export
+ *          -Wb,pre_include="ace/pre.h"
+ *          -Wb,post_include="ace/post.h"
+ *          ORBInitInfo.pidl
+ */
+
+#ifndef _ORBINITINFO_PIDL_
+#define _ORBINITINFO_PIDL_
+
+#include <StringSeq.pidl>
+#include <IOP_Codec.pidl>
+#include <PI_Forward.pidl>
+#include <Policy.pidl>
+
+module PortableInterceptor {
+
+  typeprefix PortableInterceptor "omg.org";
+
+  local interface ClientRequestInterceptor;
+  local interface ServerRequestInterceptor;
+  local interface IORInterceptor;
+  local interface PolicyFactory;
+
+  local interface ORBInitInfo
+  {
+    typedef string ObjectId;
+
+    exception DuplicateName
+    {
+      string name;
+    };
+
+    exception InvalidName {};
+
+    readonly attribute CORBA::StringSeq arguments;
+    readonly attribute string orb_id;
+    readonly attribute IOP::CodecFactory codec_factory;
+
+    void register_initial_reference (in ObjectId id, in Object obj)
+      raises (InvalidName);
+    Object resolve_initial_references (in ObjectId id)
+      raises (InvalidName);
+    void add_client_request_interceptor (
+      in ClientRequestInterceptor interceptor)
+      raises (DuplicateName);
+    void add_server_request_interceptor (
+      in ServerRequestInterceptor interceptor)
+      raises (DuplicateName);
+    void add_ior_interceptor (in IORInterceptor interceptor)
+      raises (DuplicateName);
+    SlotId allocate_slot_id ();
+    void register_policy_factory (
+      in CORBA::PolicyType type,
+      in PolicyFactory policy_factory);
+  };
+};
+
+#endif  /* _ORBINITINFO_PIDL_ */
diff --git a/TAO/tao/ORBInitInfoA.cpp b/TAO/tao/ORBInitInfoA.cpp
new file mode 100644
index 00000000000..fdc1ea77741
--- /dev/null
+++ b/TAO/tao/ORBInitInfoA.cpp
@@ -0,0 +1,326 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "ORBInitInfoC.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/String_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo_ObjectId (
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0",
+    "ObjectId",
+    &CORBA::_tc_string);
+  
+::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId =
+  &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId;
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:70
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] =
+  {
+    { "name", &CORBA::_tc_string }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName (
+    CORBA::tk_except,
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+    "DuplicateName",
+    _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName,
+    1);
+  
+::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
+  &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:70
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName = 0;
+static TAO::TypeCode::Struct<char const *,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo_InvalidName (
+    CORBA::tk_except,
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
+    "InvalidName",
+    _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName,
+    0);
+  
+::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName =
+  &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName;
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_ORBInitInfo (
+    "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0",
+    "ORBInitInfo");
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_ORBInitInfo =
+    &_tao_tc_PortableInterceptor_ORBInitInfo;
+}
+
+
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return true;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ORBInitInfo_ptr _tao_objptr =
+    PortableInterceptor::ORBInitInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::insert (
+      _tao_any,
+      PortableInterceptor::ORBInitInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_ORBInitInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::extract (
+        _tao_any,
+        PortableInterceptor::ORBInitInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_ORBInitInfo,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
+
+template<>
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableInterceptor::ORBInitInfo::DuplicateName &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::insert_copy (
+      _tao_any,
+      PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
+      PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo::DuplicateName *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::insert (
+      _tao_any,
+      PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
+      PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const PortableInterceptor::ORBInitInfo::DuplicateName *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::extract (
+        _tao_any,
+        PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
+        PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
+
+template<>
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableInterceptor::ORBInitInfo::InvalidName &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::insert_copy (
+      _tao_any,
+      PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
+      PortableInterceptor::ORBInitInfo::_tc_InvalidName,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo::InvalidName *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::insert (
+      _tao_any,
+      PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
+      PortableInterceptor::ORBInitInfo::_tc_InvalidName,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const PortableInterceptor::ORBInitInfo::InvalidName *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::extract (
+        _tao_any,
+        PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
+        PortableInterceptor::ORBInitInfo::_tc_InvalidName,
+        _tao_elem
+      );
+}
diff --git a/TAO/tao/ORBInitInfoC.cpp b/TAO/tao/ORBInitInfoC.cpp
new file mode 100644
index 00000000000..c110e5d0220
--- /dev/null
+++ b/TAO/tao/ORBInitInfoC.cpp
@@ -0,0 +1,396 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// .\be\be_codegen.cpp:291
+
+
+#include "ORBInitInfoC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// .\be\be_visitor_arg_traits.cpp:69
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableInterceptor::ORBInitInfo.
+
+PortableInterceptor::ORBInitInfo_ptr
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::duplicate (
+    PortableInterceptor::ORBInitInfo_ptr p
+  )
+{
+  return PortableInterceptor::ORBInitInfo::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release (
+    PortableInterceptor::ORBInitInfo_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableInterceptor::ORBInitInfo_ptr
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::nil (void)
+{
+  return PortableInterceptor::ORBInitInfo::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal (
+    PortableInterceptor::ORBInitInfo_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+// TAO_IDL - Generated from 
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
+
+PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
+  : CORBA::UserException (
+        "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+        "DuplicateName"
+      )
+{
+}
+
+PortableInterceptor::ORBInitInfo::DuplicateName::~DuplicateName (void)
+{
+}
+
+PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+  this->name = CORBA::string_dup (_tao_excp.name.in ());
+}
+
+PortableInterceptor::ORBInitInfo::DuplicateName&
+PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
+{
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->name = CORBA::string_dup (_tao_excp.name.in ());
+  return *this;
+}
+
+void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor (void *_tao_void_pointer)
+{
+  DuplicateName *_tao_tmp_pointer =
+    static_cast<DuplicateName *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+PortableInterceptor::ORBInitInfo::DuplicateName *
+PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<DuplicateName *> (_tao_excp);
+}
+
+const PortableInterceptor::ORBInitInfo::DuplicateName *
+PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const DuplicateName *> (_tao_excp);
+}
+
+CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::DuplicateName, 0);
+  return retval;
+}
+
+CORBA::Exception *
+PortableInterceptor::ORBInitInfo::DuplicateName::_tao_duplicate (void) const
+{
+  CORBA::Exception *result = 0;
+  ACE_NEW_RETURN (
+      result,
+      ::PortableInterceptor::ORBInitInfo::DuplicateName (*this),
+      0
+    );
+  return result;
+}
+
+void PortableInterceptor::ORBInitInfo::DuplicateName::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode (
+    TAO_OutputCDR &
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
+    TAO_InputCDR &
+    ACE_ENV_ARG_DECL
+  )
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
+
+PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
+    const char * _tao_name
+  )
+  : CORBA::UserException (
+        "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
+        "DuplicateName"
+      )
+{
+  this->name = CORBA::string_dup (_tao_name);
+}
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_tao_type (void) const
+{
+  return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName;
+}
+
+// TAO_IDL - Generated from 
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
+
+PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
+  : CORBA::UserException (
+        "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
+        "InvalidName"
+      )
+{
+}
+
+PortableInterceptor::ORBInitInfo::InvalidName::~InvalidName (void)
+{
+}
+
+PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+}
+
+PortableInterceptor::ORBInitInfo::InvalidName&
+PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
+{
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  return *this;
+}
+
+void PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor (void *_tao_void_pointer)
+{
+  InvalidName *_tao_tmp_pointer =
+    static_cast<InvalidName *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+PortableInterceptor::ORBInitInfo::InvalidName *
+PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<InvalidName *> (_tao_excp);
+}
+
+const PortableInterceptor::ORBInitInfo::InvalidName *
+PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidName *> (_tao_excp);
+}
+
+CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::InvalidName, 0);
+  return retval;
+}
+
+CORBA::Exception *
+PortableInterceptor::ORBInitInfo::InvalidName::_tao_duplicate (void) const
+{
+  CORBA::Exception *result = 0;
+  ACE_NEW_RETURN (
+      result,
+      ::PortableInterceptor::ORBInitInfo::InvalidName (*this),
+      0
+    );
+  return result;
+}
+
+void PortableInterceptor::ORBInitInfo::InvalidName::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode (
+    TAO_OutputCDR &
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
+    TAO_InputCDR &
+    ACE_ENV_ARG_DECL
+  )
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_tao_type (void) const
+{
+  return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName;
+}
+
+PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
+{}
+
+PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
+{}
+
+void 
+PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ORBInitInfo *_tao_tmp_pointer =
+    static_cast<ORBInitInfo *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ORBInitInfo::_nil ();
+    }
+  
+  ORBInitInfo_ptr proxy =
+    dynamic_cast<ORBInitInfo_ptr> (_tao_objref);
+  
+  return ORBInitInfo::_duplicate (proxy);
+}
+
+PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ORBInitInfo::_nil ();
+    }
+  
+  ORBInitInfo_ptr proxy =
+    dynamic_cast<ORBInitInfo_ptr> (_tao_objref);
+  
+  return ORBInitInfo::_duplicate (proxy);
+}
+
+PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+void
+PortableInterceptor::ORBInitInfo::_tao_release (ORBInitInfo_ptr obj)
+{
+  CORBA::release (obj);
+}
+
+CORBA::Boolean
+PortableInterceptor::ORBInitInfo::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return true; // success using local knowledge
+    }
+  else
+    {
+      return false;
+    }
+}
+
+const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0";
+}
+
+CORBA::Boolean
+PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
+{
+  return false;
+}
diff --git a/TAO/tao/ORBInitInfoC.h b/TAO/tao/ORBInitInfoC.h
new file mode 100644
index 00000000000..1ebabfa85d2
--- /dev/null
+++ b/TAO/tao/ORBInitInfoC.h
@@ -0,0 +1,561 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// .\be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_ORBINITINFOC_H_
+#define _TAO_IDL_ORIG_ORBINITINFOC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/StringSeqC.h"
+#include "tao/IOP_CodecC.h"
+#include "tao/PI_ForwardC.h"
+#include "tao/PolicyC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableInterceptor
+{
+  
+  // TAO_IDL - Generated from
+  // .\be\be_interface.cpp:598
+
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
+  
+  class ClientRequestInterceptor;
+  typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ClientRequestInterceptor
+      >
+    ClientRequestInterceptor_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ClientRequestInterceptor
+      >
+    ClientRequestInterceptor_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // .\be\be_interface.cpp:598
+
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
+  
+  class ServerRequestInterceptor;
+  typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ServerRequestInterceptor
+      >
+    ServerRequestInterceptor_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ServerRequestInterceptor
+      >
+    ServerRequestInterceptor_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // .\be\be_interface.cpp:598
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
+  
+  class IORInterceptor;
+  typedef IORInterceptor *IORInterceptor_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        IORInterceptor
+      >
+    IORInterceptor_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        IORInterceptor
+      >
+    IORInterceptor_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // .\be\be_interface.cpp:598
+
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
+  
+  class PolicyFactory;
+  typedef PolicyFactory *PolicyFactory_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        PolicyFactory
+      >
+    PolicyFactory_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        PolicyFactory
+      >
+    PolicyFactory_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // .\be\be_interface.cpp:598
+
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_
+  
+  class ORBInitInfo;
+  typedef ORBInitInfo *ORBInitInfo_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ORBInitInfo
+      >
+    ORBInitInfo_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ORBInitInfo
+      >
+    ORBInitInfo_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
+
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
+  
+  class TAO_Export ORBInitInfo
+    : public virtual CORBA::Object
+  {
+  public:
+    typedef ORBInitInfo_ptr _ptr_type;
+    typedef ORBInitInfo_var _var_type;
+    
+    // The static operations.
+    static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
+    
+    static void _tao_release (ORBInitInfo_ptr obj);
+    
+    static ORBInitInfo_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ORBInitInfo_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ORBInitInfo_ptr _nil (void)
+    {
+      return static_cast<ORBInitInfo_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:413
+    
+    typedef char * ObjectId;
+    typedef CORBA::String_var ObjectId_var;
+    typedef CORBA::String_out ObjectId_out;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr const _tc_ObjectId;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
+
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_
+    
+    class TAO_Export DuplicateName : public CORBA::UserException
+    {
+    public:
+      
+      TAO_String_Manager name;
+      DuplicateName (void);
+      DuplicateName (const DuplicateName &);
+      ~DuplicateName (void);
+
+      DuplicateName &operator= (const DuplicateName &);
+      
+      static void _tao_any_destructor (void *);
+      
+      static DuplicateName *_downcast (CORBA::Exception *);
+      static const DuplicateName *_downcast (CORBA::Exception const *);
+      
+      static CORBA::Exception *_alloc (void);
+      
+      virtual CORBA::Exception *_tao_duplicate (void) const;
+
+      virtual void _raise (void) const;
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &
+          ACE_ENV_ARG_DECL
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &
+          ACE_ENV_ARG_DECL
+        );
+      
+      // TAO_IDL - Generated from
+      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
+      
+      DuplicateName (
+          const char * _tao_name
+        );
+      
+      // TAO_IDL - Generated from
+      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
+      
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    };
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr const _tc_DuplicateName;
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
+
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_
+    
+    class TAO_Export InvalidName : public CORBA::UserException
+    {
+    public:
+      
+      InvalidName (void);
+      InvalidName (const InvalidName &);
+      ~InvalidName (void);
+
+      InvalidName &operator= (const InvalidName &);
+      
+      static void _tao_any_destructor (void *);
+      
+      static InvalidName *_downcast (CORBA::Exception *);
+      static const InvalidName *_downcast (CORBA::Exception const *);
+      
+      static CORBA::Exception *_alloc (void);
+      
+      virtual CORBA::Exception *_tao_duplicate (void) const;
+
+      virtual void _raise (void) const;
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &
+          ACE_ENV_ARG_DECL
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &
+          ACE_ENV_ARG_DECL
+        );
+      
+      // TAO_IDL - Generated from
+      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
+      
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    };
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr const _tc_InvalidName;
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::StringSeq * arguments (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual char * orb_id (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::IOP::CodecFactory_ptr codec_factory (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void register_initial_reference (
+        const char * id,
+        ::CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::InvalidName
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Object_ptr resolve_initial_references (
+        const char * id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::InvalidName
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void add_client_request_interceptor (
+        ::PortableInterceptor::ClientRequestInterceptor_ptr interceptor
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::DuplicateName
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void add_server_request_interceptor (
+        ::PortableInterceptor::ServerRequestInterceptor_ptr interceptor
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::DuplicateName
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void add_ior_interceptor (
+        ::PortableInterceptor::IORInterceptor_ptr interceptor
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableInterceptor::ORBInitInfo::DuplicateName
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual PortableInterceptor::SlotId allocate_slot_id (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void register_policy_factory (
+        ::CORBA::PolicyType type,
+        ::PortableInterceptor::PolicyFactory_ptr policy_factory
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
+  protected:
+    // Abstract or local interface only.
+    ORBInitInfo (void);
+    
+    virtual ~ORBInitInfo (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ORBInitInfo (const ORBInitInfo &);
+    
+    void operator= (const ORBInitInfo &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBInitInfo;
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableInterceptor
+
+// TAO_IDL - Generated from
+// .\be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
+  
+  template<>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo>
+  {
+    static ::PortableInterceptor::ORBInitInfo_ptr duplicate (
+        ::PortableInterceptor::ORBInitInfo_ptr
+      );
+    static void release (
+        ::PortableInterceptor::ORBInitInfo_ptr
+      );
+    static ::PortableInterceptor::ORBInitInfo_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::ORBInitInfo_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr &);
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName *&);
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName *&);
+
+// TAO_IDL - Generated from
+// .\be\be_codegen.cpp:955
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/ORBInitInfoS.h b/TAO/tao/ORBInitInfoS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/ORBInitInfoS.h
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PICurrent_ORBInitializer.h b/TAO/tao/PICurrent_ORBInitializer.h
index 4921033026a..a1e0304c455 100644
--- a/TAO/tao/PICurrent_ORBInitializer.h
+++ b/TAO/tao/PICurrent_ORBInitializer.h
@@ -24,7 +24,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "PortableInterceptorC.h"
+#include "ORBInitializerC.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
diff --git a/TAO/tao/PolicyFactory.pidl b/TAO/tao/PolicyFactory.pidl
new file mode 100644
index 00000000000..57a5366b279
--- /dev/null
+++ b/TAO/tao/PolicyFactory.pidl
@@ -0,0 +1,36 @@
+// -*- IDL -*-
+
+/**
+ * @file PolicyFactory.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PolicyFactory
+ *
+ *  tao_idl
+ *     -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci
+ *          -Wb,export_include="tao/TAO_Export.h"
+ *          -Wb,export_macro=TAO_Export
+ *          -Wb,pre_include="ace/pre.h"
+ *          -Wb,post_include="ace/post.h"
+ *          PolicyFactory.pidl
+ */
+
+// File: PortableInterceptor.idl
+#ifndef _POLICYFACTORY_PIDL_
+#define _POLICYFACTORY_PIDL_
+
+#include <Policy.pidl>
+
+module PortableInterceptor {
+
+  typeprefix PortableInterceptor "omg.org";
+
+  local interface PolicyFactory
+  {
+    CORBA::Policy create_policy (in CORBA::PolicyType type, in any value)
+      raises (CORBA::PolicyError);
+  };
+};
+
+#endif  /* _PORTABLE_INTERCEPTOR_IDL_ */
diff --git a/TAO/tao/PolicyFactoryA.cpp b/TAO/tao/PolicyFactoryA.cpp
new file mode 100644
index 00000000000..1501fdf04f6
--- /dev/null
+++ b/TAO/tao/PolicyFactoryA.cpp
@@ -0,0 +1,122 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "PolicyFactoryC.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Objref_TypeCode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             CORBA::tk_local_interface,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableInterceptor_PolicyFactory (
+    "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0",
+    "PolicyFactory");
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_PolicyFactory =
+    &_tao_tc_PortableInterceptor_PolicyFactory;
+}
+
+
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return true;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::PolicyFactory_ptr _tao_elem
+  )
+{
+  PortableInterceptor::PolicyFactory_ptr _tao_objptr =
+    PortableInterceptor::PolicyFactory::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::PolicyFactory_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::insert (
+      _tao_any,
+      PortableInterceptor::PolicyFactory::_tao_any_destructor,
+      PortableInterceptor::_tc_PolicyFactory,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::PolicyFactory_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::extract (
+        _tao_any,
+        PortableInterceptor::PolicyFactory::_tao_any_destructor,
+        PortableInterceptor::_tc_PolicyFactory,
+        _tao_elem
+      );
+}
diff --git a/TAO/tao/PolicyFactoryC.cpp b/TAO/tao/PolicyFactoryC.cpp
new file mode 100644
index 00000000000..070362161df
--- /dev/null
+++ b/TAO/tao/PolicyFactoryC.cpp
@@ -0,0 +1,200 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// .\be\be_codegen.cpp:291
+
+
+#include "PolicyFactoryC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// .\be\be_visitor_arg_traits.cpp:69
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableInterceptor::PolicyFactory.
+
+PortableInterceptor::PolicyFactory_ptr
+TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::duplicate (
+    PortableInterceptor::PolicyFactory_ptr p
+  )
+{
+  return PortableInterceptor::PolicyFactory::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release (
+    PortableInterceptor::PolicyFactory_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableInterceptor::PolicyFactory_ptr
+TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void)
+{
+  return PortableInterceptor::PolicyFactory::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal (
+    PortableInterceptor::PolicyFactory_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableInterceptor::PolicyFactory::PolicyFactory (void)
+{}
+
+PortableInterceptor::PolicyFactory::~PolicyFactory (void)
+{}
+
+void
+PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer)
+{
+  PolicyFactory *_tao_tmp_pointer =
+    static_cast<PolicyFactory *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return PolicyFactory::_nil ();
+    }
+
+  PolicyFactory_ptr proxy =
+    dynamic_cast<PolicyFactory_ptr> (_tao_objref);
+
+  return PolicyFactory::_duplicate (proxy);
+}
+
+PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return PolicyFactory::_nil ();
+    }
+
+  PolicyFactory_ptr proxy =
+    dynamic_cast<PolicyFactory_ptr> (_tao_objref);
+
+  return PolicyFactory::_duplicate (proxy);
+}
+
+PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+
+  return obj;
+}
+
+void
+PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj)
+{
+  CORBA::release (obj);
+}
+
+CORBA::Boolean
+PortableInterceptor::PolicyFactory::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return true; // success using local knowledge
+    }
+  else
+    {
+      return false;
+    }
+}
+
+const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0";
+}
+
+CORBA::Boolean
+PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
+{
+  return false;
+}
+
+// Hand-crafted.
+::CORBA::Policy_ptr
+PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
+                                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   CORBA::PolicyError))
+{
+  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
+                    CORBA::Policy::_nil ());
+}
+
diff --git a/TAO/tao/PolicyFactoryC.h b/TAO/tao/PolicyFactoryC.h
new file mode 100644
index 00000000000..3f605106599
--- /dev/null
+++ b/TAO/tao/PolicyFactoryC.h
@@ -0,0 +1,242 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// .\be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_POLICYFACTORYC_H_
+#define _TAO_IDL_ORIG_POLICYFACTORYC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Any.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PolicyC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableInterceptor
+{
+
+  // TAO_IDL - Generated from
+  // .\be\be_interface.cpp:598
+
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
+
+  class PolicyFactory;
+  typedef PolicyFactory *PolicyFactory_ptr;
+
+  typedef
+    TAO_Objref_Var_T<
+        PolicyFactory
+      >
+    PolicyFactory_var;
+
+  typedef
+    TAO_Objref_Out_T<
+        PolicyFactory
+      >
+    PolicyFactory_out;
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
+
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
+
+  class TAO_Export PolicyFactory
+    : public virtual CORBA::Object
+  {
+  public:
+    typedef PolicyFactory_ptr _ptr_type;
+    typedef PolicyFactory_var _var_type;
+
+    // The static operations.
+    static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
+
+    static void _tao_release (PolicyFactory_ptr obj);
+
+    static PolicyFactory_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
+    static PolicyFactory_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
+    static PolicyFactory_ptr _nil (void)
+    {
+      return static_cast<PolicyFactory_ptr> (0);
+    }
+
+    static void _tao_any_destructor (void *);
+
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+
+    virtual ::CORBA::Policy_ptr create_policy (
+        ::CORBA::PolicyType type,
+        const ::CORBA::Any & value
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::CORBA::PolicyError
+      )) = 0;
+
+    // Hand-crafted addition.
+    virtual ::CORBA::Policy_ptr _create_policy (
+        CORBA::PolicyType type
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+        , CORBA::PolicyError
+      ));
+
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
+
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+
+  protected:
+    // Abstract or local interface only.
+    PolicyFactory (void);
+
+    virtual ~PolicyFactory (void);
+
+  private:
+    // Private and unimplemented for concrete interfaces.
+    PolicyFactory (const PolicyFactory &);
+
+    void operator= (const PolicyFactory &);
+  };
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+
+  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory;
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableInterceptor
+
+// TAO_IDL - Generated from
+// .\be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
+
+  template<>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::PolicyFactory>
+  {
+    static ::PortableInterceptor::PolicyFactory_ptr duplicate (
+        ::PortableInterceptor::PolicyFactory_ptr
+      );
+    static void release (
+        ::PortableInterceptor::PolicyFactory_ptr
+      );
+    static ::PortableInterceptor::PolicyFactory_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::PolicyFactory_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &);
+
+// TAO_IDL - Generated from
+// .\be\be_codegen.cpp:955
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PolicyFactoryS.h b/TAO/tao/PolicyFactoryS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/PolicyFactoryS.h
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 0c902810134..f4837032faf 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -41,14 +41,14 @@
 #include <Current.pidl>
 #include <Dynamic.pidl>
 #include <Messaging_SyncScope.pidl>
-#include <IOP_Codec.pidl>
-#include <IOP_IOR.pidl>
-#include <Policy.pidl>
 
 #include <ORBInitializer.pidl>
+#include <ORBInitInfo.pidl>
 #include <InvalidSlot.pidl>
 #include <ClientRequestInfo.pidl>
 #include <ServerRequestInfo.pidl>
+#include <PolicyFactory.pidl>
+#include <ORBInitInfo.pidl>
 
 module PortableInterceptor {
 
@@ -104,47 +104,6 @@ module PortableInterceptor {
     void send_exception (in ServerRequestInfo ri) raises (ForwardRequest);
     void send_other (in ServerRequestInfo ri) raises (ForwardRequest);
   };
-
-  local interface PolicyFactory
-  {
-    CORBA::Policy create_policy (in CORBA::PolicyType type, in any value)
-      raises (CORBA::PolicyError);
-  };
-
-  local interface IORInterceptor;
-
-  local interface ORBInitInfo
-  {
-    typedef string ObjectId;
-
-    exception DuplicateName
-    {
-      string name;
-    };
-
-    exception InvalidName {};
-
-    readonly attribute CORBA::StringSeq arguments;
-    readonly attribute string orb_id;
-    readonly attribute IOP::CodecFactory codec_factory;
-
-    void register_initial_reference (in ObjectId id, in Object obj)
-      raises (InvalidName);
-    Object resolve_initial_references (in ObjectId id)
-      raises (InvalidName);
-    void add_client_request_interceptor (
-      in ClientRequestInterceptor interceptor)
-      raises (DuplicateName);
-    void add_server_request_interceptor (
-      in ServerRequestInterceptor interceptor)
-      raises (DuplicateName);
-    void add_ior_interceptor (in IORInterceptor interceptor)
-      raises (DuplicateName);
-    SlotId allocate_slot_id ();
-    void register_policy_factory (
-      in CORBA::PolicyType type,
-      in PolicyFactory policy_factory);
-  };
 };
 
 #endif  /* _PORTABLE_INTERCEPTOR_IDL_ */
diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp
index 2fa26178802..e1673570c06 100644
--- a/TAO/tao/PortableInterceptorA.cpp
+++ b/TAO/tao/PortableInterceptorA.cpp
@@ -138,99 +138,6 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             CORBA::tk_local_interface,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_PolicyFactory (
-    "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0",
-    "PolicyFactory");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyFactory =
-    &_tao_tc_PortableInterceptor_PolicyFactory;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            CORBA::tk_alias,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo_ObjectId (
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0",
-    "ObjectId",
-    &CORBA::_tc_string);
-  
-::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId =
-  &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId;
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:70
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] =
-  {
-    { "name", &CORBA::_tc_string }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
-    "DuplicateName",
-    _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName,
-    1);
-  
-::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
-  &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:70
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo_InvalidName (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
-    "InvalidName",
-    _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName,
-    0);
-  
-::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName =
-  &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName;
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             CORBA::tk_local_interface,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBInitInfo (
-    "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0",
-    "ORBInitInfo");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBInitInfo =
-    &_tao_tc_PortableInterceptor_ORBInitInfo;
-}
-
-
-
-// TAO_IDL - Generated from
 // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
@@ -590,285 +497,3 @@ operator>>= (
         _tao_elem
       );
 }
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::PolicyFactory_ptr _tao_elem
-  )
-{
-  PortableInterceptor::PolicyFactory_ptr _tao_objptr =
-    PortableInterceptor::PolicyFactory::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::PolicyFactory_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::insert (
-      _tao_any,
-      PortableInterceptor::PolicyFactory::_tao_any_destructor,
-      PortableInterceptor::_tc_PolicyFactory,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::PolicyFactory_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::extract (
-        _tao_any,
-        PortableInterceptor::PolicyFactory::_tao_any_destructor,
-        PortableInterceptor::_tc_PolicyFactory,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return true;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ORBInitInfo_ptr _tao_objptr =
-    PortableInterceptor::ORBInitInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_ORBInitInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_ORBInitInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
-
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::DuplicateName &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::insert_copy (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::DuplicateName *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::ORBInitInfo::DuplicateName *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor,
-        PortableInterceptor::ORBInitInfo::_tc_DuplicateName,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
-
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::InvalidName &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::insert_copy (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_InvalidName,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::InvalidName *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
-      PortableInterceptor::ORBInitInfo::_tc_InvalidName,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::ORBInitInfo::InvalidName *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor,
-        PortableInterceptor::ORBInitInfo::_tc_InvalidName,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 344e19b9208..a27389a39c8 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -89,7 +89,7 @@ PortableInterceptor::Interceptor::Interceptor (void)
 PortableInterceptor::Interceptor::~Interceptor (void)
 {}
 
-void 
+void
 PortableInterceptor::Interceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   Interceptor *_tao_tmp_pointer =
@@ -107,10 +107,10 @@ PortableInterceptor::Interceptor::_narrow (
     {
       return Interceptor::_nil ();
     }
-  
+
   Interceptor_ptr proxy =
     dynamic_cast<Interceptor_ptr> (_tao_objref);
-  
+
   return Interceptor::_duplicate (proxy);
 }
 
@@ -124,10 +124,10 @@ PortableInterceptor::Interceptor::_unchecked_narrow (
     {
       return Interceptor::_nil ();
     }
-  
+
   Interceptor_ptr proxy =
     dynamic_cast<Interceptor_ptr> (_tao_objref);
-  
+
   return Interceptor::_duplicate (proxy);
 }
 
@@ -138,7 +138,7 @@ PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -188,7 +188,7 @@ PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &)
   return false;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
@@ -272,7 +272,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -285,7 +285,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -353,7 +353,7 @@ PortableInterceptor::Current::Current (void)
 PortableInterceptor::Current::~Current (void)
 {}
 
-void 
+void
 PortableInterceptor::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *_tao_tmp_pointer =
@@ -371,10 +371,10 @@ PortableInterceptor::Current::_narrow (
     {
       return Current::_nil ();
     }
-  
+
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-  
+
   return Current::_duplicate (proxy);
 }
 
@@ -388,10 +388,10 @@ PortableInterceptor::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-  
+
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-  
+
   return Current::_duplicate (proxy);
 }
 
@@ -402,7 +402,7 @@ PortableInterceptor::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -498,7 +498,7 @@ PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
 {}
 
-void 
+void
 PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientRequestInterceptor *_tao_tmp_pointer =
@@ -516,10 +516,10 @@ PortableInterceptor::ClientRequestInterceptor::_narrow (
     {
       return ClientRequestInterceptor::_nil ();
     }
-  
+
   ClientRequestInterceptor_ptr proxy =
     dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref);
-  
+
   return ClientRequestInterceptor::_duplicate (proxy);
 }
 
@@ -533,10 +533,10 @@ PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
     {
       return ClientRequestInterceptor::_nil ();
     }
-  
+
   ClientRequestInterceptor_ptr proxy =
     dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref);
-  
+
   return ClientRequestInterceptor::_duplicate (proxy);
 }
 
@@ -547,7 +547,7 @@ PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestIntercep
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -643,7 +643,7 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 {}
 
-void 
+void
 PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerRequestInterceptor *_tao_tmp_pointer =
@@ -661,10 +661,10 @@ PortableInterceptor::ServerRequestInterceptor::_narrow (
     {
       return ServerRequestInterceptor::_nil ();
     }
-  
+
   ServerRequestInterceptor_ptr proxy =
     dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref);
-  
+
   return ServerRequestInterceptor::_duplicate (proxy);
 }
 
@@ -678,10 +678,10 @@ PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     {
       return ServerRequestInterceptor::_nil ();
     }
-  
+
   ServerRequestInterceptor_ptr proxy =
     dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref);
-  
+
   return ServerRequestInterceptor::_duplicate (proxy);
 }
 
@@ -692,7 +692,7 @@ PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestIntercep
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -747,508 +747,6 @@ PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::PolicyFactory.
-
-PortableInterceptor::PolicyFactory_ptr
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::duplicate (
-    PortableInterceptor::PolicyFactory_ptr p
-  )
-{
-  return PortableInterceptor::PolicyFactory::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release (
-    PortableInterceptor::PolicyFactory_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::PolicyFactory_ptr
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void)
-{
-  return PortableInterceptor::PolicyFactory::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal (
-    PortableInterceptor::PolicyFactory_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::PolicyFactory::PolicyFactory (void)
-{}
-
-PortableInterceptor::PolicyFactory::~PolicyFactory (void)
-{}
-
-void 
-PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PolicyFactory *_tao_tmp_pointer =
-    static_cast<PolicyFactory *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyFactory::_nil ();
-    }
-  
-  PolicyFactory_ptr proxy =
-    dynamic_cast<PolicyFactory_ptr> (_tao_objref);
-  
-  return PolicyFactory::_duplicate (proxy);
-}
-
-PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return PolicyFactory::_nil ();
-    }
-  
-  PolicyFactory_ptr proxy =
-    dynamic_cast<PolicyFactory_ptr> (_tao_objref);
-  
-  return PolicyFactory::_duplicate (proxy);
-}
-
-PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::PolicyFactory::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::ORBInitInfo.
-
-PortableInterceptor::ORBInitInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::duplicate (
-    PortableInterceptor::ORBInitInfo_ptr p
-  )
-{
-  return PortableInterceptor::ORBInitInfo::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release (
-    PortableInterceptor::ORBInitInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ORBInitInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::nil (void)
-{
-  return PortableInterceptor::ORBInitInfo::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal (
-    PortableInterceptor::ORBInitInfo_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
-
-PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
-        "DuplicateName"
-      )
-{
-}
-
-PortableInterceptor::ORBInitInfo::DuplicateName::~DuplicateName (void)
-{
-}
-
-PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->name = CORBA::string_dup (_tao_excp.name.in ());
-}
-
-PortableInterceptor::ORBInitInfo::DuplicateName&
-PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->name = CORBA::string_dup (_tao_excp.name.in ());
-  return *this;
-}
-
-void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor (void *_tao_void_pointer)
-{
-  DuplicateName *_tao_tmp_pointer =
-    static_cast<DuplicateName *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableInterceptor::ORBInitInfo::DuplicateName *
-PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<DuplicateName *> (_tao_excp);
-}
-
-const PortableInterceptor::ORBInitInfo::DuplicateName *
-PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const DuplicateName *> (_tao_excp);
-}
-
-CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::DuplicateName, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableInterceptor::ORBInitInfo::DuplicateName::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableInterceptor::ORBInitInfo::DuplicateName (*this),
-      0
-    );
-  return result;
-}
-
-void PortableInterceptor::ORBInitInfo::DuplicateName::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
-
-PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
-    const char * _tao_name
-  )
-  : CORBA::UserException (
-        "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
-        "DuplicateName"
-      )
-{
-  this->name = CORBA::string_dup (_tao_name);
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_tao_type (void) const
-{
-  return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName;
-}
-
-// TAO_IDL - Generated from 
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
-
-PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0",
-        "InvalidName"
-      )
-{
-}
-
-PortableInterceptor::ORBInitInfo::InvalidName::~InvalidName (void)
-{
-}
-
-PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableInterceptor::ORBInitInfo::InvalidName&
-PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InvalidName *_tao_tmp_pointer =
-    static_cast<InvalidName *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableInterceptor::ORBInitInfo::InvalidName *
-PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidName *> (_tao_excp);
-}
-
-const PortableInterceptor::ORBInitInfo::InvalidName *
-PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidName *> (_tao_excp);
-}
-
-CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::InvalidName, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableInterceptor::ORBInitInfo::InvalidName::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableInterceptor::ORBInitInfo::InvalidName (*this),
-      0
-    );
-  return result;
-}
-
-void PortableInterceptor::ORBInitInfo::InvalidName::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_tao_type (void) const
-{
-  return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName;
-}
-
-PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
-{}
-
-PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
-{}
-
-void 
-PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ORBInitInfo *_tao_tmp_pointer =
-    static_cast<ORBInitInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ORBInitInfo::_nil ();
-    }
-  
-  ORBInitInfo_ptr proxy =
-    dynamic_cast<ORBInitInfo_ptr> (_tao_objref);
-  
-  return ORBInitInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ORBInitInfo::_nil ();
-    }
-  
-  ORBInitInfo_ptr proxy =
-    dynamic_cast<ORBInitInfo_ptr> (_tao_objref);
-  
-  return ORBInitInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ORBInitInfo::_tao_release (ORBInitInfo_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::ORBInitInfo::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return false;
-    }
-}
-
-const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// Hand-crafted.
-
-::CORBA::Policy_ptr
-PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
-                                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
-}
-
-// TAO_IDL - Generated from
 // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index a86d8198e08..e6b6ed8450f 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -53,13 +53,13 @@
 #include "tao/CurrentC.h"
 #include "tao/DynamicC.h"
 #include "tao/Messaging_SyncScopeC.h"
-#include "tao/IOP_CodecC.h"
-#include "tao/IOP_IORC.h"
-#include "tao/PolicyC.h"
 #include "tao/ORBInitializerC.h"
+#include "tao/ORBInitInfoC.h"
 #include "tao/InvalidSlotC.h"
 #include "tao/ClientRequestInfoC.h"
 #include "tao/ServerRequestInfoC.h"
+#include "tao/PolicyFactoryC.h"
+#include "tao/ORBInitInfoC.h"
 
 #include "PI_ForwardC.h"
 #include "tao/Messaging_SyncScopeC.h"
@@ -96,47 +96,47 @@ namespace Dynamic
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::AdapterState HOLDING = 0;
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::AdapterState ACTIVE = 1;
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::AdapterState DISCARDING = 2;
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::AdapterState INACTIVE = 3;
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::AdapterState NON_EXISTENT = 4;
-  
+
   // TAO_IDL - Generated from
   // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_
-  
+
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Interceptor
       >
     Interceptor_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Interceptor
@@ -144,117 +144,117 @@ namespace PortableInterceptor
     Interceptor_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_
-  
+
   class TAO_Export Interceptor
     : public virtual CORBA::Object
   {
   public:
     typedef Interceptor_ptr _ptr_type;
     typedef Interceptor_var _var_type;
-    
+
     // The static operations.
     static Interceptor_ptr _duplicate (Interceptor_ptr obj);
-    
+
     static void _tao_release (Interceptor_ptr obj);
-    
+
     static Interceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Interceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Interceptor_ptr _nil (void)
     {
       return static_cast<Interceptor_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Interceptor (void);
-    
+
     virtual ~Interceptor (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Interceptor (const Interceptor &);
-    
+
     void operator= (const Interceptor &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Interceptor;
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_)
 #define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_
-  
+
   class TAO_Export ForwardRequest : public CORBA::UserException
   {
   public:
-    
+
     CORBA::Object_var forward;
     ForwardRequest (void);
     ForwardRequest (const ForwardRequest &);
     ~ForwardRequest (void);
 
     ForwardRequest &operator= (const ForwardRequest &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static ForwardRequest *_downcast (CORBA::Exception *);
     static const ForwardRequest *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -263,77 +263,77 @@ namespace PortableInterceptor
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     ForwardRequest (
         const CORBA::Object_ptr  _tao_forward
       );
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::ReplyStatus SUCCESSFUL = 0;
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::ReplyStatus SYSTEM_EXCEPTION = 1;
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::ReplyStatus USER_EXCEPTION = 2;
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::ReplyStatus LOCATION_FORWARD = 3;
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 4;
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const PortableInterceptor::ReplyStatus UNKNOWN = 5;
-  
+
   // TAO_IDL - Generated from
   // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_
-  
+
   class Current;
   typedef Current *Current_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Current
@@ -341,45 +341,45 @@ namespace PortableInterceptor
     Current_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT_CH_
-  
+
   class TAO_Export Current
     : public virtual ::CORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-    
+
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-    
+
     static void _tao_release (Current_ptr obj);
-    
+
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _nil (void)
     {
       return static_cast<Current_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * get_slot (
         ::PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -388,10 +388,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
         const ::CORBA::Any & data
@@ -401,53 +401,53 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Current (void);
-    
+
     virtual ~Current (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-    
+
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Current;
-  
+
   // TAO_IDL - Generated from
   // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
-  
+
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ClientRequestInterceptor
       >
     ClientRequestInterceptor_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ClientRequestInterceptor
@@ -455,45 +455,45 @@ namespace PortableInterceptor
     ClientRequestInterceptor_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
-  
+
   class TAO_Export ClientRequestInterceptor
     : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef ClientRequestInterceptor_ptr _ptr_type;
     typedef ClientRequestInterceptor_var _var_type;
-    
+
     // The static operations.
     static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
-    
+
     static void _tao_release (ClientRequestInterceptor_ptr obj);
-    
+
     static ClientRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientRequestInterceptor_ptr _nil (void)
     {
       return static_cast<ClientRequestInterceptor_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_request (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -502,10 +502,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_poll (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -513,10 +513,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void receive_reply (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -524,10 +524,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void receive_exception (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -536,10 +536,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void receive_other (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -548,53 +548,53 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ClientRequestInterceptor (void);
-    
+
     virtual ~ClientRequestInterceptor (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ClientRequestInterceptor (const ClientRequestInterceptor &);
-    
+
     void operator= (const ClientRequestInterceptor &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor;
-  
+
   // TAO_IDL - Generated from
   // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
-  
+
   class ServerRequestInterceptor;
   typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ServerRequestInterceptor
       >
     ServerRequestInterceptor_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ServerRequestInterceptor
@@ -602,45 +602,45 @@ namespace PortableInterceptor
     ServerRequestInterceptor_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_
-  
+
   class TAO_Export ServerRequestInterceptor
     : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef ServerRequestInterceptor_ptr _ptr_type;
     typedef ServerRequestInterceptor_var _var_type;
-    
+
     // The static operations.
     static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj);
-    
+
     static void _tao_release (ServerRequestInterceptor_ptr obj);
-    
+
     static ServerRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerRequestInterceptor_ptr _nil (void)
     {
       return static_cast<ServerRequestInterceptor_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
 
     virtual void tao_ft_interception_point (
@@ -654,10 +654,10 @@ namespace PortableInterceptor
       )) {}
 
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void receive_request_service_contexts (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -666,10 +666,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void receive_request (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -678,10 +678,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_reply (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -689,10 +689,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_exception (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -701,10 +701,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void send_other (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -713,522 +713,86 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ServerRequestInterceptor (void);
-    
+
     virtual ~ServerRequestInterceptor (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServerRequestInterceptor (const ServerRequestInterceptor &);
-    
+
     void operator= (const ServerRequestInterceptor &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor;
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
-  
-  class PolicyFactory;
-  typedef PolicyFactory *PolicyFactory_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        PolicyFactory
-      >
-    PolicyFactory_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        PolicyFactory
-      >
-    PolicyFactory_out;
 
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
-  
-  class TAO_Export PolicyFactory
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef PolicyFactory_ptr _ptr_type;
-    typedef PolicyFactory_var _var_type;
-    
-    // The static operations.
-    static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
-    
-    static void _tao_release (PolicyFactory_ptr obj);
-    
-    static PolicyFactory_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PolicyFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static PolicyFactory_ptr _nil (void)
-    {
-      return static_cast<PolicyFactory_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr create_policy (
-        ::CORBA::PolicyType type,
-        const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::CORBA::PolicyError
-      )) = 0;
-    
-    // Hand-crafted addition.
-    virtual ::CORBA::Policy_ptr _create_policy (
-        CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , CORBA::PolicyError
-      ));
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
 
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    PolicyFactory (void);
-    
-    virtual ~PolicyFactory (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    PolicyFactory (const PolicyFactory &);
-    
-    void operator= (const PolicyFactory &);
-  };
+  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor;
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory;
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
-  
-  class IORInterceptor;
-  typedef IORInterceptor *IORInterceptor_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        IORInterceptor
-      >
-    IORInterceptor_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        IORInterceptor
-      >
-    IORInterceptor_out;
+} // module PortableInterceptor
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
+// TAO_IDL - Generated from
+// .\be\be_visitor_traits.cpp:61
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_
-  
-  class ORBInitInfo;
-  typedef ORBInitInfo *ORBInitInfo_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ORBInitInfo
-      >
-    ORBInitInfo_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ORBInitInfo
-      >
-    ORBInitInfo_out;
+// Traits specializations.
+namespace TAO
+{
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
-  
-  class TAO_Export ORBInitInfo
-    : public virtual CORBA::Object
+  template<>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor>
   {
-  public:
-    typedef ORBInitInfo_ptr _ptr_type;
-    typedef ORBInitInfo_var _var_type;
-    
-    // The static operations.
-    static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
-    
-    static void _tao_release (ORBInitInfo_ptr obj);
-    
-    static ORBInitInfo_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static ::PortableInterceptor::ClientRequestInterceptor_ptr duplicate (
+        ::PortableInterceptor::ClientRequestInterceptor_ptr
       );
-    
-    static ORBInitInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static void release (
+        ::PortableInterceptor::ClientRequestInterceptor_ptr
       );
-    
-    static ORBInitInfo_ptr _nil (void)
-    {
-      return static_cast<ORBInitInfo_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:413
-    
-    typedef char * ObjectId;
-    typedef CORBA::String_var ObjectId_var;
-    typedef CORBA::String_out ObjectId_out;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_ObjectId;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_
-    
-    class TAO_Export DuplicateName : public CORBA::UserException
-    {
-    public:
-      
-      TAO_String_Manager name;
-      DuplicateName (void);
-      DuplicateName (const DuplicateName &);
-      ~DuplicateName (void);
-
-      DuplicateName &operator= (const DuplicateName &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static DuplicateName *_downcast (CORBA::Exception *);
-      static const DuplicateName *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
-      
-      DuplicateName (
-          const char * _tao_name
-        );
-      
-      // TAO_IDL - Generated from
-      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_DuplicateName;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_
-    
-    class TAO_Export InvalidName : public CORBA::UserException
-    {
-    public:
-      
-      InvalidName (void);
-      InvalidName (const InvalidName &);
-      ~InvalidName (void);
-
-      InvalidName &operator= (const InvalidName &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static InvalidName *_downcast (CORBA::Exception *);
-      static const InvalidName *_downcast (CORBA::Exception const *);
-      
-      static CORBA::Exception *_alloc (void);
-      
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-      
-      // TAO_IDL - Generated from
-      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
-      
-      virtual CORBA::TypeCode_ptr _tao_type (void) const;
-    };
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-    
-    static ::CORBA::TypeCode_ptr const _tc_InvalidName;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::StringSeq * arguments (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * orb_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::CodecFactory_ptr codec_factory (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void register_initial_reference (
-        const char * id,
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ORBInitInfo::InvalidName
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr resolve_initial_references (
-        const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ORBInitInfo::InvalidName
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_client_request_interceptor (
-        ::PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ORBInitInfo::DuplicateName
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_server_request_interceptor (
-        ::PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ORBInitInfo::DuplicateName
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_ior_interceptor (
-        ::PortableInterceptor::IORInterceptor_ptr interceptor
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::ORBInitInfo::DuplicateName
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual PortableInterceptor::SlotId allocate_slot_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void register_policy_factory (
-        ::CORBA::PolicyType type,
-        ::PortableInterceptor::PolicyFactory_ptr policy_factory
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static ::PortableInterceptor::ClientRequestInterceptor_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::ClientRequestInterceptor_ptr p,
+        TAO_OutputCDR & cdr
       );
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    // Abstract or local interface only.
-    ORBInitInfo (void);
-    
-    virtual ~ORBInitInfo (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ORBInitInfo (const ORBInitInfo &);
-    
-    void operator= (const ORBInitInfo &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBInitInfo;
 
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
-  
   template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor>
   {
-    static ::PortableInterceptor::ORBInitInfo_ptr duplicate (
-        ::PortableInterceptor::ORBInitInfo_ptr
+    static ::PortableInterceptor::ServerRequestInterceptor_ptr duplicate (
+        ::PortableInterceptor::ServerRequestInterceptor_ptr
       );
     static void release (
-        ::PortableInterceptor::ORBInitInfo_ptr
+        ::PortableInterceptor::ServerRequestInterceptor_ptr
       );
-    static ::PortableInterceptor::ORBInitInfo_ptr nil (void);
+    static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::PortableInterceptor::ORBInitInfo_ptr p,
+        ::PortableInterceptor::ServerRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1237,7 +801,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::PortableInterceptor::Interceptor>
   {
@@ -1258,7 +822,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::PortableInterceptor::Current>
   {
@@ -1276,69 +840,6 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor>
-  {
-    static ::PortableInterceptor::ClientRequestInterceptor_ptr duplicate (
-        ::PortableInterceptor::ClientRequestInterceptor_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ClientRequestInterceptor_ptr
-      );
-    static ::PortableInterceptor::ClientRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ClientRequestInterceptor_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor>
-  {
-    static ::PortableInterceptor::ServerRequestInterceptor_ptr duplicate (
-        ::PortableInterceptor::ServerRequestInterceptor_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ServerRequestInterceptor_ptr
-      );
-    static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ServerRequestInterceptor_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::PolicyFactory>
-  {
-    static ::PortableInterceptor::PolicyFactory_ptr duplicate (
-        ::PortableInterceptor::PolicyFactory_ptr
-      );
-    static void release (
-        ::PortableInterceptor::PolicyFactory_ptr
-      );
-    static ::PortableInterceptor::PolicyFactory_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::PolicyFactory_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
 }
 
 // TAO_IDL - Generated from
@@ -1378,36 +879,6 @@ TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInt
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr &);
 
 // TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &);
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr &);
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName *&);
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName *&);
-
-// TAO_IDL - Generated from
 // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ForwardRequest &);
diff --git a/TAO/tao/diffs/PolicyFactory.diff b/TAO/tao/diffs/PolicyFactory.diff
new file mode 100644
index 00000000000..5bf52e563b9
--- /dev/null
+++ b/TAO/tao/diffs/PolicyFactory.diff
@@ -0,0 +1,37 @@
+--- orig/PolicyFactoryC.h	2005-04-15 11:58:39.449555200 +0200
++++ PolicyFactoryC.h	2005-04-15 12:22:48.683451200 +0200
+@@ -142,6 +142,16 @@
+         ::CORBA::PolicyError
+       )) = 0;
+     
++    // Hand-crafted addition.
++    virtual ::CORBA::Policy_ptr _create_policy (
++        CORBA::PolicyType type
++        ACE_ENV_ARG_DECL_WITH_DEFAULTS
++      )
++      ACE_THROW_SPEC ((
++        CORBA::SystemException
++        , CORBA::PolicyError
++      ));
++
+     // TAO_IDL - Generated from
+     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
+     
+--- orig/PolicyFactoryC.cpp	2005-04-15 11:58:39.489612800 +0200
++++ PolicyFactoryC.cpp	2005-04-15 12:23:19.297472000 +0200
+@@ -186,3 +186,15 @@
+ {
+   return false;
+ }
++
++// Hand-crafted.
++::CORBA::Policy_ptr
++PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
++                                                    ACE_ENV_ARG_DECL)
++  ACE_THROW_SPEC ((CORBA::SystemException,
++                   CORBA::PolicyError))
++{
++  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
++                    CORBA::Policy::_nil ());
++}
++
diff --git a/TAO/tao/diffs/PortableInterceptor.diff b/TAO/tao/diffs/PortableInterceptor.diff
index 7801cfb2558..fb087dd94fb 100644
--- a/TAO/tao/diffs/PortableInterceptor.diff
+++ b/TAO/tao/diffs/PortableInterceptor.diff
@@ -1,8 +1,8 @@
---- orig/PortableInterceptorC.h	2005-04-13 11:08:23.328516800 +0200
-+++ PortableInterceptorC.h	2005-04-13 11:10:16.621424000 +0200
-@@ -59,6 +59,12 @@
- #include "tao/PolicyC.h"
- #include "tao/ORBInitializerC.h"
+--- orig/PortableInterceptorC.h	2005-04-15 12:04:07.461212800 +0200
++++ PortableInterceptorC.h	2005-04-15 12:24:20.435384000 +0200
+@@ -61,6 +61,12 @@
+ #include "tao/PolicyFactoryC.h"
+ #include "tao/ORBInitInfoC.h"
  
 +#include "PI_ForwardC.h"
 +#include "tao/Messaging_SyncScopeC.h"
@@ -13,7 +13,7 @@
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
  #endif
-@@ -73,6 +79,16 @@
+@@ -75,6 +81,16 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
@@ -30,7 +30,7 @@
  // TAO_IDL - Generated from
  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
  
-@@ -1318,15 +1334,19 @@
+@@ -625,15 +641,19 @@
      // TAO_IDL - Generated from
      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
      
@@ -52,41 +52,3 @@
      
      // TAO_IDL - Generated from
      // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-@@ -1489,6 +1509,16 @@
-         ::CORBA::PolicyError
-       )) = 0;
-     
-+    // Hand-crafted addition.
-+    virtual ::CORBA::Policy_ptr _create_policy (
-+        CORBA::PolicyType type
-+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-+      )
-+      ACE_THROW_SPEC ((
-+        CORBA::SystemException
-+        , CORBA::PolicyError
-+      ));
-+
-     // TAO_IDL - Generated from
-     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-     
---- orig/PortableInterceptorC.cpp	2005-04-13 11:08:23.328516800 +0200
-+++ PortableInterceptorC.cpp	2005-04-13 11:08:44.609116800 +0200
-@@ -1772,6 +1772,18 @@
-   return false;
- }
- 
-+// Hand-crafted.
-+
-+::CORBA::Policy_ptr
-+PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
-+                                                    ACE_ENV_ARG_DECL)
-+  ACE_THROW_SPEC ((CORBA::SystemException,
-+                   CORBA::PolicyError))
-+{
-+  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-+                    CORBA::Policy::_nil ());
-+}
-+
- // TAO_IDL - Generated from
- // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
- 
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 86f17948277..0b83c7445b3 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -187,6 +187,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     ORBInitializerA.cpp
     ORBInitializerC.cpp
     ORBInitInfo.cpp
+    ORBInitInfoA.cpp
+    ORBInitInfoC.cpp
     ParameterModeA.cpp
     ParameterModeC.cpp
     params.cpp
@@ -203,6 +205,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Policy_Validator.cpp
     PolicyA.cpp
     PolicyC.cpp
+    PolicyFactoryA.cpp
+    PolicyFactoryC.cpp
     PolicyFactory_Registry.cpp
     PollableC.cpp
     PortableInterceptorA.cpp