ChangeLogTag: Thu Apr 14 10:27:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

16 files changed, 1463 insertions, 946 deletions

diff --git a/TAO/tao/ClientRequestInfo.pidl b/TAO/tao/ClientRequestInfo.pidl
new file mode 100644
index 00000000000..fb1284ce1b4
--- /dev/null
+++ b/TAO/tao/ClientRequestInfo.pidl
@@ -0,0 +1,49 @@
+// -*- IDL -*-
+
+/**
+ * @file ClientRequestInfo.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled ClientRequestInfo
+ *
+ * This file was used to generate the code in ClientRequestInfoC.*
+ * 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"
+ *          ClientRequestInfo.pidl
+ */
+
+#ifndef _CLIENT_REQUESTINFO_PIDL_
+#define _CLIENT_REQUESTINFO_PIDL_
+
+#include <RequestInfo.pidl>
+#include <orb_types.pidl>
+#include <Policy_Forward.pidl>
+
+module PortableInterceptor {
+
+  typeprefix PortableInterceptor "omg.org";
+
+  local interface ClientRequestInfo : RequestInfo
+  {
+    readonly attribute Object target;
+    readonly attribute Object effective_target;
+    readonly attribute IOP::TaggedProfile effective_profile;
+    readonly attribute any received_exception;
+    readonly attribute CORBA::RepositoryId received_exception_id;
+    IOP::TaggedComponent get_effective_component (in IOP::ComponentId id);
+    IOP::TaggedComponentSeq get_effective_components (in IOP::ComponentId id);
+    CORBA::Policy get_request_policy (in CORBA::PolicyType type);
+    void add_request_service_context (
+      in IOP::ServiceContext service_context,
+      in boolean replace);
+  };
+};
+
+#endif  /* _CLIENT_REQUESTINFO_PIDL_ */
diff --git a/TAO/tao/ClientRequestInfoA.cpp b/TAO/tao/ClientRequestInfoA.cpp
new file mode 100644
index 00000000000..49f5c488b82
--- /dev/null
+++ b/TAO/tao/ClientRequestInfoA.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 "ClientRequestInfoC.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_ClientRequestInfo (
+    "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0",
+    "ClientRequestInfo");
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo =
+    &_tao_tc_PortableInterceptor_ClientRequestInfo;
+}
+
+
+
+// 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::ClientRequestInfo>::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::ClientRequestInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ClientRequestInfo_ptr _tao_objptr =
+    PortableInterceptor::ClientRequestInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::insert (
+      _tao_any,
+      PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_ClientRequestInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ClientRequestInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::extract (
+        _tao_any,
+        PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_ClientRequestInfo,
+        _tao_elem
+      );
+}
diff --git a/TAO/tao/ClientRequestInfoC.cpp b/TAO/tao/ClientRequestInfoC.cpp
new file mode 100644
index 00000000000..1d0f6a5f6ee
--- /dev/null
+++ b/TAO/tao/ClientRequestInfoC.cpp
@@ -0,0 +1,192 @@
+// -*- 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 "ClientRequestInfoC.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::ClientRequestInfo.
+
+PortableInterceptor::ClientRequestInfo_ptr
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::duplicate (
+    PortableInterceptor::ClientRequestInfo_ptr p
+  )
+{
+  return PortableInterceptor::ClientRequestInfo::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release (
+    PortableInterceptor::ClientRequestInfo_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableInterceptor::ClientRequestInfo_ptr
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::nil (void)
+{
+  return PortableInterceptor::ClientRequestInfo::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::marshal (
+    PortableInterceptor::ClientRequestInfo_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
+{}
+
+PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
+{}
+
+void 
+PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ClientRequestInfo *_tao_tmp_pointer =
+    static_cast<ClientRequestInfo *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ClientRequestInfo::_nil ();
+    }
+  
+  ClientRequestInfo_ptr proxy =
+    dynamic_cast<ClientRequestInfo_ptr> (_tao_objref);
+  
+  return ClientRequestInfo::_duplicate (proxy);
+}
+
+PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ClientRequestInfo::_nil ();
+    }
+  
+  ClientRequestInfo_ptr proxy =
+    dynamic_cast<ClientRequestInfo_ptr> (_tao_objref);
+  
+  return ClientRequestInfo::_duplicate (proxy);
+}
+
+PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+void
+PortableInterceptor::ClientRequestInfo::_tao_release (ClientRequestInfo_ptr obj)
+{
+  CORBA::release (obj);
+}
+
+CORBA::Boolean
+PortableInterceptor::ClientRequestInfo::_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/PortableInterceptor/ClientRequestInfo: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::ClientRequestInfo::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0";
+}
+
+CORBA::Boolean
+PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
+{
+  return false;
+}
diff --git a/TAO/tao/ClientRequestInfoC.h b/TAO/tao/ClientRequestInfoC.h
new file mode 100644
index 00000000000..431fe9b1b3c
--- /dev/null
+++ b/TAO/tao/ClientRequestInfoC.h
@@ -0,0 +1,316 @@
+// -*- 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_CLIENTREQUESTINFOC_H_
+#define _TAO_IDL_ORIG_CLIENTREQUESTINFOC_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/RequestInfoC.h"
+#include "tao/orb_typesC.h"
+#include "tao/Policy_ForwardC.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_CLIENTREQUESTINFO__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
+  
+  class ClientRequestInfo;
+  typedef ClientRequestInfo *ClientRequestInfo_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ClientRequestInfo
+      >
+    ClientRequestInfo_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ClientRequestInfo
+      >
+    ClientRequestInfo_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_CLIENTREQUESTINFO_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
+  
+  class TAO_Export ClientRequestInfo
+    : public virtual ::PortableInterceptor::RequestInfo
+  {
+  public:
+    typedef ClientRequestInfo_ptr _ptr_type;
+    typedef ClientRequestInfo_var _var_type;
+    
+    // The static operations.
+    static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
+    
+    static void _tao_release (ClientRequestInfo_ptr obj);
+    
+    static ClientRequestInfo_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ClientRequestInfo_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ClientRequestInfo_ptr _nil (void)
+    {
+      return static_cast<ClientRequestInfo_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::Object_ptr target (
+        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 effective_target (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::IOP::TaggedProfile * effective_profile (
+        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 * received_exception (
+        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 * received_exception_id (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::IOP::TaggedComponent * get_effective_component (
+        ::IOP::ComponentId 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::TaggedComponentSeq * get_effective_components (
+        ::IOP::ComponentId 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 ::CORBA::Policy_ptr get_request_policy (
+        ::CORBA::PolicyType type
+        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 add_request_service_context (
+        const ::IOP::ServiceContext & service_context,
+        ::CORBA::Boolean replace
+        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.
+    ClientRequestInfo (void);
+    
+    virtual ~ClientRequestInfo (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ClientRequestInfo (const ClientRequestInfo &);
+    
+    void operator= (const ClientRequestInfo &);
+  };
+
+#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_ClientRequestInfo;
+
+// 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_CLIENTREQUESTINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
+  
+  template<>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
+  {
+    static ::PortableInterceptor::ClientRequestInfo_ptr duplicate (
+        ::PortableInterceptor::ClientRequestInfo_ptr
+      );
+    static void release (
+        ::PortableInterceptor::ClientRequestInfo_ptr
+      );
+    static ::PortableInterceptor::ClientRequestInfo_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::ClientRequestInfo_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::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_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/ClientRequestInfoS.h b/TAO/tao/ClientRequestInfoS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/ClientRequestInfoS.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 67e6888a1b9..586daabda8b 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -68,6 +68,8 @@ libTAO_la_SOURCES = \
   CharSeqC.cpp \
   Cleanup_Func_Registry.cpp \
   ClientRequestInfo.cpp \
+  ClientRequestInfoA.cpp \
+  ClientRequestInfoC.cpp \
   ClientRequestInfo_i.cpp \
   ClientRequestInterceptor_Adapter.cpp \
   Client_Strategy_Factory.cpp \
@@ -243,6 +245,8 @@ libTAO_la_SOURCES = \
   Resume_Handle.cpp \
   Sequence.cpp \
   Server_Strategy_Factory.cpp \
+  ServerRequestInfoA.cpp \
+  ServerRequestInfoC.cpp \
   Service_Callbacks.cpp \
   Service_Context.cpp \
   ServicesC.cpp \
@@ -423,6 +427,9 @@ nobase_include_HEADERS = \
   Cleanup_Func_Registry.h \
   Cleanup_Func_Registry.inl \
   ClientRequestInfo.h \
+  ClientRequestInfoC.h \
+  ClientRequestInfoS.h \
+  ClientRequestInfo.pidl \
   ClientRequestInfo.inl \
   ClientRequestInfo_i.h \
   ClientRequestInfo_i.inl \
@@ -738,6 +745,9 @@ nobase_include_HEADERS = \
   Sequence_TypeCode.h \
   Sequence_TypeCode.inl \
   Server_Strategy_Factory.h \
+  ServerRequestInfoC.h \
+  ServerRequestInfoS.h \
+  ServerRequestInfo.pidl \
   Service_Callbacks.h \
   Service_Context.h \
   Service_Context.inl \
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 077f45fa273..0c902810134 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -43,12 +43,12 @@
 #include <Messaging_SyncScope.pidl>
 #include <IOP_Codec.pidl>
 #include <IOP_IOR.pidl>
-#include <orb_types.pidl>
 #include <Policy.pidl>
 
 #include <ORBInitializer.pidl>
 #include <InvalidSlot.pidl>
-#include <RequestInfo.pidl>
+#include <ClientRequestInfo.pidl>
+#include <ServerRequestInfo.pidl>
 
 module PortableInterceptor {
 
@@ -85,38 +85,6 @@ module PortableInterceptor {
     void set_slot (in SlotId id, in any data) raises (InvalidSlot);
   };
 
-  local interface ClientRequestInfo : RequestInfo
-  {
-    readonly attribute Object target;
-    readonly attribute Object effective_target;
-    readonly attribute IOP::TaggedProfile effective_profile;
-    readonly attribute any received_exception;
-    readonly attribute CORBA::RepositoryId received_exception_id;
-    IOP::TaggedComponent get_effective_component (in IOP::ComponentId id);
-    IOP::TaggedComponentSeq get_effective_components (in IOP::ComponentId id);
-    CORBA::Policy get_request_policy (in CORBA::PolicyType type);
-    void add_request_service_context (
-      in IOP::ServiceContext service_context,
-      in boolean replace);
-  };
-
-  local interface ServerRequestInfo : RequestInfo
-  {
-    readonly attribute any sending_exception;
-    readonly attribute ServerId server_id;
-    readonly attribute ORBId orb_id;
-    readonly attribute AdapterName adapter_name;
-    readonly attribute ObjectId object_id;
-    readonly attribute CORBA::OctetSeq adapter_id;
-    readonly attribute CORBA::RepositoryId target_most_derived_interface;
-    CORBA::Policy get_server_policy (in CORBA::PolicyType type);
-    void set_slot (in SlotId id, in any data) raises (InvalidSlot);
-    boolean target_is_a (in CORBA::RepositoryId id);
-    void add_reply_service_context (
-      in IOP::ServiceContext service_context,
-      in boolean replace);
-  };
-
   local interface ClientRequestInterceptor : Interceptor
   {
     void send_request  (in ClientRequestInfo ri) raises (ForwardRequest);
diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp
index e336b6b791d..2fa26178802 100644
--- a/TAO/tao/PortableInterceptorA.cpp
+++ b/TAO/tao/PortableInterceptorA.cpp
@@ -107,42 +107,6 @@ namespace PortableInterceptor
 static TAO::TypeCode::Objref<char const *,
                              CORBA::tk_local_interface,
                              TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ClientRequestInfo (
-    "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0",
-    "ClientRequestInfo");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo =
-    &_tao_tc_PortableInterceptor_ClientRequestInfo;
-}
-
-
-
-// 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_ServerRequestInfo (
-    "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0",
-    "ServerRequestInfo");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo =
-    &_tao_tc_PortableInterceptor_ServerRequestInfo;
-}
-
-
-
-// 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_ClientRequestInterceptor (
     "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0",
     "ClientRequestInterceptor");
@@ -494,144 +458,6 @@ operator>>= (
 
 template<>
 CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::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::ClientRequestInfo>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ClientRequestInfo_ptr _tao_objptr =
-    PortableInterceptor::ClientRequestInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::insert (
-      _tao_any,
-      PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_ClientRequestInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ClientRequestInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::extract (
-        _tao_any,
-        PortableInterceptor::ClientRequestInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_ClientRequestInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::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::ServerRequestInfo>::marshal_value (TAO_OutputCDR &)
-{
-  return false;
-}
-
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
-{
-  return false;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::ServerRequestInfo_ptr _tao_objptr =
-    PortableInterceptor::ServerRequestInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::insert (
-      _tao_any,
-      PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_ServerRequestInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::ServerRequestInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::extract (
-        _tao_any,
-        PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_ServerRequestInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
-
-template<>
-CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::to_object (
     CORBA::Object_ptr &_tao_elem
   ) const
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 81add43d28e..344e19b9208 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -459,296 +459,6 @@ PortableInterceptor::Current::marshal (TAO_OutputCDR &)
 // TAO_IDL - Generated from
 // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
 
-// Traits specializations for PortableInterceptor::ClientRequestInfo.
-
-PortableInterceptor::ClientRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::duplicate (
-    PortableInterceptor::ClientRequestInfo_ptr p
-  )
-{
-  return PortableInterceptor::ClientRequestInfo::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release (
-    PortableInterceptor::ClientRequestInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ClientRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::nil (void)
-{
-  return PortableInterceptor::ClientRequestInfo::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::marshal (
-    PortableInterceptor::ClientRequestInfo_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
-{}
-
-PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
-{}
-
-void 
-PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ClientRequestInfo *_tao_tmp_pointer =
-    static_cast<ClientRequestInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientRequestInfo::_nil ();
-    }
-  
-  ClientRequestInfo_ptr proxy =
-    dynamic_cast<ClientRequestInfo_ptr> (_tao_objref);
-  
-  return ClientRequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ClientRequestInfo::_nil ();
-    }
-  
-  ClientRequestInfo_ptr proxy =
-    dynamic_cast<ClientRequestInfo_ptr> (_tao_objref);
-  
-  return ClientRequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ClientRequestInfo::_tao_release (ClientRequestInfo_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::ClientRequestInfo::_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/PortableInterceptor/ClientRequestInfo: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::ClientRequestInfo::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::ServerRequestInfo.
-
-PortableInterceptor::ServerRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::duplicate (
-    PortableInterceptor::ServerRequestInfo_ptr p
-  )
-{
-  return PortableInterceptor::ServerRequestInfo::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release (
-    PortableInterceptor::ServerRequestInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ServerRequestInfo_ptr
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void)
-{
-  return PortableInterceptor::ServerRequestInfo::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal (
-    PortableInterceptor::ServerRequestInfo_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
-{}
-
-PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
-{}
-
-void 
-PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServerRequestInfo *_tao_tmp_pointer =
-    static_cast<ServerRequestInfo *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerRequestInfo::_nil ();
-    }
-  
-  ServerRequestInfo_ptr proxy =
-    dynamic_cast<ServerRequestInfo_ptr> (_tao_objref);
-  
-  return ServerRequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServerRequestInfo::_nil ();
-    }
-  
-  ServerRequestInfo_ptr proxy =
-    dynamic_cast<ServerRequestInfo_ptr> (_tao_objref);
-  
-  return ServerRequestInfo::_duplicate (proxy);
-}
-
-PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ServerRequestInfo::_tao_release (ServerRequestInfo_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-CORBA::Boolean
-PortableInterceptor::ServerRequestInfo::_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/PortableInterceptor/ServerRequestInfo: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::ServerRequestInfo::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
 // Traits specializations for PortableInterceptor::ClientRequestInterceptor.
 
 PortableInterceptor::ClientRequestInterceptor_ptr
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index ed98feedd8f..a86d8198e08 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -55,11 +55,11 @@
 #include "tao/Messaging_SyncScopeC.h"
 #include "tao/IOP_CodecC.h"
 #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 "tao/ClientRequestInfoC.h"
+#include "tao/ServerRequestInfoC.h"
 
 #include "PI_ForwardC.h"
 #include "tao/Messaging_SyncScopeC.h"
@@ -436,396 +436,6 @@ namespace PortableInterceptor
   // TAO_IDL - Generated from
   // .\be\be_interface.cpp:598
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
-  
-  class ClientRequestInfo;
-  typedef ClientRequestInfo *ClientRequestInfo_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ClientRequestInfo
-      >
-    ClientRequestInfo_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ClientRequestInfo
-      >
-    ClientRequestInfo_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_CLIENTREQUESTINFO_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
-  
-  class TAO_Export ClientRequestInfo
-    : public virtual ::PortableInterceptor::RequestInfo
-  {
-  public:
-    typedef ClientRequestInfo_ptr _ptr_type;
-    typedef ClientRequestInfo_var _var_type;
-    
-    // The static operations.
-    static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
-    
-    static void _tao_release (ClientRequestInfo_ptr obj);
-    
-    static ClientRequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ClientRequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ClientRequestInfo_ptr _nil (void)
-    {
-      return static_cast<ClientRequestInfo_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::Object_ptr target (
-        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 effective_target (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::TaggedProfile * effective_profile (
-        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 * received_exception (
-        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 * received_exception_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::IOP::TaggedComponent * get_effective_component (
-        ::IOP::ComponentId 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::TaggedComponentSeq * get_effective_components (
-        ::IOP::ComponentId 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 ::CORBA::Policy_ptr get_request_policy (
-        ::CORBA::PolicyType type
-        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 add_request_service_context (
-        const ::IOP::ServiceContext & service_context,
-        ::CORBA::Boolean replace
-        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.
-    ClientRequestInfo (void);
-    
-    virtual ~ClientRequestInfo (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ClientRequestInfo (const ClientRequestInfo &);
-    
-    void operator= (const ClientRequestInfo &);
-  };
-
-#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_ClientRequestInfo;
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
-  
-  class ServerRequestInfo;
-  typedef ServerRequestInfo *ServerRequestInfo_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ServerRequestInfo
-      >
-    ServerRequestInfo_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ServerRequestInfo
-      >
-    ServerRequestInfo_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_SERVERREQUESTINFO_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
-  
-  class TAO_Export ServerRequestInfo
-    : public virtual ::PortableInterceptor::RequestInfo
-  {
-  public:
-    typedef ServerRequestInfo_ptr _ptr_type;
-    typedef ServerRequestInfo_var _var_type;
-    
-    // The static operations.
-    static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
-    
-    static void _tao_release (ServerRequestInfo_ptr obj);
-    
-    static ServerRequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServerRequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServerRequestInfo_ptr _nil (void)
-    {
-      return static_cast<ServerRequestInfo_ptr> (0);
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Any * sending_exception (
-        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 * server_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 * orb_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableInterceptor::AdapterName * adapter_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableInterceptor::ObjectId * object_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 ::CORBA::OctetSeq * adapter_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 * target_most_derived_interface (
-        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::Policy_ptr get_server_policy (
-        ::CORBA::PolicyType type
-        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 set_slot (
-        ::PortableInterceptor::SlotId id,
-        const ::CORBA::Any & data
-        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 CORBA::Boolean target_is_a (
-        const char * 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 void add_reply_service_context (
-        const ::IOP::ServiceContext & service_context,
-        ::CORBA::Boolean replace
-        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.
-    ServerRequestInfo (void);
-    
-    virtual ~ServerRequestInfo (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServerRequestInfo (const ServerRequestInfo &);
-    
-    void operator= (const ServerRequestInfo &);
-  };
-
-#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_ServerRequestInfo;
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
   
@@ -1667,48 +1277,6 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
-  {
-    static ::PortableInterceptor::ClientRequestInfo_ptr duplicate (
-        ::PortableInterceptor::ClientRequestInfo_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ClientRequestInfo_ptr
-      );
-    static ::PortableInterceptor::ClientRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ClientRequestInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-  
-  template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
-  {
-    static ::PortableInterceptor::ServerRequestInfo_ptr duplicate (
-        ::PortableInterceptor::ServerRequestInfo_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ServerRequestInfo_ptr
-      );
-    static ::PortableInterceptor::ServerRequestInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableInterceptor::ServerRequestInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_
   
@@ -1798,20 +1366,6 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::
 // 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::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
-// 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
-// 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 &);
diff --git a/TAO/tao/ServerRequestInfo.pidl b/TAO/tao/ServerRequestInfo.pidl
new file mode 100644
index 00000000000..f4f99d380a1
--- /dev/null
+++ b/TAO/tao/ServerRequestInfo.pidl
@@ -0,0 +1,51 @@
+// -*- IDL -*-
+
+/**
+ * @file ServerRequestInfo.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled RequestInfo
+ *
+ * This file was used to generate the code in ServerRequestInfoC.*
+ * 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"
+ *          ServerRequestInfo.pidl
+ */
+
+#ifndef _SERVER_REQUESTINFO_PIDL_
+#define _SERVER_REQUESTINFO_PIDL_
+
+#include <RequestInfo.pidl>
+#include <orb_types.pidl>
+#include <Policy_Forward.pidl>
+
+module PortableInterceptor {
+
+  typeprefix PortableInterceptor "omg.org";
+
+  local interface ServerRequestInfo : RequestInfo
+  {
+    readonly attribute any sending_exception;
+    readonly attribute ServerId server_id;
+    readonly attribute ORBId orb_id;
+    readonly attribute AdapterName adapter_name;
+    readonly attribute ObjectId object_id;
+    readonly attribute CORBA::OctetSeq adapter_id;
+    readonly attribute CORBA::RepositoryId target_most_derived_interface;
+    CORBA::Policy get_server_policy (in CORBA::PolicyType type);
+    void set_slot (in SlotId id, in any data) raises (InvalidSlot);
+    boolean target_is_a (in CORBA::RepositoryId id);
+    void add_reply_service_context (
+      in IOP::ServiceContext service_context,
+      in boolean replace);
+  };
+};
+
+#endif  /* _SERVER_REQUESTINFO_PIDL_ */
diff --git a/TAO/tao/ServerRequestInfoA.cpp b/TAO/tao/ServerRequestInfoA.cpp
new file mode 100644
index 00000000000..e39deca8692
--- /dev/null
+++ b/TAO/tao/ServerRequestInfoA.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 "ServerRequestInfoC.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_ServerRequestInfo (
+    "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0",
+    "ServerRequestInfo");
+  
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo =
+    &_tao_tc_PortableInterceptor_ServerRequestInfo;
+}
+
+
+
+// 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::ServerRequestInfo>::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::ServerRequestInfo>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInfo_ptr _tao_elem
+  )
+{
+  PortableInterceptor::ServerRequestInfo_ptr _tao_objptr =
+    PortableInterceptor::ServerRequestInfo::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInfo_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::insert (
+      _tao_any,
+      PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
+      PortableInterceptor::_tc_ServerRequestInfo,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableInterceptor::ServerRequestInfo_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::extract (
+        _tao_any,
+        PortableInterceptor::ServerRequestInfo::_tao_any_destructor,
+        PortableInterceptor::_tc_ServerRequestInfo,
+        _tao_elem
+      );
+}
diff --git a/TAO/tao/ServerRequestInfoC.cpp b/TAO/tao/ServerRequestInfoC.cpp
new file mode 100644
index 00000000000..5a0669c22f0
--- /dev/null
+++ b/TAO/tao/ServerRequestInfoC.cpp
@@ -0,0 +1,193 @@
+// -*- 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 "ServerRequestInfoC.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.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::ServerRequestInfo.
+
+PortableInterceptor::ServerRequestInfo_ptr
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::duplicate (
+    PortableInterceptor::ServerRequestInfo_ptr p
+  )
+{
+  return PortableInterceptor::ServerRequestInfo::_duplicate (p);
+}
+
+void
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release (
+    PortableInterceptor::ServerRequestInfo_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableInterceptor::ServerRequestInfo_ptr
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void)
+{
+  return PortableInterceptor::ServerRequestInfo::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal (
+    PortableInterceptor::ServerRequestInfo_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
+{}
+
+PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
+{}
+
+void 
+PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServerRequestInfo *_tao_tmp_pointer =
+    static_cast<ServerRequestInfo *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ServerRequestInfo::_nil ();
+    }
+  
+  ServerRequestInfo_ptr proxy =
+    dynamic_cast<ServerRequestInfo_ptr> (_tao_objref);
+  
+  return ServerRequestInfo::_duplicate (proxy);
+}
+
+PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ServerRequestInfo::_nil ();
+    }
+  
+  ServerRequestInfo_ptr proxy =
+    dynamic_cast<ServerRequestInfo_ptr> (_tao_objref);
+  
+  return ServerRequestInfo::_duplicate (proxy);
+}
+
+PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+void
+PortableInterceptor::ServerRequestInfo::_tao_release (ServerRequestInfo_ptr obj)
+{
+  CORBA::release (obj);
+}
+
+CORBA::Boolean
+PortableInterceptor::ServerRequestInfo::_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/PortableInterceptor/ServerRequestInfo: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::ServerRequestInfo::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0";
+}
+
+CORBA::Boolean
+PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
+{
+  return false;
+}
diff --git a/TAO/tao/ServerRequestInfoC.h b/TAO/tao/ServerRequestInfoC.h
new file mode 100644
index 00000000000..43ecdf8bb84
--- /dev/null
+++ b/TAO/tao/ServerRequestInfoC.h
@@ -0,0 +1,338 @@
+// -*- 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_SERVERREQUESTINFOC_H_
+#define _TAO_IDL_ORIG_SERVERREQUESTINFOC_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/RequestInfoC.h"
+#include "tao/orb_typesC.h"
+#include "tao/Policy_ForwardC.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_SERVERREQUESTINFO__VAR_OUT_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
+  
+  class ServerRequestInfo;
+  typedef ServerRequestInfo *ServerRequestInfo_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ServerRequestInfo
+      >
+    ServerRequestInfo_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ServerRequestInfo
+      >
+    ServerRequestInfo_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_SERVERREQUESTINFO_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
+  
+  class TAO_Export ServerRequestInfo
+    : public virtual ::PortableInterceptor::RequestInfo
+  {
+  public:
+    typedef ServerRequestInfo_ptr _ptr_type;
+    typedef ServerRequestInfo_var _var_type;
+    
+    // The static operations.
+    static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
+    
+    static void _tao_release (ServerRequestInfo_ptr obj);
+    
+    static ServerRequestInfo_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ServerRequestInfo_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static ServerRequestInfo_ptr _nil (void)
+    {
+      return static_cast<ServerRequestInfo_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Any * sending_exception (
+        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 * server_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 * orb_id (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableInterceptor::AdapterName * adapter_name (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableInterceptor::ObjectId * object_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 ::CORBA::OctetSeq * adapter_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 * target_most_derived_interface (
+        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::Policy_ptr get_server_policy (
+        ::CORBA::PolicyType type
+        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 set_slot (
+        ::PortableInterceptor::SlotId id,
+        const ::CORBA::Any & data
+        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 CORBA::Boolean target_is_a (
+        const char * 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 void add_reply_service_context (
+        const ::IOP::ServiceContext & service_context,
+        ::CORBA::Boolean replace
+        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.
+    ServerRequestInfo (void);
+    
+    virtual ~ServerRequestInfo (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ServerRequestInfo (const ServerRequestInfo &);
+    
+    void operator= (const ServerRequestInfo &);
+  };
+
+#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_ServerRequestInfo;
+
+// 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_SERVERREQUESTINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
+  
+  template<>
+  struct TAO_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
+  {
+    static ::PortableInterceptor::ServerRequestInfo_ptr duplicate (
+        ::PortableInterceptor::ServerRequestInfo_ptr
+      );
+    static void release (
+        ::PortableInterceptor::ServerRequestInfo_ptr
+      );
+    static ::PortableInterceptor::ServerRequestInfo_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::ServerRequestInfo_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::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_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/ServerRequestInfoS.h b/TAO/tao/ServerRequestInfoS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/ServerRequestInfoS.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/tao.mpc b/TAO/tao/tao.mpc
index 7b4bd99bad1..ca466471c04 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -42,6 +42,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Cleanup_Func_Registry.cpp
     Client_Strategy_Factory.cpp
     ClientRequestInfo.cpp
+    ClientRequestInfoA.cpp
+    ClientRequestInfoC.cpp
     ClientRequestInfo_i.cpp
     ClientRequestInterceptor_Adapter.cpp
     CodecFactory.cpp
@@ -226,6 +228,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Resume_Handle.cpp
     Sequence.cpp
     Server_Strategy_Factory.cpp
+    ServerRequestInfoA.cpp
+    ServerRequestInfoC.cpp
     Service_Callbacks.cpp
     Service_Context.cpp
     Services_Activate.cpp
@@ -348,6 +352,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     CharSeqS.h
     Cleanup_Func_Registry.h
     ClientRequestInfo.h
+    ClientRequestInfoC.h
+    ClientRequestInfoS.h
     ClientRequestInfo_i.h
     ClientRequestInterceptor_Adapter.h
     Client_Strategy_Factory.h
@@ -564,6 +570,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Sequence_TypeCode.h
     Seq_Var_T.h
     Server_Strategy_Factory.h
+    ServerRequestInfoC.h
+    ServerRequestInfoS.h
     Service_Callbacks.h
     Service_Context.h
     Services_Activate.h