ChangeLogTag: Wed Apr 13 08:37:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

25 files changed, 2277 insertions, 1489 deletions

diff --git a/TAO/tao/InvalidSlot.pidl b/TAO/tao/InvalidSlot.pidl
new file mode 100644
index 00000000000..bd82c726aa5
--- /dev/null
+++ b/TAO/tao/InvalidSlot.pidl
@@ -0,0 +1,32 @@
+// -*- IDL -*-
+
+/**
+ * @file InvalidSlot.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled InvalidSlot
+ *
+ * This file was used to generate the code in InvalidSlotC.*
+ * 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"
+ *          InvalidSlot.pidl
+ */
+
+#ifndef _INVALID_SLOT_PIDL_
+#define _INVALID_SLOT_PIDL_
+
+module PortableInterceptor {
+
+  typeprefix PortableInterceptor "omg.org";
+
+  exception InvalidSlot {};
+};
+
+#endif  /* _INVALID_SLOT_PIDL_ */
diff --git a/TAO/tao/InvalidSlotA.cpp b/TAO/tao/InvalidSlotA.cpp
new file mode 100644
index 00000000000..f68eed04570
--- /dev/null
+++ b/TAO/tao/InvalidSlotA.cpp
@@ -0,0 +1,144 @@
+// -*- 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 "InvalidSlotC.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode.h"
+#include "tao/Struct_TypeCode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Dual_Impl_T.h"
+
+// 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_InvalidSlot = 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_InvalidSlot (
+    CORBA::tk_except,
+    "IDL:omg.org/PortableInterceptor/InvalidSlot:1.0",
+    "InvalidSlot",
+    _tao_fields_PortableInterceptor_InvalidSlot,
+    0);
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_InvalidSlot =
+    &_tao_tc_PortableInterceptor_InvalidSlot;
+}
+
+
+
+// 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::InvalidSlot>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+  
+  if (!(cdr >> id.out ()))
+    {
+      return false;
+    }
+  
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return false;
+    }
+  ACE_ENDTRY;
+  
+  return true;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableInterceptor::InvalidSlot &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::insert_copy (
+      _tao_any,
+      PortableInterceptor::InvalidSlot::_tao_any_destructor,
+      PortableInterceptor::_tc_InvalidSlot,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::InvalidSlot *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::insert (
+      _tao_any,
+      PortableInterceptor::InvalidSlot::_tao_any_destructor,
+      PortableInterceptor::_tc_InvalidSlot,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::InvalidSlot *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const PortableInterceptor::InvalidSlot *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableInterceptor::InvalidSlot *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::extract (
+        _tao_any,
+        PortableInterceptor::InvalidSlot::_tao_any_destructor,
+        PortableInterceptor::_tc_InvalidSlot,
+        _tao_elem
+      );
+}
diff --git a/TAO/tao/InvalidSlotC.cpp b/TAO/tao/InvalidSlotC.cpp
new file mode 100644
index 00000000000..9315a2123de
--- /dev/null
+++ b/TAO/tao/InvalidSlotC.cpp
@@ -0,0 +1,173 @@
+// -*- 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 "InvalidSlotC.h"
+#include "tao/CDR.h"
+#include "tao/SystemException.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_exception/exception_cs.cpp:63
+
+PortableInterceptor::InvalidSlot::InvalidSlot (void)
+  : CORBA::UserException (
+        "IDL:omg.org/PortableInterceptor/InvalidSlot:1.0",
+        "InvalidSlot"
+      )
+{
+}
+
+PortableInterceptor::InvalidSlot::~InvalidSlot (void)
+{
+}
+
+PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::InvalidSlot &_tao_excp)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+}
+
+PortableInterceptor::InvalidSlot&
+PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::InvalidSlot &_tao_excp)
+{
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  return *this;
+}
+
+void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_pointer)
+{
+  InvalidSlot *_tao_tmp_pointer =
+    static_cast<InvalidSlot *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+PortableInterceptor::InvalidSlot *
+PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<InvalidSlot *> (_tao_excp);
+}
+
+const PortableInterceptor::InvalidSlot *
+PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidSlot *> (_tao_excp);
+}
+
+CORBA::Exception *PortableInterceptor::InvalidSlot::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::PortableInterceptor::InvalidSlot, 0);
+  return retval;
+}
+
+CORBA::Exception *
+PortableInterceptor::InvalidSlot::_tao_duplicate (void) const
+{
+  CORBA::Exception *result = 0;
+  ACE_NEW_RETURN (
+      result,
+      ::PortableInterceptor::InvalidSlot (*this),
+      0
+    );
+  return result;
+}
+
+void PortableInterceptor::InvalidSlot::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+void PortableInterceptor::InvalidSlot::_tao_encode (
+    TAO_OutputCDR &cdr
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  if (cdr << *this)
+    {
+      return;
+    }
+  
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void PortableInterceptor::InvalidSlot::_tao_decode (
+    TAO_InputCDR &cdr
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (cdr >> *this)
+    {
+      return;
+    }
+  
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_tao_type (void) const
+{
+  return ::PortableInterceptor::_tc_InvalidSlot;
+}
+
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const PortableInterceptor::InvalidSlot &_tao_aggregate
+  )
+{
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    PortableInterceptor::InvalidSlot&
+  )
+{
+  return true;
+}
diff --git a/TAO/tao/InvalidSlotC.h b/TAO/tao/InvalidSlotC.h
new file mode 100644
index 00000000000..6661c034224
--- /dev/null
+++ b/TAO/tao/InvalidSlotC.h
@@ -0,0 +1,159 @@
+// -*- 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_INVALIDSLOTC_H_
+#define _TAO_IDL_ORIG_INVALIDSLOTC_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/Environment.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
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
+
+#if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_)
+#define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_
+  
+  class TAO_Export InvalidSlot : public CORBA::UserException
+  {
+  public:
+    
+    InvalidSlot (void);
+    InvalidSlot (const InvalidSlot &);
+    ~InvalidSlot (void);
+
+    InvalidSlot &operator= (const InvalidSlot &);
+    
+    static void _tao_any_destructor (void *);
+    
+    static InvalidSlot *_downcast (CORBA::Exception *);
+    static const InvalidSlot *_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
+  
+  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidSlot;
+
+#endif /* end #if !defined */
+
+// 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
+{
+}
+
+// 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::InvalidSlot &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::InvalidSlot*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::InvalidSlot *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::InvalidSlot *&);
+
+// 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::InvalidSlot &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
+
+// 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/InvalidSlotS.h b/TAO/tao/InvalidSlotS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/InvalidSlotS.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/Makefile.am b/TAO/tao/Makefile.am
index ccff992a483..f27aeda2092 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -147,6 +147,8 @@ libTAO_la_SOURCES = \
   IOR_Parser.cpp \
   Incoming_Message_Queue.cpp \
   Interceptor_List.cpp \
+  InvalidSlotA.cpp \
+  InvalidSlotC.cpp \
   Invocation_Adapter.cpp \
   Invocation_Base.cpp \
   Invocation_Endpoint_Selectors.cpp \
@@ -184,6 +186,8 @@ libTAO_la_SOURCES = \
   ORB.cpp \
   ORBInitInfo.cpp \
   ORBInitializer_Registry.cpp \
+  ORBInitializerA.cpp \
+  ORBInitializerC.cpp \
   ORB_Core.cpp \
   ORB_Core_Auto_Ptr.cpp \
   ORB_Table.cpp \
@@ -231,6 +235,8 @@ libTAO_la_SOURCES = \
   Remote_Invocation.cpp \
   Remote_Object_Proxy_Broker.cpp \
   Reply_Dispatcher.cpp \
+  RequestInfoA.cpp \
+  RequestInfoC.cpp \
   RequestInfo_Util.cpp \
   Request_Dispatcher.cpp \
   Resource_Factory.cpp \
@@ -548,6 +554,9 @@ nobase_include_HEADERS = \
   Interceptor_List.inl \
   InterfaceDef.pidl \
   InvalidName.pidl \
+  InvalidSlot.pidl \
+  InvalidSlotC.h \
+  InvalidSlotS.h \
   Invocation_Adapter.h \
   Invocation_Adapter.inl \
   Invocation_Base.h \
@@ -611,6 +620,9 @@ nobase_include_HEADERS = \
   ORBInitInfo.h \
   ORBInitInfo.inl \
   ORBInitializer_Registry.h \
+  ORBInitializer.pidl \
+  ORBInitializerC.h \
+  ORBInitializerS.h \
   ORB_Constants.h \
   ORB_Core.h \
   ORB_Core.i \
@@ -699,6 +711,9 @@ nobase_include_HEADERS = \
   Reply_Dispatcher.h \
   Reply_Dispatcher.i \
   RequestInfo_Util.h \
+  RequestInfo.pidl \
+  RequestInfoC.h \
+  RequestInfoS.h \
   Request_Dispatcher.h \
   Resource_Factory.h \
   Resume_Handle.h \
diff --git a/TAO/tao/ORBInitializer.pidl b/TAO/tao/ORBInitializer.pidl
new file mode 100644
index 00000000000..7a79e766eb9
--- /dev/null
+++ b/TAO/tao/ORBInitializer.pidl
@@ -0,0 +1,41 @@
+// -*- IDL -*-
+
+/**
+ * @file ORBInitializer.pidl
+ *
+ * $Id$
+ *
+ * @brief ORBInitializer part of the PortableInterceptor part of the CORBA
+ * spec
+ *
+ * This file was used to generate the code in ORBInitializerC.*
+ * 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"
+ *          ORBInitializer.pidl
+ *
+ */
+
+#ifndef _ORB_INITIALIZER_PIDL
+#define _ORB_INITIALIZER_PIDL
+
+module PortableInterceptor {
+
+  typeprefix PortableInterceptor "omg.org";
+
+  local interface ORBInitInfo;
+
+  local interface ORBInitializer
+  {
+    void pre_init (in ORBInitInfo info);
+    void post_init (in ORBInitInfo info);
+  };
+
+};
+
+#endif  /* _ORB_INITIALIZER_PIDL */
diff --git a/TAO/tao/ORBInitializerA.cpp b/TAO/tao/ORBInitializerA.cpp
new file mode 100644
index 00000000000..603454a8c07
--- /dev/null
+++ b/TAO/tao/ORBInitializerA.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 "ORBInitializerC.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_ORBInitializer (
+    "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0",
+    "ORBInitializer");
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_ORBInitializer =
+    &_tao_tc_PortableInterceptor_ORBInitializer;
+}
+
+
+
+// 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::ORBInitializer>::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::ORBInitializer>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitializer_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ORBInitializer_ptr _tao_objptr =
+    PortableInterceptor::ORBInitializer::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitializer_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::insert (
+      _tao_any,
+      PortableInterceptor::ORBInitializer::_tao_any_destructor,
+      PortableInterceptor::_tc_ORBInitializer,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ORBInitializer_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::extract (
+        _tao_any,
+        PortableInterceptor::ORBInitializer::_tao_any_destructor,
+        PortableInterceptor::_tc_ORBInitializer,
+        _tao_elem
+      );
+}
diff --git a/TAO/tao/ORBInitializerC.cpp b/TAO/tao/ORBInitializerC.cpp
new file mode 100644
index 00000000000..852187e9957
--- /dev/null
+++ b/TAO/tao/ORBInitializerC.cpp
@@ -0,0 +1,188 @@
+// -*- 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 "ORBInitializerC.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::ORBInitializer.
+
+PortableInterceptor::ORBInitializer_ptr
+TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::duplicate (
+    PortableInterceptor::ORBInitializer_ptr p
+  )
+{
+  return PortableInterceptor::ORBInitializer::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release (
+    PortableInterceptor::ORBInitializer_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableInterceptor::ORBInitializer_ptr
+TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::nil (void)
+{
+  return PortableInterceptor::ORBInitializer::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::marshal (
+    PortableInterceptor::ORBInitializer_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableInterceptor::ORBInitializer::ORBInitializer (void)
+{}
+
+PortableInterceptor::ORBInitializer::~ORBInitializer (void)
+{}
+
+void 
+PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ORBInitializer *_tao_tmp_pointer =
+    static_cast<ORBInitializer *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ORBInitializer::_nil ();
+    }
+  
+  ORBInitializer_ptr proxy =
+    dynamic_cast<ORBInitializer_ptr> (_tao_objref);
+  
+  return ORBInitializer::_duplicate (proxy);
+}
+
+PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ORBInitializer::_nil ();
+    }
+  
+  ORBInitializer_ptr proxy =
+    dynamic_cast<ORBInitializer_ptr> (_tao_objref);
+  
+  return ORBInitializer::_duplicate (proxy);
+}
+
+PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+void
+PortableInterceptor::ORBInitializer::_tao_release (ORBInitializer_ptr obj)
+{
+  CORBA::release (obj);
+}
+
+CORBA::Boolean
+PortableInterceptor::ORBInitializer::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableInterceptor/ORBInitializer: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::ORBInitializer::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0";
+}
+
+CORBA::Boolean
+PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &)
+{
+  return false;
+}
diff --git a/TAO/tao/ORBInitializerC.h b/TAO/tao/ORBInitializerC.h
new file mode 100644
index 00000000000..b50ee32c7d2
--- /dev/null
+++ b/TAO/tao/ORBInitializerC.h
@@ -0,0 +1,260 @@
+// -*- 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_ORBINITIALIZERC_H_
+#define _TAO_IDL_ORIG_ORBINITIALIZERC_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"
+
+#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_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
+  // .\be\be_interface.cpp:598
+
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_
+  
+  class ORBInitializer;
+  typedef ORBInitializer *ORBInitializer_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ORBInitializer
+      >
+    ORBInitializer_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ORBInitializer
+      >
+    ORBInitializer_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_ORBINITIALIZER_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
+  
+  class TAO_Export ORBInitializer
+    : public virtual CORBA::Object
+  {
+  public:
+    typedef ORBInitializer_ptr _ptr_type;
+    typedef ORBInitializer_var _var_type;
+    
+    // The static operations.
+    static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj);
+    
+    static void _tao_release (ORBInitializer_ptr obj);
+    
+    static ORBInitializer_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ORBInitializer_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ORBInitializer_ptr _nil (void)
+    {
+      return static_cast<ORBInitializer_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 pre_init (
+        ::PortableInterceptor::ORBInitInfo_ptr info
+        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_operation/operation_ch.cpp:46
+    
+    virtual void post_init (
+        ::PortableInterceptor::ORBInitInfo_ptr info
+        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.
+    ORBInitializer (void);
+    
+    virtual ~ORBInitializer (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ORBInitializer (const ORBInitializer &);
+    
+    void operator= (const ORBInitializer &);
+  };
+
+#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_ORBInitializer;
+
+// 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_ORBINITIALIZER__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_
+  
+  template<>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitializer>
+  {
+    static ::PortableInterceptor::ORBInitializer_ptr duplicate (
+        ::PortableInterceptor::ORBInitializer_ptr
+      );
+    static void release (
+        ::PortableInterceptor::ORBInitializer_ptr
+      );
+    static ::PortableInterceptor::ORBInitializer_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::ORBInitializer_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::ORBInitializer_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitializer_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/ORBInitializerS.h b/TAO/tao/ORBInitializerS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/ORBInitializerS.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/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
index 2dd6b470cc8..e7428115760 100644
--- a/TAO/tao/PI_Forward.pidl
+++ b/TAO/tao/PI_Forward.pidl
@@ -45,6 +45,9 @@ module PortableInterceptor
   typedef CORBA::OctetSeq ObjectId;
   typedef long AdapterManagerId;
   typedef short AdapterState;
+  typedef unsigned long SlotId;
+  typedef short ReplyStatus;
+
 };
 
 #endif  /* _PI_FORWARD_IDL_ */
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
index e103d047e7b..8e8634ec1a8 100644
--- a/TAO/tao/PI_ForwardC.cpp
+++ b/TAO/tao/PI_ForwardC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// .\be\be_codegen.cpp:291
 
 
 #include "PI_ForwardC.h"
@@ -42,7 +42,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// .\be\be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +51,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:31
+// 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 *,
@@ -71,7 +71,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:31
+// 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 *,
@@ -91,7 +91,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:31
+// 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 *,
@@ -111,7 +111,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:31
+// 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 *,
@@ -131,7 +131,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:31
+// 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 *,
@@ -151,7 +151,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:31
+// 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 *,
@@ -169,3 +169,43 @@ namespace PortableInterceptor
 }
 
 
+
+// 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_SlotId (
+    "IDL:omg.org/PortableInterceptor/SlotId:1.0",
+    "SlotId",
+    &CORBA::_tc_ulong);
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_SlotId =
+    &_tao_tc_PortableInterceptor_SlotId;
+}
+
+
+
+// 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_ReplyStatus (
+    "IDL:omg.org/PortableInterceptor/ReplyStatus:1.0",
+    "ReplyStatus",
+    &CORBA::_tc_short);
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_ReplyStatus =
+    &_tao_tc_PortableInterceptor_ReplyStatus;
+}
+
+
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
index e1def938dda..dc7bd5e48f6 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// .\be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_PI_FORWARDC_H_
 #define _TAO_IDL_ORIG_PI_FORWARDC_H_
@@ -62,88 +62,110 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * ServerId;
   typedef CORBA::String_var ServerId_var;
   typedef CORBA::String_out ServerId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerId;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:413
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * ORBId;
   typedef CORBA::String_var ORBId_var;
   typedef CORBA::String_out ORBId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBId;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:472
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:472
   
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::StringSeq_var AdapterName_var;
   typedef CORBA::StringSeq_out AdapterName_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterName;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:472
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:472
   
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Long AdapterManagerId;
   typedef CORBA::Long_out AdapterManagerId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterManagerId;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short AdapterState;
   typedef CORBA::Short_out AdapterState_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterState;
+  
+  // TAO_IDL - Generated from
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
+  
+  typedef CORBA::ULong SlotId;
+  typedef CORBA::ULong_out SlotId_out;
+  
+  // 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_SlotId;
+  
+  // TAO_IDL - Generated from
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:379
+  
+  typedef CORBA::Short ReplyStatus;
+  typedef CORBA::Short_out ReplyStatus_out;
+  
+  // 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_ReplyStatus;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// 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
+// .\be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
@@ -151,7 +173,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// .\be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 388d339e079..077f45fa273 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -46,6 +46,10 @@
 #include <orb_types.pidl>
 #include <Policy.pidl>
 
+#include <ORBInitializer.pidl>
+#include <InvalidSlot.pidl>
+#include <RequestInfo.pidl>
+
 module PortableInterceptor {
 
   typeprefix PortableInterceptor "omg.org";
@@ -67,8 +71,6 @@ module PortableInterceptor {
     Object forward;
   };
 
-  typedef short ReplyStatus;
-
   // Valid reply_status values:
   const ReplyStatus SUCCESSFUL = 0;
   const ReplyStatus SYSTEM_EXCEPTION = 1;
@@ -77,34 +79,12 @@ module PortableInterceptor {
   const ReplyStatus TRANSPORT_RETRY = 4;
   const ReplyStatus UNKNOWN = 5;
 
-  typedef unsigned long SlotId;
-
-  exception InvalidSlot {};
-
   local interface Current : CORBA::Current
   {
     any get_slot (in SlotId id) raises (InvalidSlot);
     void set_slot (in SlotId id, in any data) raises (InvalidSlot);
   };
 
-  local interface RequestInfo
-  {
-    readonly attribute unsigned long request_id;
-    readonly attribute string operation;
-    readonly attribute Dynamic::ParameterList arguments;
-    readonly attribute Dynamic::ExceptionList exceptions;
-    readonly attribute Dynamic::ContextList contexts;
-    readonly attribute Dynamic::RequestContext operation_context;
-    readonly attribute any result;
-    readonly attribute boolean response_expected;
-    readonly attribute Messaging::SyncScope sync_scope;
-    readonly attribute ReplyStatus reply_status;
-    readonly attribute Object forward_reference;
-    any get_slot (in SlotId id) raises (InvalidSlot);
-    IOP::ServiceContext get_request_service_context (in IOP::ServiceId id);
-    IOP::ServiceContext get_reply_service_context (in IOP::ServiceId id);
-  };
-
   local interface ClientRequestInfo : RequestInfo
   {
     readonly attribute Object target;
@@ -197,13 +177,6 @@ module PortableInterceptor {
       in CORBA::PolicyType type,
       in PolicyFactory policy_factory);
   };
-
-  local interface ORBInitializer
-  {
-    void pre_init (in ORBInitInfo info);
-    void post_init (in ORBInitInfo info);
-  };
-
 };
 
 #endif  /* _PORTABLE_INTERCEPTOR_IDL_ */
diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp
index bdba3e3a4a7..e336b6b791d 100644
--- a/TAO/tao/PortableInterceptorA.cpp
+++ b/TAO/tao/PortableInterceptorA.cpp
@@ -38,7 +38,7 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
+// 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,
@@ -56,7 +56,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:70
+// 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_ForwardRequest[] =
   {
@@ -84,71 +84,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// 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_ReplyStatus (
-    "IDL:omg.org/PortableInterceptor/ReplyStatus:1.0",
-    "ReplyStatus",
-    &CORBA::_tc_short);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ReplyStatus =
-    &_tao_tc_PortableInterceptor_ReplyStatus;
-}
-
-
-
-// TAO_IDL - Generated from
-// 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_SlotId (
-    "IDL:omg.org/PortableInterceptor/SlotId:1.0",
-    "SlotId",
-    &CORBA::_tc_ulong);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_SlotId =
-    &_tao_tc_PortableInterceptor_SlotId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:70
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_InvalidSlot = 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_InvalidSlot (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableInterceptor/InvalidSlot:1.0",
-    "InvalidSlot",
-    _tao_fields_PortableInterceptor_InvalidSlot,
-    0);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_InvalidSlot =
-    &_tao_tc_PortableInterceptor_InvalidSlot;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
+// 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,
@@ -166,25 +102,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// 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_RequestInfo (
-    "IDL:omg.org/PortableInterceptor/RequestInfo:1.0",
-    "RequestInfo");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_RequestInfo =
-    &_tao_tc_PortableInterceptor_RequestInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
+// 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,
@@ -202,7 +120,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
+// 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,
@@ -220,7 +138,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
+// 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,
@@ -238,7 +156,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
+// 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,
@@ -256,7 +174,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
+// 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,
@@ -274,7 +192,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:31
+// 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 *,
@@ -289,7 +207,7 @@ static TAO::TypeCode::Alias<char const *,
   &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:70
+// 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[] =
   {
@@ -312,7 +230,7 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:70
+// 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 *,
@@ -331,7 +249,7 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
+// 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,
@@ -349,25 +267,7 @@ namespace PortableInterceptor
 
 
 // TAO_IDL - Generated from
-// 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_ORBInitializer (
-    "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0",
-    "ORBInitializer");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBInitializer =
-    &_tao_tc_PortableInterceptor_ORBInitializer;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -436,7 +336,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -520,93 +420,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-template<>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::demarshal_value (
-    TAO_InputCDR & cdr
-  )
-{
-  CORBA::String_var id;
-  
-  if (!(cdr >> id.out ()))
-    {
-      return false;
-    }
-  
-  ACE_TRY_NEW_ENV
-    {
-      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return false;
-    }
-  ACE_ENDTRY;
-  
-  return true;
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableInterceptor::InvalidSlot &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::insert_copy (
-      _tao_any,
-      PortableInterceptor::InvalidSlot::_tao_any_destructor,
-      PortableInterceptor::_tc_InvalidSlot,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::InvalidSlot *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::insert (
-      _tao_any,
-      PortableInterceptor::InvalidSlot::_tao_any_destructor,
-      PortableInterceptor::_tc_InvalidSlot,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::InvalidSlot *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableInterceptor::InvalidSlot *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableInterceptor::InvalidSlot *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::extract (
-        _tao_any,
-        PortableInterceptor::InvalidSlot::_tao_any_destructor,
-        PortableInterceptor::_tc_InvalidSlot,
-        _tao_elem
-      );
-}
-
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -675,76 +490,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::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::RequestInfo>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::RequestInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::RequestInfo_ptr _tao_objptr =
-    PortableInterceptor::RequestInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::RequestInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::insert (
-      _tao_any,
-      PortableInterceptor::RequestInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_RequestInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::RequestInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::extract (
-        _tao_any,
-        PortableInterceptor::RequestInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_RequestInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -813,7 +559,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -882,7 +628,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -951,7 +697,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -1020,7 +766,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -1089,7 +835,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -1158,7 +904,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -1230,7 +976,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -1300,72 +1046,3 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::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::ORBInitializer>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitializer_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ORBInitializer_ptr _tao_objptr =
-    PortableInterceptor::ORBInitializer::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitializer_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::insert (
-      _tao_any,
-      PortableInterceptor::ORBInitializer::_tao_any_destructor,
-      PortableInterceptor::_tc_ORBInitializer,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ORBInitializer_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::extract (
-        _tao_any,
-        PortableInterceptor::ORBInitializer::_tao_any_destructor,
-        PortableInterceptor::_tc_ORBInitializer,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index e546527f544..81add43d28e 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// .\be\be_codegen.cpp:291
 
 
 #include "PortableInterceptorC.h"
@@ -39,7 +39,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// .\be\be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -48,7 +48,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::Interceptor.
 
@@ -189,7 +189,7 @@ PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
   : CORBA::UserException (
@@ -292,7 +292,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
 
 PortableInterceptor::ForwardRequest::ForwardRequest (
     const CORBA::Object_ptr  _tao_forward
@@ -311,113 +311,8 @@ CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_tao_type (void) const
   return ::PortableInterceptor::_tc_ForwardRequest;
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableInterceptor::InvalidSlot::InvalidSlot (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableInterceptor/InvalidSlot:1.0",
-        "InvalidSlot"
-      )
-{
-}
-
-PortableInterceptor::InvalidSlot::~InvalidSlot (void)
-{
-}
-
-PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::InvalidSlot &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableInterceptor::InvalidSlot&
-PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::InvalidSlot &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InvalidSlot *_tao_tmp_pointer =
-    static_cast<InvalidSlot *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableInterceptor::InvalidSlot *
-PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidSlot *> (_tao_excp);
-}
-
-const PortableInterceptor::InvalidSlot *
-PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidSlot *> (_tao_excp);
-}
-
-CORBA::Exception *PortableInterceptor::InvalidSlot::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableInterceptor::InvalidSlot, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableInterceptor::InvalidSlot::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableInterceptor::InvalidSlot (*this),
-      0
-    );
-  return result;
-}
-
-void PortableInterceptor::InvalidSlot::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableInterceptor::InvalidSlot::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableInterceptor::InvalidSlot::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_tao_type (void) const
-{
-  return ::PortableInterceptor::_tc_InvalidSlot;
-}
-
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::Current.
 
@@ -562,148 +457,7 @@ PortableInterceptor::Current::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::RequestInfo.
-
-PortableInterceptor::RequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::duplicate (
-    PortableInterceptor::RequestInfo_ptr p
-  )
-{
-  return PortableInterceptor::RequestInfo::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release (
-    PortableInterceptor::RequestInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::RequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::nil (void)
-{
-  return PortableInterceptor::RequestInfo::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::RequestInfo>::marshal (
-    PortableInterceptor::RequestInfo_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::RequestInfo::RequestInfo (void)
-{}
-
-PortableInterceptor::RequestInfo::~RequestInfo (void)
-{}
-
-void 
-PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RequestInfo *_tao_tmp_pointer =
-    static_cast<RequestInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestInfo::_nil ();
-    }
-  
-  RequestInfo_ptr proxy =
-    dynamic_cast<RequestInfo_ptr> (_tao_objref);
-  
-  return RequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestInfo::_nil ();
-    }
-  
-  RequestInfo_ptr proxy =
-    dynamic_cast<RequestInfo_ptr> (_tao_objref);
-  
-  return RequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::RequestInfo::_tao_release (RequestInfo_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::RequestInfo::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/RequestInfo: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::RequestInfo::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/RequestInfo:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ClientRequestInfo.
 
@@ -848,7 +602,7 @@ PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ServerRequestInfo.
 
@@ -993,7 +747,7 @@ PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ClientRequestInterceptor.
 
@@ -1138,7 +892,7 @@ PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ServerRequestInterceptor.
 
@@ -1283,7 +1037,7 @@ PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::PolicyFactory.
 
@@ -1424,7 +1178,7 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ORBInitInfo.
 
@@ -1460,7 +1214,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
   : CORBA::UserException (
@@ -1553,7 +1307,7 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
 
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
     const char * _tao_name
@@ -1573,7 +1327,7 @@ CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_tao_type (
 }
 
 // TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
   : CORBA::UserException (
@@ -1785,148 +1539,7 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::ORBInitializer.
-
-PortableInterceptor::ORBInitializer_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::duplicate (
-    PortableInterceptor::ORBInitializer_ptr p
-  )
-{
-  return PortableInterceptor::ORBInitializer::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release (
-    PortableInterceptor::ORBInitializer_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ORBInitializer_ptr
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::nil (void)
-{
-  return PortableInterceptor::ORBInitializer::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::marshal (
-    PortableInterceptor::ORBInitializer_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::ORBInitializer::ORBInitializer (void)
-{}
-
-PortableInterceptor::ORBInitializer::~ORBInitializer (void)
-{}
-
-void 
-PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ORBInitializer *_tao_tmp_pointer =
-    static_cast<ORBInitializer *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ORBInitializer::_nil ();
-    }
-  
-  ORBInitializer_ptr proxy =
-    dynamic_cast<ORBInitializer_ptr> (_tao_objref);
-  
-  return ORBInitializer::_duplicate (proxy);
-}
-
-PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ORBInitializer::_nil ();
-    }
-  
-  ORBInitializer_ptr proxy =
-    dynamic_cast<ORBInitializer_ptr> (_tao_objref);
-  
-  return ORBInitializer::_duplicate (proxy);
-}
-
-PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ORBInitializer::_tao_release (ORBInitializer_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::ORBInitializer::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableInterceptor/ORBInitializer: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::ORBInitializer::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1957,23 +1570,3 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.forward.out ())
   );
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const PortableInterceptor::InvalidSlot &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    PortableInterceptor::InvalidSlot&
-  )
-{
-  return true;
-}
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 6597aecc022..ed98feedd8f 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// .\be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
@@ -57,6 +57,9 @@
 #include "tao/IOP_IORC.h"
 #include "tao/orb_typesC.h"
 #include "tao/PolicyC.h"
+#include "tao/ORBInitializerC.h"
+#include "tao/InvalidSlotC.h"
+#include "tao/RequestInfoC.h"
 
 #include "PI_ForwardC.h"
 #include "tao/Messaging_SyncScopeC.h"
@@ -89,38 +92,38 @@ namespace Dynamic
 // TAO_IDL - Generated from
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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
+  // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_
@@ -143,7 +146,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // 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_
@@ -178,7 +181,7 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -188,7 +191,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -198,7 +201,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // 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
@@ -224,12 +227,12 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // 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
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // 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_
@@ -267,129 +270,57 @@ namespace PortableInterceptor
       );
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ctor.cpp:66
+    // 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
-    // be\be_visitor_exception/exception_ch.cpp:127
+    // 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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // 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
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short ReplyStatus;
-  typedef CORBA::Short_out ReplyStatus_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ReplyStatus;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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
-  // be\be_visitor_constant/constant_ch.cpp:52
+  // 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_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::ULong SlotId;
-  typedef CORBA::ULong_out SlotId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_SlotId;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_)
-#define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_
-  
-  class TAO_Export InvalidSlot : public CORBA::UserException
-  {
-  public:
-    
-    InvalidSlot (void);
-    InvalidSlot (const InvalidSlot &);
-    ~InvalidSlot (void);
-
-    InvalidSlot &operator= (const InvalidSlot &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static InvalidSlot *_downcast (CORBA::Exception *);
-    static const InvalidSlot *_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
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidSlot;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_
@@ -412,7 +343,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // 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_
@@ -447,7 +378,7 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Any * get_slot (
         ::PortableInterceptor::SlotId id
@@ -459,7 +390,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
@@ -472,7 +403,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // 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
@@ -498,245 +429,12 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // 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_REQUESTINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_
-  
-  class RequestInfo;
-  typedef RequestInfo *RequestInfo_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        RequestInfo
-      >
-    RequestInfo_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        RequestInfo
-      >
-    RequestInfo_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
-  
-  class TAO_Export RequestInfo
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef RequestInfo_ptr _ptr_type;
-    typedef RequestInfo_var _var_type;
-    
-    // The static operations.
-    static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
-    
-    static void _tao_release (RequestInfo_ptr obj);
-    
-    static RequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static RequestInfo_ptr _nil (void)
-    {
-      return static_cast<RequestInfo_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::ULong request_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * operation (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Dynamic::ParameterList * arguments (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Dynamic::ExceptionList * exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Dynamic::ContextList * contexts (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::Dynamic::RequestContext * operation_context (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * result (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean response_expected (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual Messaging::SyncScope sync_scope (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual PortableInterceptor::ReplyStatus reply_status (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Object_ptr forward_reference (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * get_slot (
-        ::PortableInterceptor::SlotId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::PortableInterceptor::InvalidSlot
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::ServiceContext * get_request_service_context (
-        ::IOP::ServiceId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::ServiceContext * get_reply_service_context (
-        ::IOP::ServiceId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // 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.
-    RequestInfo (void);
-    
-    virtual ~RequestInfo (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RequestInfo (const RequestInfo &);
-    
-    void operator= (const RequestInfo &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RequestInfo;
-  
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
@@ -759,7 +457,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
@@ -794,7 +492,7 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Object_ptr target (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -804,7 +502,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Object_ptr effective_target (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -814,7 +512,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::IOP::TaggedProfile * effective_profile (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -824,7 +522,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Any * received_exception (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -834,7 +532,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual char * received_exception_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -844,7 +542,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::IOP::TaggedComponent * get_effective_component (
         ::IOP::ComponentId id
@@ -855,7 +553,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::IOP::TaggedComponentSeq * get_effective_components (
         ::IOP::ComponentId id
@@ -866,7 +564,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr get_request_policy (
         ::CORBA::PolicyType type
@@ -877,7 +575,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void add_request_service_context (
         const ::IOP::ServiceContext & service_context,
@@ -889,7 +587,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // 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
@@ -915,12 +613,12 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
@@ -943,7 +641,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
@@ -978,7 +676,7 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Any * sending_exception (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -988,7 +686,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual char * server_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -998,7 +696,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -1008,7 +706,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::PortableInterceptor::AdapterName * adapter_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1018,7 +716,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::PortableInterceptor::ObjectId * object_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1028,7 +726,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::OctetSeq * adapter_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1038,7 +736,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual char * target_most_derived_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1048,7 +746,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr get_server_policy (
         ::CORBA::PolicyType type
@@ -1059,7 +757,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
@@ -1072,7 +770,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean target_is_a (
         const char * id
@@ -1083,7 +781,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void add_reply_service_context (
         const ::IOP::ServiceContext & service_context,
@@ -1095,7 +793,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // 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
@@ -1121,12 +819,12 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
   
   extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
@@ -1149,7 +847,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // 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_
@@ -1184,7 +882,7 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_request (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
@@ -1196,7 +894,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_poll (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
@@ -1207,7 +905,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void receive_reply (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
@@ -1218,7 +916,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void receive_exception (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
@@ -1230,7 +928,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void receive_other (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
@@ -1242,7 +940,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // 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
@@ -1268,12 +966,12 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // 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
+  // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
@@ -1296,7 +994,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // 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_
@@ -1331,22 +1029,24 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
+    // 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 (
         ::PortableInterceptor::ServerRequestInfo_ptr ri,
-        CORBA::OctetSeq_out
+        ::CORBA::OctetSeq_out os
         ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
-        )) {}
-    
+      )) {}
+
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -1358,7 +1058,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void receive_request (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
@@ -1370,7 +1070,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_reply (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
@@ -1381,7 +1081,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_exception (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
@@ -1393,7 +1093,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_other (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
@@ -1405,7 +1105,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // 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
@@ -1431,12 +1131,12 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // 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
+  // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
@@ -1459,7 +1159,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // 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_
@@ -1493,18 +1193,8 @@ namespace PortableInterceptor
     
     static void _tao_any_destructor (void *);
     
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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,
@@ -1516,8 +1206,18 @@ namespace PortableInterceptor
         ::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
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // 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
@@ -1543,12 +1243,12 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // 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
+  // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
@@ -1571,7 +1271,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
+  // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_
@@ -1594,7 +1294,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // 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_
@@ -1629,19 +1329,19 @@ namespace PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typedef/typedef_ch.cpp:413
+    // 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
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // 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
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // 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_
@@ -1679,27 +1379,27 @@ namespace PortableInterceptor
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ctor.cpp:66
+      // 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
-      // be\be_visitor_exception/exception_ch.cpp:127
+      // 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
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // 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
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // 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_
@@ -1736,20 +1436,20 @@ namespace PortableInterceptor
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
+      // 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
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -1759,7 +1459,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -1769,7 +1469,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -1779,7 +1479,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void register_initial_reference (
         const char * id,
@@ -1792,7 +1492,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -1804,7 +1504,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -1816,7 +1516,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -1828,7 +1528,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -1840,7 +1540,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // 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
@@ -1850,7 +1550,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void register_policy_factory (
         ::CORBA::PolicyType type,
@@ -1862,7 +1562,7 @@ namespace PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // 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
@@ -1888,132 +1588,42 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // 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
-  // be\be_interface.cpp:598
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_
-  
-  class ORBInitializer;
-  typedef ORBInitializer *ORBInitializer_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ORBInitializer
-      >
-    ORBInitializer_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ORBInitializer
-      >
-    ORBInitializer_out;
+// TAO_IDL - Generated from
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+} // module PortableInterceptor
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
+// 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_
   
-  class TAO_Export ORBInitializer
-    : public virtual CORBA::Object
+  template<>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo>
   {
-  public:
-    typedef ORBInitializer_ptr _ptr_type;
-    typedef ORBInitializer_var _var_type;
-    
-    // The static operations.
-    static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj);
-    
-    static void _tao_release (ORBInitializer_ptr obj);
-    
-    static ORBInitializer_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static ::PortableInterceptor::ORBInitInfo_ptr duplicate (
+        ::PortableInterceptor::ORBInitInfo_ptr
       );
-    
-    static ORBInitializer_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    static void release (
+        ::PortableInterceptor::ORBInitInfo_ptr
       );
-    
-    static ORBInitializer_ptr _nil (void)
-    {
-      return static_cast<ORBInitializer_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void pre_init (
-        ::PortableInterceptor::ORBInitInfo_ptr info
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void post_init (
-        ::PortableInterceptor::ORBInitInfo_ptr info
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // 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::ORBInitInfo_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::ORBInitInfo_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.
-    ORBInitializer (void);
-    
-    virtual ~ORBInitializer (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ORBInitializer (const ORBInitializer &);
-    
-    void operator= (const ORBInitializer &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBInitializer;
-
-// TAO_IDL - Generated from
-// 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_INTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_
@@ -2057,27 +1667,6 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::RequestInfo>
-  {
-    static ::PortableInterceptor::RequestInfo_ptr duplicate (
-        ::PortableInterceptor::RequestInfo_ptr
-      );
-    static void release (
-        ::PortableInterceptor::RequestInfo_ptr
-      );
-    static ::PortableInterceptor::RequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::RequestInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
   
@@ -2182,59 +1771,17 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#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 */
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ORBInitializer>
-  {
-    static ::PortableInterceptor::ORBInitializer_ptr duplicate (
-        ::PortableInterceptor::ORBInitializer_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ORBInitializer_ptr
-      );
-    static ::PortableInterceptor::ORBInitializer_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ORBInitializer_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Interceptor_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
+// 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::ForwardRequest &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version
@@ -2242,71 +1789,56 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ForwardRequest *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::InvalidSlot &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::InvalidSlot*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::InvalidSlot *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::InvalidSlot *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Current_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::RequestInfo_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr *); // non-copying
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// 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_visitor_interface/any_op_ch.cpp:52
+// 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
-// be\be_visitor_exception/any_op_ch.cpp:52
+// 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
@@ -2314,7 +1846,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
+// 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
@@ -2322,26 +1854,13 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitializer_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
+// 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 &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ForwardRequest &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::InvalidSlot &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// .\be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/TAO/tao/RequestInfo.pidl b/TAO/tao/RequestInfo.pidl
new file mode 100644
index 00000000000..5714a704de4
--- /dev/null
+++ b/TAO/tao/RequestInfo.pidl
@@ -0,0 +1,54 @@
+// -*- IDL -*-
+
+/**
+ * @file RequestInfo.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled RequestInfo
+ *
+ * This file was used to generate the code in RequestInfoC.*
+ * 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"
+ *          RequestInfo.pidl
+ */
+
+#ifndef _REQUESTINFO_PIDL_
+#define _REQUESTINFO_PIDL_
+
+#include <PI_Forward.pidl>
+#include <Dynamic.pidl>
+#include <Messaging_SyncScope.pidl>
+#include <InvalidSlot.pidl>
+#include <IOP_IOR.pidl>
+
+module PortableInterceptor {
+
+  typeprefix PortableInterceptor "omg.org";
+
+  local interface RequestInfo
+  {
+    readonly attribute unsigned long request_id;
+    readonly attribute string operation;
+    readonly attribute Dynamic::ParameterList arguments;
+    readonly attribute Dynamic::ExceptionList exceptions;
+    readonly attribute Dynamic::ContextList contexts;
+    readonly attribute Dynamic::RequestContext operation_context;
+    readonly attribute any result;
+    readonly attribute boolean response_expected;
+    readonly attribute Messaging::SyncScope sync_scope;
+    readonly attribute ReplyStatus reply_status;
+    readonly attribute Object forward_reference;
+    any get_slot (in SlotId id) raises (InvalidSlot);
+    IOP::ServiceContext get_request_service_context (in IOP::ServiceId id);
+    IOP::ServiceContext get_reply_service_context (in IOP::ServiceId id);
+  };
+};
+
+#endif  /* _REQUESTINFO_PIDL_ */
diff --git a/TAO/tao/RequestInfoA.cpp b/TAO/tao/RequestInfoA.cpp
new file mode 100644
index 00000000000..24715890e9b
--- /dev/null
+++ b/TAO/tao/RequestInfoA.cpp
@@ -0,0 +1,123 @@
+// -*- 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 "RequestInfoC.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/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_RequestInfo (
+    "IDL:omg.org/PortableInterceptor/RequestInfo:1.0",
+    "RequestInfo");
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_RequestInfo =
+    &_tao_tc_PortableInterceptor_RequestInfo;
+}
+
+
+
+// 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::RequestInfo>::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::RequestInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::RequestInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::RequestInfo_ptr _tao_objptr =
+    PortableInterceptor::RequestInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::RequestInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::insert (
+      _tao_any,
+      PortableInterceptor::RequestInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_RequestInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::RequestInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::extract (
+        _tao_any,
+        PortableInterceptor::RequestInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_RequestInfo,
+        _tao_elem
+      );
+}
diff --git a/TAO/tao/RequestInfoC.cpp b/TAO/tao/RequestInfoC.cpp
new file mode 100644
index 00000000000..fcb51f68945
--- /dev/null
+++ b/TAO/tao/RequestInfoC.cpp
@@ -0,0 +1,188 @@
+// -*- 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 "RequestInfoC.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::RequestInfo.
+
+PortableInterceptor::RequestInfo_ptr
+TAO::Objref_Traits<PortableInterceptor::RequestInfo>::duplicate (
+    PortableInterceptor::RequestInfo_ptr p
+  )
+{
+  return PortableInterceptor::RequestInfo::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release (
+    PortableInterceptor::RequestInfo_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableInterceptor::RequestInfo_ptr
+TAO::Objref_Traits<PortableInterceptor::RequestInfo>::nil (void)
+{
+  return PortableInterceptor::RequestInfo::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableInterceptor::RequestInfo>::marshal (
+    PortableInterceptor::RequestInfo_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableInterceptor::RequestInfo::RequestInfo (void)
+{}
+
+PortableInterceptor::RequestInfo::~RequestInfo (void)
+{}
+
+void 
+PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RequestInfo *_tao_tmp_pointer =
+    static_cast<RequestInfo *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return RequestInfo::_nil ();
+    }
+  
+  RequestInfo_ptr proxy =
+    dynamic_cast<RequestInfo_ptr> (_tao_objref);
+  
+  return RequestInfo::_duplicate (proxy);
+}
+
+PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return RequestInfo::_nil ();
+    }
+  
+  RequestInfo_ptr proxy =
+    dynamic_cast<RequestInfo_ptr> (_tao_objref);
+  
+  return RequestInfo::_duplicate (proxy);
+}
+
+PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+void
+PortableInterceptor::RequestInfo::_tao_release (RequestInfo_ptr obj)
+{
+  CORBA::release (obj);
+}
+
+CORBA::Boolean
+PortableInterceptor::RequestInfo::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableInterceptor/RequestInfo: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::RequestInfo::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/RequestInfo:1.0";
+}
+
+CORBA::Boolean
+PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &)
+{
+  return false;
+}
diff --git a/TAO/tao/RequestInfoC.h b/TAO/tao/RequestInfoC.h
new file mode 100644
index 00000000000..eb99d621da1
--- /dev/null
+++ b/TAO/tao/RequestInfoC.h
@@ -0,0 +1,367 @@
+// -*- 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_REQUESTINFOC_H_
+#define _TAO_IDL_ORIG_REQUESTINFOC_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/PI_ForwardC.h"
+#include "tao/DynamicC.h"
+#include "tao/Messaging_SyncScopeC.h"
+#include "tao/InvalidSlotC.h"
+#include "tao/IOP_IORC.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_REQUESTINFO__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_
+  
+  class RequestInfo;
+  typedef RequestInfo *RequestInfo_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        RequestInfo
+      >
+    RequestInfo_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        RequestInfo
+      >
+    RequestInfo_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_REQUESTINFO_CH_)
+#define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
+  
+  class TAO_Export RequestInfo
+    : public virtual CORBA::Object
+  {
+  public:
+    typedef RequestInfo_ptr _ptr_type;
+    typedef RequestInfo_var _var_type;
+    
+    // The static operations.
+    static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
+    
+    static void _tao_release (RequestInfo_ptr obj);
+    
+    static RequestInfo_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static RequestInfo_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static RequestInfo_ptr _nil (void)
+    {
+      return static_cast<RequestInfo_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::ULong request_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 char * operation (
+        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 ::Dynamic::ParameterList * 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 ::Dynamic::ExceptionList * exceptions (
+        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 ::Dynamic::ContextList * contexts (
+        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 ::Dynamic::RequestContext * operation_context (
+        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 CORBA::Any * result (
+        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 CORBA::Boolean response_expected (
+        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 Messaging::SyncScope sync_scope (
+        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 PortableInterceptor::ReplyStatus reply_status (
+        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 CORBA::Object_ptr forward_reference (
+        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 CORBA::Any * get_slot (
+        ::PortableInterceptor::SlotId id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        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 ::IOP::ServiceContext * get_request_service_context (
+        ::IOP::ServiceId id
+        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_operation/operation_ch.cpp:46
+    
+    virtual ::IOP::ServiceContext * get_reply_service_context (
+        ::IOP::ServiceId id
+        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.
+    RequestInfo (void);
+    
+    virtual ~RequestInfo (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    RequestInfo (const RequestInfo &);
+    
+    void operator= (const RequestInfo &);
+  };
+
+#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_RequestInfo;
+
+// 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_REQUESTINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_
+  
+  template<>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::RequestInfo>
+  {
+    static ::PortableInterceptor::RequestInfo_ptr duplicate (
+        ::PortableInterceptor::RequestInfo_ptr
+      );
+    static void release (
+        ::PortableInterceptor::RequestInfo_ptr
+      );
+    static ::PortableInterceptor::RequestInfo_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::RequestInfo_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::RequestInfo_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::RequestInfo_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/RequestInfoS.h b/TAO/tao/RequestInfoS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/RequestInfoS.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/diffs/PortableInterceptor.diff b/TAO/tao/diffs/PortableInterceptor.diff
index 15f2f8484b6..7801cfb2558 100644
--- a/TAO/tao/diffs/PortableInterceptor.diff
+++ b/TAO/tao/diffs/PortableInterceptor.diff
@@ -1,8 +1,8 @@
---- orig/PortableInterceptorC.h	2005-04-08 10:17:32.185961600 +0200
-+++ PortableInterceptorC.h	2005-04-08 10:20:18.725433600 +0200
-@@ -58,6 +58,12 @@
- #include "tao/orb_typesC.h"
+--- 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"
  
 +#include "PI_ForwardC.h"
 +#include "tao/Messaging_SyncScopeC.h"
@@ -13,7 +13,7 @@
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
  #endif
-@@ -72,6 +78,16 @@
+@@ -73,6 +79,16 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
@@ -28,34 +28,33 @@
 +// TAO_IDL - Generated from
 +
  // TAO_IDL - Generated from
- // be\be_visitor_module/module_ch.cpp:48
+ // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
  
-@@ -1323,17 +1339,19 @@
-     
+@@ -1318,15 +1334,19 @@
      // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
-+#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
+     // 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 (
          ::PortableInterceptor::ServerRequestInfo_ptr ri,
--        ::CORBA::OctetSeq_out os
+         ::CORBA::OctetSeq_out os
 -        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-+        CORBA::OctetSeq_out
 +        ACE_ENV_ARG_DECL_NOT_USED
        )
        ACE_THROW_SPEC ((
          CORBA::SystemException,
          ::PortableInterceptor::ForwardRequest
 -      )) = 0;
-+        )) {}
-     
++      )) {}
++
 +#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
-     // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
      
-@@ -1482,6 +1500,16 @@
-     
-     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
+@@ -1489,6 +1509,16 @@
+         ::CORBA::PolicyError
+       )) = 0;
      
 +    // Hand-crafted addition.
 +    virtual ::CORBA::Policy_ptr _create_policy (
@@ -68,11 +67,11 @@
 +      ));
 +
      // TAO_IDL - Generated from
-     // be\be_visitor_operation/operation_ch.cpp:46
+     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
      
---- orig/PortableInterceptorC.cpp	2005-04-08 10:17:32.195976000 +0200
-+++ PortableInterceptorC.cpp	2005-04-08 10:17:41.659584000 +0200
-@@ -1776,6 +1776,18 @@
+--- 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;
  }
  
@@ -89,5 +88,5 @@
 +}
 +
  // TAO_IDL - Generated from
- // be\be_visitor_interface/interface_cs.cpp:60
+ // 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 9ea7259d687..a463c2083ab 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -120,6 +120,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     IIOPC.cpp
     Incoming_Message_Queue.cpp
     Interceptor_List.cpp
+    InvalidSlotA.cpp
+    InvalidSlotC.cpp
     Invocation_Adapter.cpp
     Invocation_Base.cpp
     Invocation_Endpoint_Selectors.cpp
@@ -180,6 +182,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     ORB_Core_Auto_Ptr.cpp
     ORB_Table.cpp
     ORBInitializer_Registry.cpp
+    ORBInitializerA.cpp
+    ORBInitializerC.cpp
     ORBInitInfo.cpp
     ParameterModeA.cpp
     ParameterModeC.cpp
@@ -215,6 +219,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Remote_Object_Proxy_Broker.cpp
     Reply_Dispatcher.cpp
     Request_Dispatcher.cpp
+    RequestInfoA.cpp
+    RequestInfoC.cpp
     RequestInfo_Util.cpp
     Resource_Factory.cpp
     Resume_Handle.cpp
@@ -431,6 +437,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     IIOP_Transport.h
     Incoming_Message_Queue.h
     Interceptor_List.h
+    InvalidSlotC.h
+    InvalidSlotS.h
     Invocation_Adapter.h
     Invocation_Base.h
     Invocation_Endpoint_Selectors.h
@@ -498,6 +506,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     ORB_Core.h
     ORB.h
     ORBInitializer_Registry.h
+    ORBInitializerC.h
+    ORBInitializerS.h
     ORBInitInfo.h
     ORB_Table.h
     orb_typesC.h
@@ -541,6 +551,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Reply_Dispatcher.h
     Request_Dispatcher.h
     RequestInfo_Util.h
+    RequestInfoC.h
+    RequestInfoS.h
     Resource_Factory.h
     Resume_Handle.h
     Seq_Out_T.h