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

15 files changed, 1088 insertions, 60 deletions

diff --git a/TAO/tao/Messaging/ExceptionHolder.pidl b/TAO/tao/Messaging/ExceptionHolder.pidl
new file mode 100644
index 00000000000..28e50dc3efe
--- /dev/null
+++ b/TAO/tao/Messaging/ExceptionHolder.pidl
@@ -0,0 +1,43 @@
+// -*- 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)
+ *        ExceptionHolder.pidl
+ *
+ */
+//=============================================================================
+
+#ifndef TAO_MESSAGING_EXCEPTIONHOLDER_PIDL
+#define TAO_MESSAGING_EXCEPTIONHOLDER_PIDL
+
+#include "tao/OctetSeq.pidl"
+#include "tao/AnyTypeCode/Dynamic.pidl"
+
+#pragma prefix "omg.org"
+
+module Messaging
+{
+  /// Exception Delivery in the Callback Model
+  native UserExceptionBase;
+  valuetype ExceptionHolder {
+    void raise_exception() raises (UserExceptionBase);
+    void raise_exception_with_list(
+      in Dynamic::ExceptionList exc_list)
+      raises (UserExceptionBase);
+   private boolean is_system_exception;
+   private boolean byte_order;
+   private CORBA::OctetSeq marshaled_exception;
+  };
+};
+
+#endif /* TAO_MESSAGING_EXCEPTIONHOLDER_PIDL */
diff --git a/TAO/tao/Messaging/ExceptionHolderA.cpp b/TAO/tao/Messaging/ExceptionHolderA.cpp
new file mode 100644
index 00000000000..4acda37b712
--- /dev/null
+++ b/TAO/tao/Messaging/ExceptionHolderA.cpp
@@ -0,0 +1,196 @@
+// -*- 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 "ExceptionHolderA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.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"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+
+#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
+
+// 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::PRIVATE_MEMBER },
+    { "byte_order", &CORBA::_tc_boolean, ::CORBA::PRIVATE_MEMBER },
+    { "marshaled_exception", &CORBA::_tc_OctetSeq, ::CORBA::PRIVATE_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
+
+#endif
diff --git a/TAO/tao/Messaging/ExceptionHolderA.h b/TAO/tao/Messaging/ExceptionHolderA.h
new file mode 100644
index 00000000000..b3c03859799
--- /dev/null
+++ b/TAO/tao/Messaging/ExceptionHolderA.h
@@ -0,0 +1,86 @@
+// -*- 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_EXCEPTIONHOLDERA_H_
+#define _TAO_IDL_EXCEPTIONHOLDERA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "messaging_export.h"
+#include "tao/Messaging/ExceptionHolderC.h"
+#include "tao/AnyTypeCode/OctetSeqA.h"
+#include "tao/AnyTypeCode/DynamicA.h"
+
+
+#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
+// 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
+
+#endif
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/Messaging/ExceptionHolderC.cpp b/TAO/tao/Messaging/ExceptionHolderC.cpp
new file mode 100644
index 00000000000..285d835210b
--- /dev/null
+++ b/TAO/tao/Messaging/ExceptionHolderC.cpp
@@ -0,0 +1,307 @@
+// -*- 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 "ExceptionHolderC.h"
+#include "tao/CDR.h"
+#include "tao/Valuetype/ValueFactory.h"
+#include "tao/ORB_Core.h"
+#include "ace/OS_NS_string.h"
+
+#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
+#if !defined (__ACE_INLINE__)
+#include "ExceptionHolderC.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_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)
+  );
+}
+
+#endif
diff --git a/TAO/tao/Messaging/ExceptionHolderC.h b/TAO/tao/Messaging/ExceptionHolderC.h
new file mode 100644
index 00000000000..ffedf44d5f4
--- /dev/null
+++ b/TAO/tao/Messaging/ExceptionHolderC.h
@@ -0,0 +1,294 @@
+// -*- 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_EXCEPTIONHOLDERC_H_
+#define _TAO_IDL_EXCEPTIONHOLDERC_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/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Valuetype/Value_VarOut_T.h"
+
+#include "tao/OctetSeqC.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Messaging_Export
+
+#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
+// 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/valuetype_ch.cpp:400
+
+  public:
+    virtual void raise_exception (
+         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/valuetype_ch.cpp:400
+
+  public:
+    virtual void raise_exception_with_list (
+        const ::Dynamic::ExceptionList & ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      ) = 0;
+
+  protected:
+
+    // 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 */
+
+// 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:
+
+  protected:
+
+    // 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:
+    ExceptionHolder (void);
+    virtual ~ExceptionHolder (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 "ExceptionHolderC.inl"
+#endif /* defined INLINE */
+
+#endif
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/Messaging/ExceptionHolderC.inl b/TAO/tao/Messaging/ExceptionHolderC.inl
new file mode 100644
index 00000000000..6348b2eb0c7
--- /dev/null
+++ b/TAO/tao/Messaging/ExceptionHolderC.inl
@@ -0,0 +1,44 @@
+// -*- 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
+
+#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
+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";
+}
+
+#endif
diff --git a/TAO/tao/Messaging/ExceptionHolderS.h b/TAO/tao/Messaging/ExceptionHolderS.h
new file mode 100644
index 00000000000..17b1360599e
--- /dev/null
+++ b/TAO/tao/Messaging/ExceptionHolderS.h
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Messaging/MessagingA.h b/TAO/tao/Messaging/MessagingA.h
index e35e84188d5..f07ee68a2ab 100644
--- a/TAO/tao/Messaging/MessagingA.h
+++ b/TAO/tao/Messaging/MessagingA.h
@@ -38,8 +38,11 @@
 #include "tao/Messaging/Messaging_SyncScope_PolicyA.h"
 #include "tao/Messaging/Messaging_RT_PolicyA.h"
 #include "tao/Messaging/Messaging_No_ImplA.h"
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 #include "tao/Messaging/OldExceptionHolderA.h"
-
+#else
+#include "tao/Messaging/ExceptionHolderA.h"
+#endif
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index 4308c5ca4d1..a7ea6b985d0 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -55,7 +55,11 @@
 #include "tao/Messaging/Messaging_RT_PolicyC.h"
 #include "tao/Messaging/Messaging_No_ImplC.h"
 #include "tao/Messaging/PollableC.h"
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 #include "tao/Messaging/OldExceptionHolderC.h"
+#else
+#include "tao/Messaging/ExceptionHolderC.h"
+#endif
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/Messaging/OldExceptionHolderA.cpp b/TAO/tao/Messaging/OldExceptionHolderA.cpp
index b5d090f2809..8de6c9b59be 100644
--- a/TAO/tao/Messaging/OldExceptionHolderA.cpp
+++ b/TAO/tao/Messaging/OldExceptionHolderA.cpp
@@ -41,6 +41,7 @@
 // be\be_visitor_typecode/value_typecode.cpp:63
 
 
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/typecode_defn.cpp:937
@@ -50,7 +51,7 @@ static TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> c
     { "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 *,
@@ -64,7 +65,7 @@ static TAO::TypeCode::Value<char const *,
     &::CORBA::_tc_null,
     _tao_fields_Messaging_ExceptionHolder,
     3);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ExceptionHolder =
@@ -106,7 +107,7 @@ namespace Messaging
     ::CORBA::add_ref (_tao_elem);
     _tao_any <<= &_tao_elem;
   }
-  
+
   // Non-copying insertion.
   void
   operator<<= (
@@ -121,7 +122,7 @@ namespace Messaging
         *_tao_elem
       );
   }
-  
+
   ::CORBA::Boolean
   operator>>= (
       const ::CORBA::Any &_tao_any,
@@ -136,8 +137,8 @@ namespace Messaging
           _tao_elem
         );
   }
-  
-  
+
+
 }
 
 #else
@@ -185,3 +186,5 @@ operator>>= (
 
 
 #endif
+
+#endif /* */
diff --git a/TAO/tao/Messaging/OldExceptionHolderA.h b/TAO/tao/Messaging/OldExceptionHolderA.h
index f7612e9fe82..428e264c75d 100644
--- a/TAO/tao/Messaging/OldExceptionHolderA.h
+++ b/TAO/tao/Messaging/OldExceptionHolderA.h
@@ -37,6 +37,7 @@
 #include "tao/Messaging/OldExceptionHolderC.h"
 #include "tao/AnyTypeCode/OctetSeqA.h"
 
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
@@ -76,6 +77,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi
 
 #endif
 
+#endif /* */
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.cpp b/TAO/tao/Messaging/OldExceptionHolderC.cpp
index 28f4186212a..a51fe765e3c 100644
--- a/TAO/tao/Messaging/OldExceptionHolderC.cpp
+++ b/TAO/tao/Messaging/OldExceptionHolderC.cpp
@@ -37,6 +37,8 @@
 #include "OldExceptionHolderC.inl"
 #endif /* !defined INLINE */
 
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -120,29 +122,29 @@ Messaging::ExceptionHolder::~ExceptionHolder (void)
         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);
@@ -166,7 +168,7 @@ Messaging::ExceptionHolder_init::_downcast ( ::CORBA::ValueFactoryBase *v)
   return dynamic_cast< ::Messaging::ExceptionHolder_init * > (v);
 }
 
-const char* 
+const char*
 Messaging::ExceptionHolder_init::tao_repository_id (void)
 {
   return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
@@ -334,3 +336,5 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
     (strm >> _pd_marshaled_exception)
   );
 }
+
+#endif /* */
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.h b/TAO/tao/Messaging/OldExceptionHolderC.h
index b38d25aac88..6c4049eb423 100644
--- a/TAO/tao/Messaging/OldExceptionHolderC.h
+++ b/TAO/tao/Messaging/OldExceptionHolderC.h
@@ -56,27 +56,29 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Messaging_Export
 
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
 // 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
@@ -84,71 +86,71 @@ namespace Messaging
     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;
   };
@@ -157,26 +159,26 @@ namespace Messaging
 
 #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);
   };
@@ -193,13 +195,13 @@ namespace Messaging
 
 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,
@@ -208,36 +210,36 @@ namespace OBV_Messaging
   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;
@@ -256,7 +258,7 @@ namespace TAO
 
 #if !defined (_MESSAGING_EXCEPTIONHOLDER__TRAITS_)
 #define _MESSAGING_EXCEPTIONHOLDER__TRAITS_
-  
+
   template<>
   struct TAO_Messaging_Export Value_Traits<Messaging::ExceptionHolder>
   {
@@ -290,6 +292,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Exc
 #include "OldExceptionHolderC.inl"
 #endif /* defined INLINE */
 
+#endif /* */
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.inl b/TAO/tao/Messaging/OldExceptionHolderC.inl
index 19c217e29e2..0e9229fa8d4 100644
--- a/TAO/tao/Messaging/OldExceptionHolderC.inl
+++ b/TAO/tao/Messaging/OldExceptionHolderC.inl
@@ -26,15 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_ci.cpp:56
 
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
 ACE_INLINE
 Messaging::ExceptionHolder::ExceptionHolder (void)
 {}
 
-ACE_INLINE const char* 
+ACE_INLINE const char*
 Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
 {
   return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
 }
+
+#endif /* */
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index da52c94ba3f..a4bcbd98704 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -876,6 +876,11 @@ enum TAO_Policy_Scope
 #define TAO_RESET_OUTPUT_CDR_AFTER_SEND 0
 #endif /* TAO_RESET_OUTPUT_CDR_AFTER_SEND */
 
+/// By default at this moment we use the deprecated exception holder
+/// when the new version is ready we will remove this define.
+#define TAO_HAS_DEPRECATED_EXCEPTION_HOLDER
+
+
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_ORBCONF_H */