ChangeLogTag: Mon Oct 17 11:19:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

20 files changed, 1510 insertions, 757 deletions

diff --git a/TAO/tao/Messaging/Messaging.pidl b/TAO/tao/Messaging/Messaging.pidl
index 0a08f3a79e6..08e6b4c13ae 100644
--- a/TAO/tao/Messaging/Messaging.pidl
+++ b/TAO/tao/Messaging/Messaging.pidl
@@ -40,25 +40,13 @@
 #include "tao/Messaging/Messaging_RT_Policy.pidl"
 #include "tao/Messaging/Messaging_No_Impl.pidl"
 #include "tao/Messaging/Pollable.pidl"
-#include "tao/OctetSeq.pidl"
+#include "tao/Messaging/OldExceptionHolder.pidl"
 
 #pragma prefix "omg.org"
 
 module Messaging
 {
-  //
-  // Exception Delivery in the Callback Model
-  //
-  valuetype ExceptionHolder {
-    public boolean         is_system_exception;
-    public boolean         byte_order;
-    public CORBA::OctetSeq marshaled_exception;
-  };
-
-  //
-  // Base interface for the Callback model
-  //
-
+  /// Base interface for the Callback model
   interface ReplyHandler { };
 };
 
diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp
index 2a11aa1a3d5..ae94cc8598a 100644
--- a/TAO/tao/Messaging/MessagingA.cpp
+++ b/TAO/tao/Messaging/MessagingA.cpp
@@ -25,56 +25,17 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "MessagingA.h"
+#include "Messaging.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
-#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
-#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/value_typecode.cpp:63
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_ExceptionHolder[] =
-  {
-    { "is_system_exception", &CORBA::_tc_boolean, ::CORBA::PUBLIC_MEMBER },
-    { "byte_order", &CORBA::_tc_boolean, ::CORBA::PUBLIC_MEMBER },
-    { "marshaled_exception", &CORBA::_tc_OctetSeq, ::CORBA::PUBLIC_MEMBER }
-    
-  };
-static TAO::TypeCode::Value<char const *,
-                     ::CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_ExceptionHolder (
-    ::CORBA::tk_value,
-    "IDL:omg.org/Messaging/ExceptionHolder:1.0",
-    "ExceptionHolder",
-    ::CORBA::VM_NONE,
-    &::CORBA::_tc_null,
-    _tao_fields_Messaging_ExceptionHolder,
-    3);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionHolder =
-    &_tao_tc_Messaging_ExceptionHolder;
-}
-
-
-
-// TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
 static TAO::TypeCode::Objref<char const *,
@@ -83,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     ::CORBA::tk_objref,
     "IDL:omg.org/Messaging/ReplyHandler:1.0",
     "ReplyHandler");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyHandler =
@@ -93,119 +54,6 @@ namespace Messaging
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/any_op_cs.cpp:57
-
-namespace TAO
-{
-  template<>
-  ::CORBA::Boolean
-  Any_Impl_T<Messaging::ExceptionHolder>::to_value (
-      ::CORBA::ValueBase *&_tao_elem
-    ) const
-  {
-    ::CORBA::add_ref (this->value_);
-    _tao_elem = this->value_;
-    return 1;
-  }
-}
-
-
-
-#if defined (ACE_ANY_OPS_USE_NAMESPACE)
-
-namespace Messaging
-{
-  // Copying insertion.
-  void
-  operator<<= (
-      ::CORBA::Any &_tao_any,
-      ExceptionHolder *_tao_elem
-    )
-  {
-    ::CORBA::add_ref (_tao_elem);
-    _tao_any <<= &_tao_elem;
-  }
-  
-  // Non-copying insertion.
-  void
-  operator<<= (
-      ::CORBA::Any &_tao_any,
-      ExceptionHolder **_tao_elem
-    )
-  {
-    TAO::Any_Impl_T<ExceptionHolder>::insert (
-        _tao_any,
-        ExceptionHolder::_tao_any_destructor,
-        _tc_ExceptionHolder,
-        *_tao_elem
-      );
-  }
-  
-  ::CORBA::Boolean
-  operator>>= (
-      const ::CORBA::Any &_tao_any,
-      ExceptionHolder *&_tao_elem
-    )
-  {
-    return
-      TAO::Any_Impl_T<ExceptionHolder>::extract (
-          _tao_any,
-          ExceptionHolder::_tao_any_destructor,
-          _tc_ExceptionHolder,
-          _tao_elem
-        );
-  }
-  
-  
-}
-
-#else
-// Copying insertion.
-void
-operator<<= (
-    ::CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder *_tao_elem
-  )
-{
-  ::CORBA::add_ref (_tao_elem);
-  _tao_any <<= &_tao_elem;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    ::CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder **_tao_elem
-  )
-{
-  TAO::Any_Impl_T<Messaging::ExceptionHolder>::insert (
-      _tao_any,
-      Messaging::ExceptionHolder::_tao_any_destructor,
-      Messaging::_tc_ExceptionHolder,
-      *_tao_elem
-    );
-}
-
-::CORBA::Boolean
-operator>>= (
-    const ::CORBA::Any &_tao_any,
-    Messaging::ExceptionHolder *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<Messaging::ExceptionHolder>::extract (
-        _tao_any,
-        Messaging::ExceptionHolder::_tao_any_destructor,
-        Messaging::_tc_ExceptionHolder,
-        _tao_elem
-      );
-}
-
-
-
-#endif
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:51
 
 namespace TAO
@@ -225,8 +73,8 @@ namespace TAO
 
 namespace Messaging
 {
-  
-  
+
+
   // Copying insertion.
   void
   operator<<= (
@@ -238,7 +86,7 @@ namespace Messaging
       ReplyHandler::_duplicate (_tao_elem);
     _tao_any <<= &_tao_objptr;
   }
-  
+
   // Non-copying insertion.
   void
   operator<<= (
@@ -253,7 +101,7 @@ namespace Messaging
         *_tao_elem
       );
   }
-  
+
   ::CORBA::Boolean
   operator>>= (
       const ::CORBA::Any &_tao_any,
diff --git a/TAO/tao/Messaging/MessagingA.h b/TAO/tao/Messaging/MessagingA.h
new file mode 100644
index 00000000000..e35e84188d5
--- /dev/null
+++ b/TAO/tao/Messaging/MessagingA.h
@@ -0,0 +1,84 @@
+// -*- 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:754
+
+#ifndef _TAO_IDL_MESSAGINGA_H_
+#define _TAO_IDL_MESSAGINGA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "messaging_export.h"
+#include "tao/Messaging/MessagingC.h"
+#include "tao/Messaging/Messaging_SyncScope_PolicyA.h"
+#include "tao/Messaging/Messaging_RT_PolicyA.h"
+#include "tao/Messaging/Messaging_No_ImplA.h"
+#include "tao/Messaging/OldExceptionHolderA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace Messaging
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyHandler;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module Messaging
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:54
+
+
+
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
+
+namespace Messaging
+{
+  TAO_Messaging_Export void operator<<= ( ::CORBA::Any &, ReplyHandler_ptr); // copying
+  TAO_Messaging_Export void operator<<= ( ::CORBA::Any &, ReplyHandler_ptr *); // non-copying
+  TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ReplyHandler_ptr &);
+}
+
+#else
+
+TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::ReplyHandler_ptr); // copying
+TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::ReplyHandler_ptr *); // non-copying
+TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messaging::ReplyHandler_ptr &);
+
+#endif
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index fd4cd8657fd..0fb388a8db1 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -32,7 +32,6 @@
 #include "Messaging.h"
 #include "tao/CDR.h"
 #include "tao/Object_T.h"
-#include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
@@ -49,144 +48,6 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_cs.cpp:66
-
-void
-TAO::Value_Traits<Messaging::ExceptionHolder>::add_ref (
-    Messaging::ExceptionHolder * p
-  )
-{
-  ::CORBA::add_ref (p);
-}
-
-void
-TAO::Value_Traits<Messaging::ExceptionHolder>::remove_ref (
-    Messaging::ExceptionHolder * p
-  )
-{
-  ::CORBA::remove_ref (p);
-}
-
-void
-TAO::Value_Traits<Messaging::ExceptionHolder>::release (
-    Messaging::ExceptionHolder * p
-  )
-{
-  ::CORBA::remove_ref (p);
-}
-
-Messaging::ExceptionHolder *
-Messaging::ExceptionHolder::_downcast ( ::CORBA::ValueBase *v)
-{
-  return dynamic_cast< ::Messaging::ExceptionHolder * > (v);
-}
-
-const char *
-Messaging::ExceptionHolder::_tao_obv_repository_id (void) const
-{
-  return this->_tao_obv_static_repository_id ();
-}
-
-void
-Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ExceptionHolder *_tao_tmp_pointer =
-    static_cast<ExceptionHolder *> (_tao_void_pointer);
-  ::CORBA::remove_ref (_tao_tmp_pointer);
-}
-
-Messaging::ExceptionHolder::~ExceptionHolder (void)
-{}
-
-::CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm) const
-{
-  return this->_tao_marshal__Messaging_ExceptionHolder (strm);
-}
-
-::CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal_v (TAO_InputCDR & strm)
-{
-  return this->_tao_unmarshal__Messaging_ExceptionHolder (strm);
-}
-
-::CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
-    TAO_InputCDR &strm,
-    ExceptionHolder *&new_object
-  )
-{
-  ::CORBA::ValueBase *base = 0;
-  ::CORBA::ValueFactory_var factory;
-  ::CORBA::Boolean retval =
-    ::CORBA::ValueBase::_tao_unmarshal_pre (
-        strm,
-        factory.out (),
-        base,
-        ExceptionHolder::_tao_obv_static_repository_id ()
-      );
-  
-  if (retval == 0)
-    {
-      return 0;
-    }
-  
-  if (factory.in () != 0)
-    {
-      base = factory->create_for_unmarshal ();
-      
-      if (base == 0)
-        {
-          return 0;  // %! except.?
-        }
-      
-      retval = base->_tao_unmarshal_v (strm);
-      
-      if (retval == 0)
-        {
-          return 0;
-        }
-    }
-  
-  // Now base must be null or point to the unmarshaled object.
-  // Align the pointer to the right subobject.
-  new_object = ExceptionHolder::_downcast (base);
-  return retval;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_init_cs.cpp:85
-
-Messaging::ExceptionHolder_init::ExceptionHolder_init (void)
-{
-}
-
-Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
-{
-}
-
-Messaging::ExceptionHolder_init *
-Messaging::ExceptionHolder_init::_downcast ( ::CORBA::ValueFactoryBase *v)
-{
-  return dynamic_cast< ::Messaging::ExceptionHolder_init * > (v);
-}
-
-const char* 
-Messaging::ExceptionHolder_init::tao_repository_id (void)
-{
-  return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
-}
-
-::CORBA::ValueBase *
-Messaging::ExceptionHolder_init::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ::CORBA::ValueBase *ret_val = 0;
-  ACE_NEW_THROW_EX (
-      ret_val,
-      OBV_Messaging::ExceptionHolder,
-      ::CORBA::NO_MEMORY ()
-    );
-  return ret_val;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for Messaging::ReplyHandler.
@@ -342,157 +203,6 @@ Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
-
-OBV_Messaging::ExceptionHolder::ExceptionHolder (void)
-{}
-
-OBV_Messaging::ExceptionHolder::~ExceptionHolder (void)
-{}
-
-::CORBA::Boolean
-OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm) const
-{
-  return _tao_marshal_state (strm);
-}
-
-::CORBA::Boolean
-OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &strm)
-{
-  return _tao_unmarshal_state (strm);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:592
-
-// Accessor to set the member.
-void
-OBV_Messaging::ExceptionHolder::is_system_exception (CORBA::Boolean val)
-{
-  // Set the value.
-  this->_pd_is_system_exception = val;
-}
-
-// Retrieve the member
-::CORBA::Boolean
-OBV_Messaging::ExceptionHolder::is_system_exception (void) const
-{
-  return this->_pd_is_system_exception;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:592
-
-// Accessor to set the member.
-void
-OBV_Messaging::ExceptionHolder::byte_order (CORBA::Boolean val)
-{
-  // Set the value.
-  this->_pd_byte_order = val;
-}
-
-// Retrieve the member
-::CORBA::Boolean
-OBV_Messaging::ExceptionHolder::byte_order (void) const
-{
-  return this->_pd_byte_order;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/field_cs.cpp:763
-
-// Accessor to set the member.
-void
-OBV_Messaging::ExceptionHolder::marshaled_exception (const CORBA::OctetSeq &val)
-{
-  this->_pd_marshaled_exception = val;
-}
-
-// Readonly get method.
-const CORBA::OctetSeq &
-OBV_Messaging::ExceptionHolder::marshaled_exception (void) const
-{
-  return this->_pd_marshaled_exception;
-}
-
-// Read/write get method.
-CORBA::OctetSeq &
-OBV_Messaging::ExceptionHolder::marshaled_exception (void)
-{
-  return this->_pd_marshaled_exception;
-}
-
-// TAO_IDL - Generated from
-// be\be_valuetype.cpp:487
-
-void
-CORBA::add_ref (Messaging::ExceptionHolder * vt)
-{
-  if (vt != 0)
-    {
-      vt->_add_ref ();
-    }
-}
-
-void
-CORBA::remove_ref (Messaging::ExceptionHolder * vt)
-{
-  if (vt != 0)
-    {
-      vt->_remove_ref ();
-    }
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_cs.cpp:73
-
-::CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::ExceptionHolder *_tao_valuetype
-  )
-{
-  return
-    ::CORBA::ValueBase::_tao_marshal (
-        strm,
-        _tao_valuetype,
-        reinterpret_cast<ptrdiff_t> (&Messaging::ExceptionHolder::_downcast)
-      );
-}
-
-::CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    Messaging::ExceptionHolder *&_tao_valuetype
-  )
-{
-  return Messaging::ExceptionHolder::_tao_unmarshal (strm, _tao_valuetype);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/marshal_cs.cpp:44
-
-::CORBA::Boolean
-OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm) const
-{
-  return (
-      (strm << ::ACE_OutputCDR::from_boolean (_pd_is_system_exception)) &&
-      (strm << ::ACE_OutputCDR::from_boolean (_pd_byte_order)) &&
-      (strm << _pd_marshaled_exception)
-    );
-}
-
-::CORBA::Boolean
-OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
-{
-  return (
-    (strm >> ::ACE_InputCDR::to_boolean (_pd_is_system_exception)) &&
-    (strm >> ::ACE_InputCDR::to_boolean (_pd_byte_order)) &&
-    (strm >> _pd_marshaled_exception)
-  );
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/cdr_op_cs.cpp:63
 
 ::CORBA::Boolean operator<< (
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index ab802ae93e8..4308c5ca4d1 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -45,28 +45,24 @@
 #endif /* !TAO_MESSAGING_SAFE_INCLUDE */
 
 #include "messaging_export.h"
-#include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
-#include "tao/Valuetype/ValueFactory.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/Valuetype/Value_VarOut_T.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
 #include "tao/Messaging/Messaging_RT_PolicyC.h"
 #include "tao/Messaging/Messaging_No_ImplC.h"
 #include "tao/Messaging/PollableC.h"
-#include "tao/OctetSeqC.h"
+#include "tao/Messaging/OldExceptionHolderC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
 #define TAO_EXPORT_MACRO TAO_Messaging_Export
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -80,143 +76,22 @@ namespace TAO
 
 namespace Messaging
 {
-  
-  // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:524
-  
-  
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER__VAR_OUT_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER__VAR_OUT_CH_
-  
-  class ExceptionHolder;
-  typedef
-    TAO_Value_Var_T<
-        ExceptionHolder
-      >
-    ExceptionHolder_var;
-  
-  typedef
-    TAO_Value_Out_T<
-        ExceptionHolder
-      >
-    ExceptionHolder_out;
 
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_ch.cpp:61
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER_CH_
-  
-  class TAO_Messaging_Export ExceptionHolder
-    : public virtual ::CORBA::ValueBase
-  {
-  public:
-    typedef ExceptionHolder_var _var_type;
-    
-    static ExceptionHolder* _downcast ( ::CORBA::ValueBase *);
-    
-    // (TAO extensions or internals)
-    static ::CORBA::Boolean _tao_unmarshal (
-        TAO_InputCDR &,
-        ExceptionHolder *&
-      );
-    
-    virtual const char* _tao_obv_repository_id (void) const;
-    
-    static const char* _tao_obv_static_repository_id (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:469
-    
-    virtual void is_system_exception (::CORBA::Boolean) = 0;
-    virtual ::CORBA::Boolean is_system_exception (void) const = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:469
-    
-    virtual void byte_order (::CORBA::Boolean) = 0;
-    virtual ::CORBA::Boolean byte_order (void) const = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:542
-    
-    virtual void marshaled_exception (const CORBA::OctetSeq &) = 0;
-    virtual const CORBA::OctetSeq &marshaled_exception (void) const = 0;
-    virtual CORBA::OctetSeq &marshaled_exception (void) = 0;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/valuetype_ch.cpp:251
-  
-  protected:
-    ExceptionHolder (void);
-    
-    virtual ~ExceptionHolder (void);
-    
-    virtual ::CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
-    virtual ::CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-    
-  private:
-    ExceptionHolder (const ExceptionHolder &);
-    void operator= (const ExceptionHolder &);
-    
-  protected:
-    virtual ::CORBA::Boolean
-    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const = 0;
-    
-    virtual ::CORBA::Boolean
-    _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER___INIT_CH_
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_init_ch.cpp:72
-  
-  class TAO_Messaging_Export ExceptionHolder_init : public virtual ::CORBA::ValueFactoryBase
-  {
-  public:
-    ExceptionHolder_init (void);
-    
-    static ExceptionHolder_init* _downcast ( ::CORBA::ValueFactoryBase *);
-    
-    virtual ::CORBA::ValueBase *
-    create_for_unmarshal (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    // TAO-specific extensions
-  public:
-    virtual const char* tao_repository_id (void);
-  
-  protected:
-    virtual ~ExceptionHolder_init (void);
-  };
-
-#endif /* end #if !defined */
-  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:646
 
 #if !defined (_MESSAGING_REPLYHANDLER__VAR_OUT_CH_)
 #define _MESSAGING_REPLYHANDLER__VAR_OUT_CH_
-  
+
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ReplyHandler
       >
     ReplyHandler_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ReplyHandler
@@ -224,13 +99,13 @@ namespace Messaging
     ReplyHandler_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_MESSAGING_REPLYHANDLER_CH_)
 #define _MESSAGING_REPLYHANDLER_CH_
-  
+
   class TAO_Messaging_Export ReplyHandler
     : public virtual ::CORBA::Object
   {
@@ -238,56 +113,56 @@ namespace Messaging
     friend class TAO::Narrow_Utils<ReplyHandler>;
     typedef ReplyHandler_ptr _ptr_type;
     typedef ReplyHandler_var _var_type;
-    
+
     // The static operations.
     static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj);
-    
+
     static void _tao_release (ReplyHandler_ptr obj);
-    
+
     static ReplyHandler_ptr _narrow (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ReplyHandler_ptr _unchecked_narrow (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ReplyHandler_ptr _nil (void)
     {
       return static_cast<ReplyHandler_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ReplyHandler_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ReplyHandler (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void Messaging_ReplyHandler_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ReplyHandler (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ReplyHandler (
         TAO_Stub *objref,
@@ -295,13 +170,13 @@ namespace Messaging
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ReplyHandler (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ReplyHandler (const ReplyHandler &);
-    
+
     void operator= (const ReplyHandler &);
   };
 
@@ -324,84 +199,12 @@ TAO::Collocation_Proxy_Broker *
   );
 
 // TAO_IDL - Generated from
-// be\be_visitor_valuetype/obv_module.cpp:55
-
-namespace OBV_Messaging
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
-
-#if !defined (_MESSAGING_EXCEPTIONHOLDER___OBV_CH_)
-#define _MESSAGING_EXCEPTIONHOLDER___OBV_CH_
-  
-  // OBV_ class
-  class TAO_Messaging_Export ExceptionHolder
-    : public virtual Messaging::ExceptionHolder,
-      public virtual ::CORBA::DefaultValueRefCountBase
-  {
-  public:
-    ExceptionHolder (void);
-    virtual ~ExceptionHolder (void);
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:469
-    
-    virtual void is_system_exception (::CORBA::Boolean);
-    virtual ::CORBA::Boolean is_system_exception (void) const;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:469
-    
-    virtual void byte_order (::CORBA::Boolean);
-    virtual ::CORBA::Boolean byte_order (void) const;
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_valuetype/field_ch.cpp:542
-    
-    virtual void marshaled_exception (const CORBA::OctetSeq &);
-    virtual const CORBA::OctetSeq &marshaled_exception (void) const;
-    virtual CORBA::OctetSeq &marshaled_exception (void);
-    
-  protected:
-    virtual ::CORBA::Boolean
-    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const;
-    
-    virtual ::CORBA::Boolean
-    _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &);
-    
-    ::CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &) const;
-    ::CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
-  
-  private:
-    ::CORBA::Boolean _pd_is_system_exception;
-    ::CORBA::Boolean _pd_byte_order;
-    CORBA::OctetSeq _pd_marshaled_exception;
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
 {
 
-#if !defined (_MESSAGING_EXCEPTIONHOLDER__TRAITS_)
-#define _MESSAGING_EXCEPTIONHOLDER__TRAITS_
-  
-  template<>
-  struct TAO_Messaging_Export Value_Traits<Messaging::ExceptionHolder>
-  {
-    static void add_ref (Messaging::ExceptionHolder *);
-    static void remove_ref (Messaging::ExceptionHolder *);
-    static void release (Messaging::ExceptionHolder *);
-  };
-
-#endif /* end #if !defined */
-
 #if !defined (_MESSAGING_REPLYHANDLER__TRAITS_)
 #define _MESSAGING_REPLYHANDLER__TRAITS_
   
@@ -425,21 +228,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_valuetype.cpp:431
-
-namespace CORBA
-{
-  extern TAO_Messaging_Export void add_ref (Messaging::ExceptionHolder *);
-  extern TAO_Messaging_Export void remove_ref (Messaging::ExceptionHolder *);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_valuetype/cdr_op_ch.cpp:61
-
-TAO_Messaging_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *);
-TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_Messaging_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr );
diff --git a/TAO/tao/Messaging/MessagingC.inl b/TAO/tao/Messaging/MessagingC.inl
index 748dea9c9e2..465190bb2db 100644
--- a/TAO/tao/Messaging/MessagingC.inl
+++ b/TAO/tao/Messaging/MessagingC.inl
@@ -26,19 +26,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
-// be\be_visitor_valuetype/valuetype_ci.cpp:56
-
-ACE_INLINE
-Messaging::ExceptionHolder::ExceptionHolder (void)
-{}
-
-ACE_INLINE const char* 
-Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
-{
-  return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
-}
-
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
 
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 62f36ad65fd..65746739df0 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:553
 
 #ifndef _TAO_IDL_MESSAGINGS_CPP_
diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h
index 473224414a1..c633f3027ba 100644
--- a/TAO/tao/Messaging/MessagingS.h
+++ b/TAO/tao/Messaging/MessagingS.h
@@ -34,7 +34,6 @@
 #include /**/ "ace/pre.h"
 
 #include "Messaging.h"
-#include "tao/OctetSeqS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -49,107 +48,107 @@
 
 namespace POA_Messaging
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
-  
+
   class _TAO_ReplyHandler_Direct_Proxy_Impl;
   class _TAO_ReplyHandler_Strategized_Proxy_Broker;
-  
+
   class TAO_Messaging_Export ReplyHandler
     : public virtual PortableServer::ServantBase
   {
   protected:
     ReplyHandler (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::Messaging::ReplyHandler _stub_type;
     typedef ::Messaging::ReplyHandler_ptr _stub_ptr_type;
     typedef ::Messaging::ReplyHandler_var _stub_var_type;
-    
+
     ReplyHandler (const ReplyHandler& rhs);
     virtual ~ReplyHandler (void);
-    
+
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::Messaging::ReplyHandler *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_Messaging_Export _TAO_ReplyHandler_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC (( ::CORBA::SystemException));
-    
+
     void
     dispatch (
         ::CORBA::Object_ptr obj,
@@ -162,37 +161,37 @@ namespace POA_Messaging
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC (( ::CORBA::Exception));
-    
+
     static _TAO_ReplyHandler_Strategized_Proxy_Broker *
     the_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
   };
-  
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
-  
-  // TAO_IDL - Generated from 
+
+
+
+  // TAO_IDL - Generated from
   // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
+
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-  
+
   class TAO_Messaging_Export _TAO_ReplyHandler_Direct_Proxy_Impl
   {
   public:
     _TAO_ReplyHandler_Direct_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ReplyHandler_Direct_Proxy_Impl (void);
   };
-  
+
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:80
diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.h b/TAO/tao/Messaging/Messaging_No_ImplA.h
new file mode 100644
index 00000000000..a2d24bed959
--- /dev/null
+++ b/TAO/tao/Messaging/Messaging_No_ImplA.h
@@ -0,0 +1,156 @@
+// -*- 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:754
+
+#ifndef _TAO_IDL_MESSAGING_NO_IMPLA_H_
+#define _TAO_IDL_MESSAGING_NO_IMPLA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "messaging_export.h"
+#include "tao/Messaging/Messaging_No_ImplC.h"
+#include "tao/AnyTypeCode/TimeBaseA.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace Messaging
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_Priority;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RebindMode;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RoutingType;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_Ordering;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RebindPolicy;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_PriorityRange;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RequestPriorityPolicy;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyPriorityPolicy;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RequestStartTimePolicy;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RequestEndTimePolicy;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyStartTimePolicy;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ReplyEndTimePolicy;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RelativeRequestTimeoutPolicy;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RoutingTypeRange;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RoutingPolicy;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_MaxHopsPolicy;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_QueueOrderPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module Messaging
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:53
+
+TAO_Messaging_Export void operator<<= (::CORBA::Any &, const Messaging::PriorityRange &); // copying version
+TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::PriorityRange*); // noncopying version
+TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messaging::PriorityRange *&); // deprecated
+TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const Messaging::PriorityRange *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:53
+
+TAO_Messaging_Export void operator<<= (::CORBA::Any &, const Messaging::RoutingTypeRange &); // copying version
+TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::RoutingTypeRange*); // noncopying version
+TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messaging::RoutingTypeRange *&); // deprecated
+TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const Messaging::RoutingTypeRange *&);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.h b/TAO/tao/Messaging/Messaging_RT_PolicyA.h
new file mode 100644
index 00000000000..02ca2ce7790
--- /dev/null
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.h
@@ -0,0 +1,65 @@
+// -*- 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:754
+
+#ifndef _TAO_IDL_MESSAGING_RT_POLICYA_H_
+#define _TAO_IDL_MESSAGING_RT_POLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "messaging_export.h"
+#include "tao/Messaging/Messaging_RT_PolicyC.h"
+#include "tao/AnyTypeCode/TimeBaseA.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace Messaging
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_Timeout;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_RelativeRoundtripTimeoutPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module Messaging
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h
new file mode 100644
index 00000000000..daa19a0c347
--- /dev/null
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h
@@ -0,0 +1,60 @@
+// -*- 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:754
+
+#ifndef _TAO_IDL_MESSAGING_SYNCSCOPE_POLICYA_H_
+#define _TAO_IDL_MESSAGING_SYNCSCOPE_POLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "messaging_export.h"
+#include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+#include "tao/AnyTypeCode/Messaging_SyncScopeA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace Messaging
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_SyncScopePolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module Messaging
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/Messaging/OldExceptionHolder.pidl b/TAO/tao/Messaging/OldExceptionHolder.pidl
new file mode 100644
index 00000000000..3e3cab1ef2d
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolder.pidl
@@ -0,0 +1,37 @@
+// -*- IDL -*-
+
+//=============================================================================
+/**
+ *  @file   OldExceptionHolder.pidl
+ *
+ *  $Id$
+ *
+ *   tao_idl
+ *        -o orig -Gp -Gd -Ge 1 -GA -SS
+ *        -Wb,export_macro=TAO_Messaging_Export
+ *        -Wb,export_include=messaging_export.h
+ *        -Wb,pre_include="ace/pre.h"
+ *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
+ *        OldExceptionHolder.pidl
+ *
+ */
+//=============================================================================
+
+#ifndef TAO_MESSAGING_OLDEXCEPTIONHOLDER_PIDL
+#define TAO_MESSAGING_OLDEXCEPTIONHOLDER_PIDL
+
+#include "tao/OctetSeq.pidl"
+
+#pragma prefix "omg.org"
+
+module Messaging
+{
+  /// Exception Delivery in the Callback Model
+  valuetype ExceptionHolder {
+    public boolean         is_system_exception;
+    public boolean         byte_order;
+    public CORBA::OctetSeq marshaled_exception;
+  };
+};
+
+#endif /* TAO_MESSAGING_OLDEXCEPTIONHOLDER_PIDL */
diff --git a/TAO/tao/Messaging/OldExceptionHolderA.cpp b/TAO/tao/Messaging/OldExceptionHolderA.cpp
new file mode 100644
index 00000000000..b5d090f2809
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolderA.cpp
@@ -0,0 +1,187 @@
+// -*- 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 "OldExceptionHolderA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/value_typecode.cpp:63
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_ExceptionHolder[] =
+  {
+    { "is_system_exception", &CORBA::_tc_boolean, ::CORBA::PUBLIC_MEMBER },
+    { "byte_order", &CORBA::_tc_boolean, ::CORBA::PUBLIC_MEMBER },
+    { "marshaled_exception", &CORBA::_tc_OctetSeq, ::CORBA::PUBLIC_MEMBER }
+    
+  };
+static TAO::TypeCode::Value<char const *,
+                     ::CORBA::TypeCode_ptr const *,
+                     TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                     TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_ExceptionHolder (
+    ::CORBA::tk_value,
+    "IDL:omg.org/Messaging/ExceptionHolder:1.0",
+    "ExceptionHolder",
+    ::CORBA::VM_NONE,
+    &::CORBA::_tc_null,
+    _tao_fields_Messaging_ExceptionHolder,
+    3);
+  
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr const _tc_ExceptionHolder =
+    &_tao_tc_Messaging_ExceptionHolder;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/any_op_cs.cpp:57
+
+namespace TAO
+{
+  template<>
+  ::CORBA::Boolean
+  Any_Impl_T<Messaging::ExceptionHolder>::to_value (
+      ::CORBA::ValueBase *&_tao_elem
+    ) const
+  {
+    ::CORBA::add_ref (this->value_);
+    _tao_elem = this->value_;
+    return 1;
+  }
+}
+
+
+
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
+
+namespace Messaging
+{
+  // Copying insertion.
+  void
+  operator<<= (
+      ::CORBA::Any &_tao_any,
+      ExceptionHolder *_tao_elem
+    )
+  {
+    ::CORBA::add_ref (_tao_elem);
+    _tao_any <<= &_tao_elem;
+  }
+  
+  // Non-copying insertion.
+  void
+  operator<<= (
+      ::CORBA::Any &_tao_any,
+      ExceptionHolder **_tao_elem
+    )
+  {
+    TAO::Any_Impl_T<ExceptionHolder>::insert (
+        _tao_any,
+        ExceptionHolder::_tao_any_destructor,
+        _tc_ExceptionHolder,
+        *_tao_elem
+      );
+  }
+  
+  ::CORBA::Boolean
+  operator>>= (
+      const ::CORBA::Any &_tao_any,
+      ExceptionHolder *&_tao_elem
+    )
+  {
+    return
+      TAO::Any_Impl_T<ExceptionHolder>::extract (
+          _tao_any,
+          ExceptionHolder::_tao_any_destructor,
+          _tc_ExceptionHolder,
+          _tao_elem
+        );
+  }
+  
+  
+}
+
+#else
+// Copying insertion.
+void
+operator<<= (
+    ::CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder *_tao_elem
+  )
+{
+  ::CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    ::CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder **_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::ExceptionHolder>::insert (
+      _tao_any,
+      Messaging::ExceptionHolder::_tao_any_destructor,
+      Messaging::_tc_ExceptionHolder,
+      *_tao_elem
+    );
+}
+
+::CORBA::Boolean
+operator>>= (
+    const ::CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::ExceptionHolder>::extract (
+        _tao_any,
+        Messaging::ExceptionHolder::_tao_any_destructor,
+        Messaging::_tc_ExceptionHolder,
+        _tao_elem
+      );
+}
+
+
+
+#endif
diff --git a/TAO/tao/Messaging/OldExceptionHolderA.h b/TAO/tao/Messaging/OldExceptionHolderA.h
new file mode 100644
index 00000000000..f7612e9fe82
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolderA.h
@@ -0,0 +1,81 @@
+// -*- 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:754
+
+#ifndef _TAO_IDL_OLDEXCEPTIONHOLDERA_H_
+#define _TAO_IDL_OLDEXCEPTIONHOLDERA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "messaging_export.h"
+#include "tao/Messaging/OldExceptionHolderC.h"
+#include "tao/AnyTypeCode/OctetSeqA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace Messaging
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ExceptionHolder;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module Messaging
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/any_op_ch.cpp:55
+
+
+
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
+
+namespace Messaging
+{
+  TAO_Messaging_Export void operator<<= ( ::CORBA::Any &, ExceptionHolder *); // copying
+  TAO_Messaging_Export void operator<<= ( ::CORBA::Any &, ExceptionHolder **); // non-copying
+  TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ExceptionHolder *&);
+}
+
+#else
+
+TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::ExceptionHolder *); // copying
+TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::ExceptionHolder **); // non-copying
+TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messaging::ExceptionHolder *&);
+
+#endif
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.cpp b/TAO/tao/Messaging/OldExceptionHolderC.cpp
new file mode 100644
index 00000000000..28f4186212a
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolderC.cpp
@@ -0,0 +1,336 @@
+// -*- 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:277
+
+
+#include "OldExceptionHolderC.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+
+#if !defined (__ACE_INLINE__)
+#include "OldExceptionHolderC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:70
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_cs.cpp:66
+
+void
+TAO::Value_Traits<Messaging::ExceptionHolder>::add_ref (
+    Messaging::ExceptionHolder * p
+  )
+{
+  ::CORBA::add_ref (p);
+}
+
+void
+TAO::Value_Traits<Messaging::ExceptionHolder>::remove_ref (
+    Messaging::ExceptionHolder * p
+  )
+{
+  ::CORBA::remove_ref (p);
+}
+
+void
+TAO::Value_Traits<Messaging::ExceptionHolder>::release (
+    Messaging::ExceptionHolder * p
+  )
+{
+  ::CORBA::remove_ref (p);
+}
+
+Messaging::ExceptionHolder *
+Messaging::ExceptionHolder::_downcast ( ::CORBA::ValueBase *v)
+{
+  return dynamic_cast< ::Messaging::ExceptionHolder * > (v);
+}
+
+const char *
+Messaging::ExceptionHolder::_tao_obv_repository_id (void) const
+{
+  return this->_tao_obv_static_repository_id ();
+}
+
+void
+Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExceptionHolder *_tao_tmp_pointer =
+    static_cast<ExceptionHolder *> (_tao_void_pointer);
+  ::CORBA::remove_ref (_tao_tmp_pointer);
+}
+
+Messaging::ExceptionHolder::~ExceptionHolder (void)
+{}
+
+::CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm) const
+{
+  return this->_tao_marshal__Messaging_ExceptionHolder (strm);
+}
+
+::CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal_v (TAO_InputCDR & strm)
+{
+  return this->_tao_unmarshal__Messaging_ExceptionHolder (strm);
+}
+
+::CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
+    TAO_InputCDR &strm,
+    ExceptionHolder *&new_object
+  )
+{
+  ::CORBA::ValueBase *base = 0;
+  ::CORBA::ValueFactory_var factory;
+  ::CORBA::Boolean retval =
+    ::CORBA::ValueBase::_tao_unmarshal_pre (
+        strm,
+        factory.out (),
+        base,
+        ExceptionHolder::_tao_obv_static_repository_id ()
+      );
+  
+  if (retval == 0)
+    {
+      return 0;
+    }
+  
+  if (factory.in () != 0)
+    {
+      base = factory->create_for_unmarshal ();
+      
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+      
+      retval = base->_tao_unmarshal_v (strm);
+      
+      if (retval == 0)
+        {
+          return 0;
+        }
+    }
+  
+  // Now base must be null or point to the unmarshaled object.
+  // Align the pointer to the right subobject.
+  new_object = ExceptionHolder::_downcast (base);
+  return retval;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_init_cs.cpp:85
+
+Messaging::ExceptionHolder_init::ExceptionHolder_init (void)
+{
+}
+
+Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
+{
+}
+
+Messaging::ExceptionHolder_init *
+Messaging::ExceptionHolder_init::_downcast ( ::CORBA::ValueFactoryBase *v)
+{
+  return dynamic_cast< ::Messaging::ExceptionHolder_init * > (v);
+}
+
+const char* 
+Messaging::ExceptionHolder_init::tao_repository_id (void)
+{
+  return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
+}
+
+::CORBA::ValueBase *
+Messaging::ExceptionHolder_init::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
+{
+  ::CORBA::ValueBase *ret_val = 0;
+  ACE_NEW_THROW_EX (
+      ret_val,
+      OBV_Messaging::ExceptionHolder,
+      ::CORBA::NO_MEMORY ()
+    );
+  return ret_val;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
+
+OBV_Messaging::ExceptionHolder::ExceptionHolder (void)
+{}
+
+OBV_Messaging::ExceptionHolder::~ExceptionHolder (void)
+{}
+
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm) const
+{
+  return _tao_marshal_state (strm);
+}
+
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &strm)
+{
+  return _tao_unmarshal_state (strm);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/field_cs.cpp:592
+
+// Accessor to set the member.
+void
+OBV_Messaging::ExceptionHolder::is_system_exception (CORBA::Boolean val)
+{
+  // Set the value.
+  this->_pd_is_system_exception = val;
+}
+
+// Retrieve the member
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::is_system_exception (void) const
+{
+  return this->_pd_is_system_exception;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/field_cs.cpp:592
+
+// Accessor to set the member.
+void
+OBV_Messaging::ExceptionHolder::byte_order (CORBA::Boolean val)
+{
+  // Set the value.
+  this->_pd_byte_order = val;
+}
+
+// Retrieve the member
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::byte_order (void) const
+{
+  return this->_pd_byte_order;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/field_cs.cpp:763
+
+// Accessor to set the member.
+void
+OBV_Messaging::ExceptionHolder::marshaled_exception (const CORBA::OctetSeq &val)
+{
+  this->_pd_marshaled_exception = val;
+}
+
+// Readonly get method.
+const CORBA::OctetSeq &
+OBV_Messaging::ExceptionHolder::marshaled_exception (void) const
+{
+  return this->_pd_marshaled_exception;
+}
+
+// Read/write get method.
+CORBA::OctetSeq &
+OBV_Messaging::ExceptionHolder::marshaled_exception (void)
+{
+  return this->_pd_marshaled_exception;
+}
+
+// TAO_IDL - Generated from
+// be\be_valuetype.cpp:487
+
+void
+CORBA::add_ref (Messaging::ExceptionHolder * vt)
+{
+  if (vt != 0)
+    {
+      vt->_add_ref ();
+    }
+}
+
+void
+CORBA::remove_ref (Messaging::ExceptionHolder * vt)
+{
+  if (vt != 0)
+    {
+      vt->_remove_ref ();
+    }
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/cdr_op_cs.cpp:73
+
+::CORBA::Boolean
+operator<< (
+    TAO_OutputCDR &strm,
+    const Messaging::ExceptionHolder *_tao_valuetype
+  )
+{
+  return
+    ::CORBA::ValueBase::_tao_marshal (
+        strm,
+        _tao_valuetype,
+        reinterpret_cast<ptrdiff_t> (&Messaging::ExceptionHolder::_downcast)
+      );
+}
+
+::CORBA::Boolean
+operator>> (
+    TAO_InputCDR &strm,
+    Messaging::ExceptionHolder *&_tao_valuetype
+  )
+{
+  return Messaging::ExceptionHolder::_tao_unmarshal (strm, _tao_valuetype);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/marshal_cs.cpp:44
+
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm) const
+{
+  return (
+      (strm << ::ACE_OutputCDR::from_boolean (_pd_is_system_exception)) &&
+      (strm << ::ACE_OutputCDR::from_boolean (_pd_byte_order)) &&
+      (strm << _pd_marshaled_exception)
+    );
+}
+
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
+{
+  return (
+    (strm >> ::ACE_InputCDR::to_boolean (_pd_is_system_exception)) &&
+    (strm >> ::ACE_InputCDR::to_boolean (_pd_byte_order)) &&
+    (strm >> _pd_marshaled_exception)
+  );
+}
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.h b/TAO/tao/Messaging/OldExceptionHolderC.h
new file mode 100644
index 00000000000..b38d25aac88
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolderC.h
@@ -0,0 +1,297 @@
+// -*- 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:154
+
+#ifndef _TAO_IDL_OLDEXCEPTIONHOLDERC_H_
+#define _TAO_IDL_OLDEXCEPTIONHOLDERC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "messaging_export.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
+#include "tao/Valuetype/ValueFactory.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Valuetype/Value_VarOut_T.h"
+
+#include "tao/OctetSeqC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Messaging_Export
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:49
+
+namespace Messaging
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_valuetype.cpp:524
+  
+  
+
+#if !defined (_MESSAGING_EXCEPTIONHOLDER__VAR_OUT_CH_)
+#define _MESSAGING_EXCEPTIONHOLDER__VAR_OUT_CH_
+  
+  class ExceptionHolder;
+  typedef
+    TAO_Value_Var_T<
+        ExceptionHolder
+      >
+    ExceptionHolder_var;
+  
+  typedef
+    TAO_Value_Out_T<
+        ExceptionHolder
+      >
+    ExceptionHolder_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_valuetype/valuetype_ch.cpp:61
+
+#if !defined (_MESSAGING_EXCEPTIONHOLDER_CH_)
+#define _MESSAGING_EXCEPTIONHOLDER_CH_
+  
+  class TAO_Messaging_Export ExceptionHolder
+    : public virtual ::CORBA::ValueBase
+  {
+  public:
+    typedef ExceptionHolder_var _var_type;
+    
+    static ExceptionHolder* _downcast ( ::CORBA::ValueBase *);
+    
+    // (TAO extensions or internals)
+    static ::CORBA::Boolean _tao_unmarshal (
+        TAO_InputCDR &,
+        ExceptionHolder *&
+      );
+    
+    virtual const char* _tao_obv_repository_id (void) const;
+    
+    static const char* _tao_obv_static_repository_id (void);
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:469
+    
+    virtual void is_system_exception (::CORBA::Boolean) = 0;
+    virtual ::CORBA::Boolean is_system_exception (void) const = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:469
+    
+    virtual void byte_order (::CORBA::Boolean) = 0;
+    virtual ::CORBA::Boolean byte_order (void) const = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:542
+    
+    virtual void marshaled_exception (const CORBA::OctetSeq &) = 0;
+    virtual const CORBA::OctetSeq &marshaled_exception (void) const = 0;
+    virtual CORBA::OctetSeq &marshaled_exception (void) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/valuetype_ch.cpp:251
+  
+  protected:
+    ExceptionHolder (void);
+    
+    virtual ~ExceptionHolder (void);
+    
+    virtual ::CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
+    virtual ::CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+    
+  private:
+    ExceptionHolder (const ExceptionHolder &);
+    void operator= (const ExceptionHolder &);
+    
+  protected:
+    virtual ::CORBA::Boolean
+    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const = 0;
+    
+    virtual ::CORBA::Boolean
+    _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CH_)
+#define _MESSAGING_EXCEPTIONHOLDER___INIT_CH_
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_valuetype/valuetype_init_ch.cpp:72
+  
+  class TAO_Messaging_Export ExceptionHolder_init : public virtual ::CORBA::ValueFactoryBase
+  {
+  public:
+    ExceptionHolder_init (void);
+    
+    static ExceptionHolder_init* _downcast ( ::CORBA::ValueFactoryBase *);
+    
+    virtual ::CORBA::ValueBase *
+    create_for_unmarshal (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    // TAO-specific extensions
+  public:
+    virtual const char* tao_repository_id (void);
+  
+  protected:
+    virtual ~ExceptionHolder_init (void);
+  };
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:78
+
+} // module Messaging
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/obv_module.cpp:55
+
+namespace OBV_Messaging
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
+
+#if !defined (_MESSAGING_EXCEPTIONHOLDER___OBV_CH_)
+#define _MESSAGING_EXCEPTIONHOLDER___OBV_CH_
+  
+  // OBV_ class
+  class TAO_Messaging_Export ExceptionHolder
+    : public virtual Messaging::ExceptionHolder,
+      public virtual ::CORBA::DefaultValueRefCountBase
+  {
+  public:
+    ExceptionHolder (void);
+    virtual ~ExceptionHolder (void);
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:469
+    
+    virtual void is_system_exception (::CORBA::Boolean);
+    virtual ::CORBA::Boolean is_system_exception (void) const;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:469
+    
+    virtual void byte_order (::CORBA::Boolean);
+    virtual ::CORBA::Boolean byte_order (void) const;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:542
+    
+    virtual void marshaled_exception (const CORBA::OctetSeq &);
+    virtual const CORBA::OctetSeq &marshaled_exception (void) const;
+    virtual CORBA::OctetSeq &marshaled_exception (void);
+    
+  protected:
+    virtual ::CORBA::Boolean
+    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const;
+    
+    virtual ::CORBA::Boolean
+    _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &);
+    
+    ::CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &) const;
+    ::CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
+  
+  private:
+    ::CORBA::Boolean _pd_is_system_exception;
+    ::CORBA::Boolean _pd_byte_order;
+    CORBA::OctetSeq _pd_marshaled_exception;
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_MESSAGING_EXCEPTIONHOLDER__TRAITS_)
+#define _MESSAGING_EXCEPTIONHOLDER__TRAITS_
+  
+  template<>
+  struct TAO_Messaging_Export Value_Traits<Messaging::ExceptionHolder>
+  {
+    static void add_ref (Messaging::ExceptionHolder *);
+    static void remove_ref (Messaging::ExceptionHolder *);
+    static void release (Messaging::ExceptionHolder *);
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_valuetype.cpp:431
+
+namespace CORBA
+{
+  extern TAO_Messaging_Export void add_ref (Messaging::ExceptionHolder *);
+  extern TAO_Messaging_Export void remove_ref (Messaging::ExceptionHolder *);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/cdr_op_ch.cpp:61
+
+TAO_Messaging_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *);
+TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1040
+
+#if defined (__ACE_INLINE__)
+#include "OldExceptionHolderC.inl"
+#endif /* defined INLINE */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.inl b/TAO/tao/Messaging/OldExceptionHolderC.inl
new file mode 100644
index 00000000000..19c217e29e2
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolderC.inl
@@ -0,0 +1,40 @@
+// -*- 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_visitor_valuetype/valuetype_ci.cpp:56
+
+ACE_INLINE
+Messaging::ExceptionHolder::ExceptionHolder (void)
+{}
+
+ACE_INLINE const char* 
+Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
+{
+  return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
+}
diff --git a/TAO/tao/Messaging/OldExceptionHolderS.h b/TAO/tao/Messaging/OldExceptionHolderS.h
new file mode 100644
index 00000000000..de1c8620033
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolderS.h
@@ -0,0 +1,30 @@
+// -*- 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:373
+
diff --git a/TAO/tao/Messaging/TAO_ExtA.h b/TAO/tao/Messaging/TAO_ExtA.h
new file mode 100644
index 00000000000..c83d58ed9e0
--- /dev/null
+++ b/TAO/tao/Messaging/TAO_ExtA.h
@@ -0,0 +1,60 @@
+// -*- 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:754
+
+#ifndef _TAO_IDL_TAO_EXTA_H_
+#define _TAO_IDL_TAO_EXTA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "messaging_export.h"
+#include "tao/Messaging/TAO_ExtC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+#include "tao/AnyTypeCode/TimeBaseA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace TAO
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ConnectionTimeoutPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module TAO
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff
index 2864741069b..e7cb962f5a9 100644
--- a/TAO/tao/Messaging/diffs/Messaging.diff
+++ b/TAO/tao/Messaging/diffs/Messaging.diff
@@ -3,7 +3,7 @@
 @@ -40,6 +40,10 @@
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
+
 +#ifndef TAO_MESSAGING_SAFE_INCLUDE
 +#error "You should not include MessagingC.h directly, use Messaging.h"
 +#endif /* !TAO_MESSAGING_SAFE_INCLUDE */
@@ -15,8 +15,8 @@
 +++ MessagingC.cpp	2005-07-13 20:07:52.998072000 +0200
 @@ -29,7 +29,7 @@
  // be\be_codegen.cpp:291
- 
- 
+
+
 -#include "MessagingC.h"
 +#include "Messaging.h"
  #include "tao/CDR.h"
@@ -27,7 +27,7 @@
 @@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
+
 -#include "MessagingC.h"
 +#include "Messaging.h"
  #include "tao/Null_RefCount_Policy.h"
@@ -36,15 +36,15 @@
 --- orig/MessagingS.h	2005-07-13 20:07:51.586041600 +0200
 +++ MessagingS.h	2005-07-13 20:08:42.519280000 +0200
 @@ -33,11 +33,7 @@
- 
+
  #include /**/ "ace/pre.h"
- 
+
 -#include "MessagingC.h"
 -#include "tao/Messaging/Messaging_SyncScope_PolicyS.h"
 -#include "tao/Messaging/Messaging_RT_PolicyS.h"
 -#include "tao/Messaging/Messaging_No_ImplS.h"
 -#include "tao/Messaging/PollableS.h"
+-#include "tao/Messaging/OldExceptionHolderS.h"
 +#include "Messaging.h"
- #include "tao/OctetSeqS.h"
- 
+
  #if !defined (ACE_LACKS_PRAGMA_ONCE)