ChangeLogTag: Mon Apr 29 15:00:59 2002 Balachandran Natarajan <bala@cs.wustl.edu>

6 files changed, 836 insertions, 0 deletions

diff --git a/TAO/tao/Messaging/Makefile b/TAO/tao/Messaging/Makefile
index 84348dbcbd9..5182fc79289 100644
--- a/TAO/tao/Messaging/Makefile
+++ b/TAO/tao/Messaging/Makefile
@@ -21,6 +21,7 @@ CPP_SRCS += \
   Messaging \
   MessagingC \
   MessagingS \
+  TAO_ExtC \
   Messaging_ORBInitializer \
   Messaging_PolicyFactory \
   Messaging_Policy_i
diff --git a/TAO/tao/Messaging/TAO_Ext.pidl b/TAO/tao/Messaging/TAO_Ext.pidl
new file mode 100644
index 00000000000..16d357cb1ad
--- /dev/null
+++ b/TAO/tao/Messaging/TAO_Ext.pidl
@@ -0,0 +1,62 @@
+// -*- IDL -*-
+
+// ================================================================
+/**
+ *  @file TAO_Ext.pidl
+ *
+ *  $Id$
+ *
+ *  This file contains extensions to the TAO-specific idl interfaces
+ *  (not part of CORBA  2.6) defined in $TAO_ROOT/tao
+ *
+ *  The steps to regenerate the code are as follows:
+ *
+ * 1. Run the tao_idl compiler on the pidl file.  The command used for
+ *   this is:
+ *
+ *   tao_idl
+ *       -o orig -Gp -Gd -Ge 1 -Gv -DCORBA3
+ *       -Wb,export_macro=TAO_Export
+ *       -Wb,pre_include="ace/pre.h"
+ *       -Wb,post_include="ace/post.h"
+ *       -Wb,export_include="tao/corbafwd.h" TAO_Ext.pidl
+ *
+ *   2. Then patch the generated code.  The patch fixes the interface
+ *   repository IDs, disables the code under certain configurations,
+ *   and eliminates cycles in the include dependencies.
+ *
+ *   Apply patches using the following commands:
+ *
+ *   patch < diffs/TAO_ExtC.h.diff
+ *   patch < diffs/TAO_ExtC.i.diff
+ *   patch < diffs/TAO_ExtC.cpp.diff
+ *
+ *   @note The diffs were generated with these commands:
+ *
+ *   diff -wBbu orig/TAOC.h TAOC.h > diffs/TAOC.h.diff
+ *   diff -wBbu orig/TAOC.i TAOC.i > diffs/TAOC.i.diff
+ *   diff -wBbu orig/TAOC.cpp TAOC.cpp > diffs/TAOC.cpp.diff
+ */
+// ================================================================
+
+#ifndef TAO_TAO_EXT_IDL
+#define TAO_TAO_EXT_IDL
+
+#include "Policy.pidl"
+#include "TimeBase.pidl"
+
+#pragma prefix "tao"
+
+module TAO
+{
+  const CORBA::PolicyType CONNECTION_TIMEOUT_POLICY_TYPE = 0x54410008;
+
+    local interface ConnectionTimeoutPolicy : CORBA::Policy {
+    readonly attribute TimeBase::TimeT relative_expiry;
+    };
+
+};
+
+#pragma prefix ""
+
+#endif /* TAO_TAO_EXT_IDL */
diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp
new file mode 100644
index 00000000000..499cd0228e5
--- /dev/null
+++ b/TAO/tao/Messaging/TAO_ExtC.cpp
@@ -0,0 +1,484 @@
+// -*- 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/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "TAO_ExtC.h"
+
+#include "tao/Stub.h"
+#include "tao/Invocation.h"
+#include "tao/PortableInterceptor.h"
+
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo_i.h"
+#include "tao/ClientInterceptorAdapter.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "TAO_ExtC.i"
+#endif /* !defined INLINE */
+
+TAO_NAMESPACE_TYPE (const CORBA::ULong)
+TAO_NAMESPACE_BEGIN (TAO)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, CONNECTION_TIMEOUT_POLICY_TYPE, 1413545992U)
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:67
+
+int TAO::ConnectionTimeoutPolicy::_tao_class_id = 0;
+
+TAO::ConnectionTimeoutPolicy_ptr
+tao_TAO_ConnectionTimeoutPolicy_duplicate (
+    TAO::ConnectionTimeoutPolicy_ptr p
+  )
+{
+  return TAO::ConnectionTimeoutPolicy::_duplicate (p);
+}
+
+void
+tao_TAO_ConnectionTimeoutPolicy_release (
+    TAO::ConnectionTimeoutPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+TAO::ConnectionTimeoutPolicy_ptr
+tao_TAO_ConnectionTimeoutPolicy_nil (
+    void
+  )
+{
+  return TAO::ConnectionTimeoutPolicy::_nil ();
+}
+
+TAO::ConnectionTimeoutPolicy_ptr
+tao_TAO_ConnectionTimeoutPolicy_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return TAO::ConnectionTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+tao_TAO_ConnectionTimeoutPolicy_upcast (
+    void *src
+  )
+{
+  TAO::ConnectionTimeoutPolicy **tmp =
+    ACE_static_cast (TAO::ConnectionTimeoutPolicy **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// TAO::ConnectionTimeoutPolicy_var
+// TAO_IDL - Generated from
+// be/be_interface.cpp:654
+// *************************************************************
+
+TAO::ConnectionTimeoutPolicy_var::ConnectionTimeoutPolicy_var (void) // default constructor
+  : ptr_ (ConnectionTimeoutPolicy::_nil ())
+{}
+
+::TAO::ConnectionTimeoutPolicy_ptr
+TAO::ConnectionTimeoutPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+TAO::ConnectionTimeoutPolicy_var::ConnectionTimeoutPolicy_var (const ::TAO::ConnectionTimeoutPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ConnectionTimeoutPolicy::_duplicate (p.ptr ()))
+{}
+
+TAO::ConnectionTimeoutPolicy_var::~ConnectionTimeoutPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+TAO::ConnectionTimeoutPolicy_var &
+TAO::ConnectionTimeoutPolicy_var::operator= (ConnectionTimeoutPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO::ConnectionTimeoutPolicy_var &
+TAO::ConnectionTimeoutPolicy_var::operator= (const ::TAO::ConnectionTimeoutPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+TAO::ConnectionTimeoutPolicy_var::operator const ::TAO::ConnectionTimeoutPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+TAO::ConnectionTimeoutPolicy_var::operator ::TAO::ConnectionTimeoutPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::TAO::ConnectionTimeoutPolicy_ptr
+TAO::ConnectionTimeoutPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::TAO::ConnectionTimeoutPolicy_ptr
+TAO::ConnectionTimeoutPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::TAO::ConnectionTimeoutPolicy_ptr &
+TAO::ConnectionTimeoutPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::TAO::ConnectionTimeoutPolicy_ptr &
+TAO::ConnectionTimeoutPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_nil ();
+  return this->ptr_;
+}
+
+::TAO::ConnectionTimeoutPolicy_ptr
+TAO::ConnectionTimeoutPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::TAO::ConnectionTimeoutPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_nil ();
+  return val;
+}
+
+::TAO::ConnectionTimeoutPolicy_ptr
+TAO::ConnectionTimeoutPolicy_var::tao_duplicate (ConnectionTimeoutPolicy_ptr p)
+{
+  return ::TAO::ConnectionTimeoutPolicy::_duplicate (p);
+}
+
+void
+TAO::ConnectionTimeoutPolicy_var::tao_release (ConnectionTimeoutPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::TAO::ConnectionTimeoutPolicy_ptr
+TAO::ConnectionTimeoutPolicy_var::tao_nil (void)
+{
+  return ::TAO::ConnectionTimeoutPolicy::_nil ();
+}
+
+::TAO::ConnectionTimeoutPolicy_ptr
+TAO::ConnectionTimeoutPolicy_var::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return ::TAO::ConnectionTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+TAO::ConnectionTimeoutPolicy_var::tao_upcast (void *src)
+{
+  ConnectionTimeoutPolicy **tmp =
+    ACE_static_cast (ConnectionTimeoutPolicy **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// TAO::ConnectionTimeoutPolicy_out
+// TAO_IDL - Generated from
+// be/be_interface.cpp:932
+// *************************************************************
+
+TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_nil ();
+}
+
+TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_nil ();
+}
+
+TAO::ConnectionTimeoutPolicy_out::ConnectionTimeoutPolicy_out (const ::TAO::ConnectionTimeoutPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ConnectionTimeoutPolicy_out &, p).ptr_)
+{}
+
+::TAO::ConnectionTimeoutPolicy_out &
+TAO::ConnectionTimeoutPolicy_out::operator= (const ::TAO::ConnectionTimeoutPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ConnectionTimeoutPolicy_out&, p).ptr_;
+  return *this;
+}
+
+TAO::ConnectionTimeoutPolicy_out &
+TAO::ConnectionTimeoutPolicy_out::operator= (const ::TAO::ConnectionTimeoutPolicy_var &p)
+{
+  this->ptr_ = ::TAO::ConnectionTimeoutPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+TAO::ConnectionTimeoutPolicy_out &
+TAO::ConnectionTimeoutPolicy_out::operator= (ConnectionTimeoutPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO::ConnectionTimeoutPolicy_out::operator ::TAO::ConnectionTimeoutPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::TAO::ConnectionTimeoutPolicy_ptr &
+TAO::ConnectionTimeoutPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::TAO::ConnectionTimeoutPolicy_ptr
+TAO::ConnectionTimeoutPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/interface_cs.cpp:198
+
+TAO::ConnectionTimeoutPolicy::ConnectionTimeoutPolicy (void)
+{}
+
+TAO::ConnectionTimeoutPolicy::~ConnectionTimeoutPolicy (void)
+{}
+
+void TAO::ConnectionTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ConnectionTimeoutPolicy *tmp = ACE_static_cast (ConnectionTimeoutPolicy*, _tao_void_pointer);
+  CORBA::release (tmp);
+}
+
+TAO::ConnectionTimeoutPolicy_ptr TAO::ConnectionTimeoutPolicy::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  return ConnectionTimeoutPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+TAO::ConnectionTimeoutPolicy_ptr 
+TAO::ConnectionTimeoutPolicy::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    return ConnectionTimeoutPolicy::_nil ();
+  return
+      ACE_reinterpret_cast
+        (
+          ConnectionTimeoutPolicy_ptr,
+            obj->_tao_QueryInterface
+              (
+                ACE_reinterpret_cast
+                  (
+                    ptr_arith_t,
+                    &ConnectionTimeoutPolicy::_tao_class_id
+                  )
+              )
+        );
+}
+
+TAO::ConnectionTimeoutPolicy_ptr
+TAO::ConnectionTimeoutPolicy::_duplicate (ConnectionTimeoutPolicy_ptr obj)
+{
+  if (!CORBA::is_nil (obj))
+    obj->_add_ref ();
+  return obj;
+}
+
+void *TAO::ConnectionTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &ACE_NESTED_CLASS (::TAO, ConnectionTimeoutPolicy)::_tao_class_id))
+    retv = ACE_reinterpret_cast (void*, this);
+  else if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &::CORBA::Policy::_tao_class_id))
+    retv = ACE_reinterpret_cast
+      (
+        void *,
+        ACE_static_cast
+          (
+            CORBA::Policy_ptr,
+            this
+          )
+      );
+  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
+    retv = ACE_reinterpret_cast (void *,
+      ACE_static_cast (CORBA::Object_ptr, this));
+    
+  if (retv)
+    this->_add_ref ();
+  return retv;
+}
+
+const char* TAO::ConnectionTimeoutPolicy::_interface_repository_id (void) const
+{
+  return "IDL:tao/TAO/ConnectionTimeoutPolicy:1.0";
+}
+
+static const CORBA::Long _oc_TAO_ConnectionTimeoutPolicy[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x74616f2f), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x436f6e6e), 
+  ACE_NTOHL (0x65637469), 
+  ACE_NTOHL (0x6f6e5469), 
+  ACE_NTOHL (0x6d656f75), 
+  ACE_NTOHL (0x74506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/ConnectionTimeoutPolicy:1.0
+  24,
+  ACE_NTOHL (0x436f6e6e), 
+  ACE_NTOHL (0x65637469), 
+  ACE_NTOHL (0x6f6e5469), 
+  ACE_NTOHL (0x6d656f75), 
+  ACE_NTOHL (0x74506f6c), 
+  ACE_NTOHL (0x69637900),  // name = ConnectionTimeoutPolicy
+};
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_ConnectionTimeoutPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_TAO_ConnectionTimeoutPolicy),
+    (char *) &_oc_TAO_ConnectionTimeoutPolicy,
+    0,
+    sizeof (TAO::ConnectionTimeoutPolicy)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (TAO)
+TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ConnectionTimeoutPolicy, &_tc_TAO_tc_TAO_ConnectionTimeoutPolicy)
+TAO_NAMESPACE_END
+
+
+// TAO_IDL - Generated from 
+// be/be_visitor_interface/any_op_cs.cpp:60
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO::ConnectionTimeoutPolicy_ptr _tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      TAO::_tc_ConnectionTimeoutPolicy, 
+      1,
+      TAO::ConnectionTimeoutPolicy::_duplicate (_tao_elem),
+      TAO::ConnectionTimeoutPolicy::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    TAO::ConnectionTimeoutPolicy_ptr *_tao_elem
+  )
+{
+  _tao_any._tao_replace (
+      TAO::_tc_ConnectionTimeoutPolicy, 
+      1,
+      *_tao_elem,
+      TAO::ConnectionTimeoutPolicy::_tao_any_destructor
+    );
+  
+  _tao_any.contains_local (1);
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO::ConnectionTimeoutPolicy_ptr &_tao_elem
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    _tao_elem = TAO::ConnectionTimeoutPolicy::_nil ();
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result =
+      type->equivalent (
+          TAO::_tc_ConnectionTimeoutPolicy
+          ACE_ENV_ARG_PARAMETER
+        );
+    ACE_TRY_CHECK;
+    
+    if (!result)
+      {
+        return 0; // not equivalent
+      }
+    
+    _tao_elem =
+      ACE_reinterpret_cast (
+          TAO::ConnectionTimeoutPolicy_ptr,
+          ACE_const_cast (void *, _tao_any.value ())
+        );
+    
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  
+  _tao_elem = TAO::ConnectionTimeoutPolicy::_nil ();
+  return 0;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO_Object_Manager<TAO::ConnectionTimeoutPolicy,TAO::ConnectionTimeoutPolicy_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate TAO_Object_Manager<TAO::ConnectionTimeoutPolicy,TAO::ConnectionTimeoutPolicy_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h
new file mode 100644
index 00000000000..9069fb4de07
--- /dev/null
+++ b/TAO/tao/Messaging/TAO_ExtC.h
@@ -0,0 +1,237 @@
+// -*- 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/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#ifndef _TAO_IDL_ORIG_TAO_EXTC_H_
+#define _TAO_IDL_ORIG_TAO_EXTC_H_
+#include "ace/pre.h"
+#include "tao/orbconf.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PolicyC.h"
+#include "tao/TimeBaseC.h"
+#include "messaging_export.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Messaging_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Messaging_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+TAO_NAMESPACE  TAO
+{
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong CONNECTION_TIMEOUT_POLICY_TYPE;
+
+
+#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___PTR_CH_)
+#define _TAO_CONNECTIONTIMEOUTPOLICY___PTR_CH_
+
+  class ConnectionTimeoutPolicy;
+  typedef ConnectionTimeoutPolicy *ConnectionTimeoutPolicy_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___VAR_CH_)
+#define _TAO_CONNECTIONTIMEOUTPOLICY___VAR_CH_
+
+  class TAO_Messaging_Export ConnectionTimeoutPolicy_var : public TAO_Base_var
+  {
+  public:
+    ConnectionTimeoutPolicy_var (void); // default constructor
+    ConnectionTimeoutPolicy_var (ConnectionTimeoutPolicy_ptr p) : ptr_ (p) {}
+    ConnectionTimeoutPolicy_var (const ConnectionTimeoutPolicy_var &); // copy constructor
+    ~ConnectionTimeoutPolicy_var (void); // destructor
+
+    ConnectionTimeoutPolicy_var &operator= (ConnectionTimeoutPolicy_ptr);
+    ConnectionTimeoutPolicy_var &operator= (const ConnectionTimeoutPolicy_var &);
+    ConnectionTimeoutPolicy_ptr operator-> (void) const;
+
+    operator const ConnectionTimeoutPolicy_ptr &() const;
+    operator ConnectionTimeoutPolicy_ptr &();
+    // in, inout, out, _retn
+    ConnectionTimeoutPolicy_ptr in (void) const;
+    ConnectionTimeoutPolicy_ptr &inout (void);
+    ConnectionTimeoutPolicy_ptr &out (void);
+    ConnectionTimeoutPolicy_ptr _retn (void);
+    ConnectionTimeoutPolicy_ptr ptr (void) const;
+
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ConnectionTimeoutPolicy_ptr tao_duplicate (ConnectionTimeoutPolicy_ptr);
+    static void tao_release (ConnectionTimeoutPolicy_ptr);
+    static ConnectionTimeoutPolicy_ptr tao_nil (void);
+    static ConnectionTimeoutPolicy_ptr tao_narrow (
+        CORBA::Object *
+        ACE_ENV_ARG_DECL_NOT_USED
+      );
+    static CORBA::Object * tao_upcast (void *);
+
+  private:
+    ConnectionTimeoutPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ConnectionTimeoutPolicy_var (const TAO_Base_var &rhs);
+    ConnectionTimeoutPolicy_var &operator= (const TAO_Base_var &rhs);
+  };
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___OUT_CH_)
+#define _TAO_CONNECTIONTIMEOUTPOLICY___OUT_CH_
+
+  class TAO_Messaging_Export ConnectionTimeoutPolicy_out
+  {
+  public:
+    ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_ptr &);
+    ConnectionTimeoutPolicy_out (ConnectionTimeoutPolicy_var &);
+    ConnectionTimeoutPolicy_out (const ConnectionTimeoutPolicy_out &);
+    ConnectionTimeoutPolicy_out &operator= (const ConnectionTimeoutPolicy_out &);
+    ConnectionTimeoutPolicy_out &operator= (const ConnectionTimeoutPolicy_var &);
+    ConnectionTimeoutPolicy_out &operator= (ConnectionTimeoutPolicy_ptr);
+    operator ConnectionTimeoutPolicy_ptr &();
+    ConnectionTimeoutPolicy_ptr &ptr (void);
+    ConnectionTimeoutPolicy_ptr operator-> (void);
+
+  private:
+    ConnectionTimeoutPolicy_ptr &ptr_;
+  };
+
+
+#endif /* end #if !defined */
+
+  // *************************************************************
+  // TAO::ConnectionTimeoutPolicy
+  // TAO_IDL - Generated from
+  // be/be_visitor_interface/interface_ch.cpp:106
+  // *************************************************************
+
+
+#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY_CH_)
+#define _TAO_CONNECTIONTIMEOUTPOLICY_CH_
+
+  class TAO_Messaging_Export ConnectionTimeoutPolicy
+    : public virtual CORBA::Policy
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef ConnectionTimeoutPolicy_ptr _ptr_type;
+    typedef ConnectionTimeoutPolicy_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    static int _tao_class_id;
+
+    // The static operations.
+    static ConnectionTimeoutPolicy_ptr _duplicate (ConnectionTimeoutPolicy_ptr obj);
+
+    static ConnectionTimeoutPolicy_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
+    static ConnectionTimeoutPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+
+    static ConnectionTimeoutPolicy_ptr _nil (void)
+      {
+        return (ConnectionTimeoutPolicy_ptr)0;
+      }
+
+    static void _tao_any_destructor (void*);
+
+    virtual TimeBase::TimeT relative_expiry (
+
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    ConnectionTimeoutPolicy (void);
+
+    virtual ~ConnectionTimeoutPolicy (void);
+
+  private:
+    ConnectionTimeoutPolicy (const ConnectionTimeoutPolicy &);
+    void operator= (const ConnectionTimeoutPolicy &);
+  };
+
+
+#endif /* end #if !defined */
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ConnectionTimeoutPolicy;
+
+
+}
+TAO_NAMESPACE_CLOSE // module TAO
+
+// Any operators for interface TAO::ConnectionTimeoutPolicy
+TAO_Messaging_Export void operator<<= (CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr); // copying
+TAO_Messaging_Export void operator<<= (CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr *); // non-copying
+TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr &);
+
+#ifndef __ACE_INLINE__
+
+
+#endif /* __ACE_INLINE__ */
+
+
+#if defined (__ACE_INLINE__)
+#include "TAO_ExtC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#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/Messaging/TAO_ExtC.i b/TAO/tao/Messaging/TAO_ExtC.i
new file mode 100644
index 00000000000..fb8249acfbf
--- /dev/null
+++ b/TAO/tao/Messaging/TAO_ExtC.i
@@ -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/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+#if !defined (_TAO_CONNECTIONTIMEOUTPOLICY___CI_)
+#define _TAO_CONNECTIONTIMEOUTPOLICY___CI_
+
+
+#endif /* end #if !defined */
+
diff --git a/TAO/tao/Messaging/diffs/TAO_ExtC.diff b/TAO/tao/Messaging/diffs/TAO_ExtC.diff
new file mode 100644
index 00000000000..42921fded67
--- /dev/null
+++ b/TAO/tao/Messaging/diffs/TAO_ExtC.diff
@@ -0,0 +1,24 @@
+--- orig/TAO_ExtC.h	Mon Apr 29 11:53:09 2002
++++ TAO_ExtC.h	Mon Apr 29 14:14:15 2002
+@@ -21,17 +21,16 @@
+ 
+ #ifndef _TAO_IDL_ORIG_TAO_EXTC_H_
+ #define _TAO_IDL_ORIG_TAO_EXTC_H_
+-
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "tao/orbconf.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "tao/corbafwd.h"
+-#include "PolicyC.h"
+-#include "TimeBaseC.h"
++#include "tao/PolicyC.h"
++#include "tao/TimeBaseC.h"
++#include "messaging_export.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO