*** empty log message ***

8 files changed, 150 insertions, 2389 deletions

diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Kokyu_qosC.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Kokyu_qosC.cpp
deleted file mode 100644
index cc9bc66c9ce..00000000000
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Kokyu_qosC.cpp
+++ /dev/null
@@ -1,647 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:318
-
-
-#include "Kokyu_qosC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "Kokyu_qosC.i"
-#endif /* !defined INLINE */
-
-#if !defined (_KOKYU_GUIDTYPE_CS_)
-#define _KOKYU_GUIDTYPE_CS_
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:250
-
-// *************************************************************
-// Kokyu::GuidType
-// *************************************************************
-
-Kokyu::GuidType::GuidType (void)
-{}
-
-Kokyu::GuidType::GuidType (CORBA::ULong max)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-
-Kokyu::GuidType::GuidType (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Octet *buffer,
-    CORBA::Boolean release
-  )
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-
-Kokyu::GuidType::GuidType (const GuidType &seq)
-  : 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-
-Kokyu::GuidType::~GuidType (void) // dtor
-{}
-
-void Kokyu::GuidType::_tao_any_destructor (void *_tao_void_pointer)
-{
-  GuidType *tmp = ACE_static_cast (GuidType*, _tao_void_pointer);
-  delete tmp;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_Kokyu_GuidType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4b6f6b79), 
-  ACE_NTOHL (0x752f4775), 
-  ACE_NTOHL (0x69645479), 
-  ACE_NTOHL (0x70653a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Kokyu/GuidType:1.0
-  9,
-  ACE_NTOHL (0x47756964), 
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x0),  // name = GuidType
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Kokyu_GuidType (
-    CORBA::tk_alias,
-    sizeof (_oc_Kokyu_GuidType),
-    (char *) &_oc_Kokyu_GuidType,
-    0,
-    sizeof (Kokyu::GuidType)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Kokyu)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_GuidType,
-    &_tc_TAO_tc_Kokyu_GuidType
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_Kokyu_Svc_Ctxt_DSRT_QoS[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4b6f6b79), 
-  ACE_NTOHL (0x752f5376), 
-  ACE_NTOHL (0x635f4374), 
-  ACE_NTOHL (0x78745f44), 
-  ACE_NTOHL (0x5352545f), 
-  ACE_NTOHL (0x516f533a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Kokyu/Svc_Ctxt_DSRT_QoS:1.0
-  18,
-  ACE_NTOHL (0x5376635f), 
-  ACE_NTOHL (0x43747874), 
-  ACE_NTOHL (0x5f445352), 
-  ACE_NTOHL (0x545f516f), 
-  ACE_NTOHL (0x53000000),  // name = Svc_Ctxt_DSRT_QoS
-  6, // member count
-  5,
-  ACE_NTOHL (0x67756964), 
-  ACE_NTOHL (0x0),  // name = guid
-  CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x4b6f6b79), 
-    ACE_NTOHL (0x752f4775), 
-    ACE_NTOHL (0x69645479), 
-    ACE_NTOHL (0x70653a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Kokyu/GuidType:1.0
-    9,
-    ACE_NTOHL (0x47756964), 
-    ACE_NTOHL (0x54797065), 
-    ACE_NTOHL (0x0),  // name = GuidType
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-  11,
-  ACE_NTOHL (0x696d706f), 
-  ACE_NTOHL (0x7274616e), 
-  ACE_NTOHL (0x63650000),  // name = importance
-  CORBA::tk_long,
-
-  12,
-  ACE_NTOHL (0x63726974), 
-  ACE_NTOHL (0x6963616c), 
-  ACE_NTOHL (0x69747900),  // name = criticality
-  CORBA::tk_long,
-
-  17,
-  ACE_NTOHL (0x64657369), 
-  ACE_NTOHL (0x7265645f), 
-  ACE_NTOHL (0x7072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x0),  // name = desired_priority
-  CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-    9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
-
-
-  9,
-  ACE_NTOHL (0x64656164), 
-  ACE_NTOHL (0x6c696e65), 
-  ACE_NTOHL (0x0),  // name = deadline
-  CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
-
-
-  33,
-  ACE_NTOHL (0x65737469), 
-  ACE_NTOHL (0x6d617465), 
-  ACE_NTOHL (0x645f696e), 
-  ACE_NTOHL (0x69746961), 
-  ACE_NTOHL (0x6c5f6578), 
-  ACE_NTOHL (0x65637574), 
-  ACE_NTOHL (0x696f6e5f), 
-  ACE_NTOHL (0x74696d65), 
-  ACE_NTOHL (0x0),  // name = estimated_initial_execution_time
-  0xffffffff, // indirection
-  0xffffff94, // negative offset (-108)
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Kokyu_Svc_Ctxt_DSRT_QoS (
-    CORBA::tk_struct,
-    sizeof (_oc_Kokyu_Svc_Ctxt_DSRT_QoS),
-    (char *) &_oc_Kokyu_Svc_Ctxt_DSRT_QoS,
-    0,
-    sizeof (Kokyu::Svc_Ctxt_DSRT_QoS)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Kokyu)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Svc_Ctxt_DSRT_QoS,
-    &_tc_TAO_tc_Kokyu_Svc_Ctxt_DSRT_QoS
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:67
-
-void Kokyu::Svc_Ctxt_DSRT_QoS::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Svc_Ctxt_DSRT_QoS *tmp = ACE_static_cast (Svc_Ctxt_DSRT_QoS*, _tao_void_pointer);
-  delete tmp;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Kokyu::GuidType &_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Kokyu::_tc_GuidType,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Kokyu::GuidType *_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Kokyu::_tc_GuidType,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Kokyu::GuidType::_tao_any_destructor
-        );
-    }
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Kokyu::GuidType *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast(
-      const Kokyu::GuidType*&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Kokyu::GuidType *&_tao_elem
-  )
-{
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Kokyu::_tc_GuidType
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast(
-            const Kokyu::GuidType*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Kokyu::GuidType *tmp = 0;
-        ACE_NEW_RETURN (
-            tmp,
-            Kokyu::GuidType,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Kokyu::_tc_GuidType,
-                1,
-                ACE_static_cast (void *, tmp),
-                Kokyu::GuidType::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Kokyu::Svc_Ctxt_DSRT_QoS &_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << _tao_elem)
-    {
-      _tao_any._tao_replace (
-          Kokyu::_tc_Svc_Ctxt_DSRT_QoS,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin ()
-        );
-    }
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Kokyu::Svc_Ctxt_DSRT_QoS *_tao_elem
-  )
-{
-  TAO_OutputCDR stream;
-  
-  if (stream << *_tao_elem)
-    {
-      _tao_any._tao_replace (
-          Kokyu::_tc_Svc_Ctxt_DSRT_QoS,
-          TAO_ENCAP_BYTE_ORDER,
-          stream.begin (),
-          1,
-          _tao_elem,
-          Kokyu::Svc_Ctxt_DSRT_QoS::_tao_any_destructor
-        );
-    }
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Kokyu::Svc_Ctxt_DSRT_QoS *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const Kokyu::Svc_Ctxt_DSRT_QoS *&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Kokyu::Svc_Ctxt_DSRT_QoS *&_tao_elem
-  )
-{
-  _tao_elem = 0;
-  
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result =
-      type->equivalent (
-          Kokyu::_tc_Svc_Ctxt_DSRT_QoS
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    
-    if (result == 0)
-      {
-        return 0; // not equivalent
-      }
-    
-    if (_tao_any.any_owns_data ())
-      {
-        _tao_elem = ACE_static_cast (
-            const Kokyu::Svc_Ctxt_DSRT_QoS*,
-            _tao_any.value ()
-          );
-        
-        return 1;
-      }
-    else
-      {
-        Kokyu::Svc_Ctxt_DSRT_QoS *tmp;
-        ACE_NEW_RETURN (
-            tmp,
-            Kokyu::Svc_Ctxt_DSRT_QoS,
-            0
-          );
-        
-        TAO_InputCDR stream (
-            _tao_any._tao_get_cdr (),
-            _tao_any._tao_byte_order ()
-          );
-        
-        if (stream >> *tmp)
-          {
-            ((CORBA::Any *)&_tao_any)->_tao_replace (
-                Kokyu::_tc_Svc_Ctxt_DSRT_QoS,
-                1,
-                ACE_static_cast (void *, tmp),
-                Kokyu::Svc_Ctxt_DSRT_QoS::_tao_any_destructor
-              );
-            
-            _tao_elem = tmp;
-            return 1;
-          }
-        else
-          {
-            delete tmp;
-          }
-      }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:103
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Kokyu::GuidType &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Kokyu::GuidType *)&_tao_sequence);
-        if (oseq->mb ())
-          return strm.write_octet_array_mb (oseq->mb ());
-        else
-          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-      }
-      
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    }
-  
-  return 0;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Kokyu::GuidType &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return 1;
-        }
-      
-      // Retrieve all the elements.
-      
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      if (ACE_BIT_DISABLED (strm.start ()->flags (),
-      ACE_Message_Block::DONT_DELETE))
-      {
-        TAO_ORB_Core* orb_core = strm.orb_core ();
-        if (orb_core != 0 &&
-        strm.orb_core ()->resource_factory ()->
-        input_cdr_allocator_type_locked () == 1)
-        {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-          oseq->replace (_tao_seq_len, strm.start ());
-          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-          strm.skip_bytes (_tao_seq_len);
-          return 1;
-        }
-      }
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    }
-  
-  return 0;
-}
-
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Kokyu_qosC.h b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Kokyu_qosC.h
deleted file mode 100644
index 5c1ad4e62c5..00000000000
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Kokyu_qosC.h
+++ /dev/null
@@ -1,350 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:151
-
-#ifndef _TAO_IDL_KOKYU_QOSC_H_
-#define _TAO_IDL_KOKYU_QOSC_H_
-
-
-#include "tao/corba.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#include "RTSchedulerC.h"
-#include "RTCORBAC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO 
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO 
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
-
-TAO_NAMESPACE  Kokyu
-{
-
-#if !defined (_KOKYU_GUIDTYPE_CH_)
-#define _KOKYU_GUIDTYPE_CH_
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:371
-  
-  class GuidType;
-  class GuidType_var;
-  
-  // *************************************************************
-  // Kokyu::GuidType
-  // *************************************************************
-  
-  class  GuidType : public 
-  
-  // TAO_IDL - Generated from 
-  // be/be_visitor_sequence/sequence_ch.cpp:51
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    GuidType (void);
-    GuidType (CORBA::ULong max);
-    GuidType (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        CORBA::Octet *buffer, 
-        CORBA::Boolean release = 0
-      );
-    GuidType (const GuidType &);
-    ~GuidType (void);
-    
-    static void _tao_any_destructor (void*);
-    
-    typedef GuidType_var _var_type;
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    GuidType (
-        CORBA::ULong length,
-        const ACE_Message_Block* mb
-      )
-      : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_KOKYU_GUIDTYPE___VAR_CH_)
-#define _KOKYU_GUIDTYPE___VAR_CH_
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:549
-  
-  // *************************************************************
-  // class Kokyu::GuidType_var
-  // *************************************************************
-  
-  class  GuidType_var
-  {
-  public:
-    GuidType_var (void);
-    GuidType_var (GuidType *);
-    GuidType_var (const GuidType_var &);
-    
-    // Fixed-size base types only.
-    GuidType_var (const GuidType &);
-    
-    ~GuidType_var (void);
-    
-    GuidType_var &operator= (GuidType *);
-    GuidType_var &operator= (const GuidType_var &);
-    
-    // Fixed-size base types only.
-    GuidType_var &operator= (const GuidType &);
-    
-    GuidType *operator-> (void);
-    const GuidType *operator-> (void) const;
-    
-    operator const GuidType &() const;
-    operator GuidType &();
-    operator GuidType &() const;
-    CORBA::Octet & operator[] (CORBA::ULong index);
-    const CORBA::Octet & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const GuidType &in (void) const;
-    GuidType &inout (void);
-    GuidType *&out (void);
-    GuidType *_retn (void);
-    GuidType *ptr (void) const;
-  
-  private:
-    GuidType *ptr_;
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_KOKYU_GUIDTYPE___OUT_CH_)
-#define _KOKYU_GUIDTYPE___OUT_CH_
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:753
-  
-  class  GuidType_out
-  {
-  public:
-    GuidType_out (GuidType *&);
-    GuidType_out (GuidType_var &);
-    GuidType_out (const GuidType_out &);
-    GuidType_out &operator= (const GuidType_out &);
-    GuidType_out &operator= (GuidType *);
-    operator GuidType *&();
-    GuidType *&ptr (void);
-    GuidType *operator-> (void);
-    CORBA::Octet & operator[] (CORBA::ULong index);
-  
-  private:
-    GuidType *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const GuidType_var &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_GuidType;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:49
-  
-  class Svc_Ctxt_DSRT_QoS_var;
-  
-  struct  Svc_Ctxt_DSRT_QoS
-  {
-    typedef Svc_Ctxt_DSRT_QoS_var _var_type;
-    
-    static void _tao_any_destructor (void *);
-    Kokyu::GuidType guid;
-    CORBA::Long importance;
-    CORBA::Long criticality;
-    RTCORBA::Priority desired_priority;
-    TimeBase::TimeT deadline;
-    TimeBase::TimeT estimated_initial_execution_time;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:71
-  
-  class  Svc_Ctxt_DSRT_QoS_var
-  {
-  public:
-    Svc_Ctxt_DSRT_QoS_var (void);
-    Svc_Ctxt_DSRT_QoS_var (Svc_Ctxt_DSRT_QoS *);
-    Svc_Ctxt_DSRT_QoS_var (const Svc_Ctxt_DSRT_QoS_var &);
-    ~Svc_Ctxt_DSRT_QoS_var (void);
-    
-    Svc_Ctxt_DSRT_QoS_var &operator= (Svc_Ctxt_DSRT_QoS *);
-    Svc_Ctxt_DSRT_QoS_var &operator= (const Svc_Ctxt_DSRT_QoS_var &);
-    Svc_Ctxt_DSRT_QoS *operator-> (void);
-    const Svc_Ctxt_DSRT_QoS *operator-> (void) const;
-    
-    operator const Svc_Ctxt_DSRT_QoS &() const;
-    operator Svc_Ctxt_DSRT_QoS &();
-    operator Svc_Ctxt_DSRT_QoS &() const;
-    
-    // Variable-size types only.
-    operator Svc_Ctxt_DSRT_QoS *&();
-    
-    // in, inout, out, _retn 
-    const Svc_Ctxt_DSRT_QoS &in (void) const;
-    Svc_Ctxt_DSRT_QoS &inout (void);
-    Svc_Ctxt_DSRT_QoS *&out (void);
-    Svc_Ctxt_DSRT_QoS *_retn (void);
-    Svc_Ctxt_DSRT_QoS *ptr (void) const;
-  
-  private:
-    Svc_Ctxt_DSRT_QoS *ptr_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_structure.cpp:445
-  
-  class  Svc_Ctxt_DSRT_QoS_out
-  {
-  public:
-    Svc_Ctxt_DSRT_QoS_out (Svc_Ctxt_DSRT_QoS *&);
-    Svc_Ctxt_DSRT_QoS_out (Svc_Ctxt_DSRT_QoS_var &);
-    Svc_Ctxt_DSRT_QoS_out (const Svc_Ctxt_DSRT_QoS_out &);
-    Svc_Ctxt_DSRT_QoS_out &operator= (const Svc_Ctxt_DSRT_QoS_out &);
-    Svc_Ctxt_DSRT_QoS_out &operator= (Svc_Ctxt_DSRT_QoS *);
-    operator Svc_Ctxt_DSRT_QoS *&();
-    Svc_Ctxt_DSRT_QoS *&ptr (void);
-    Svc_Ctxt_DSRT_QoS *operator-> (void);
-    
-  private:
-    Svc_Ctxt_DSRT_QoS *&ptr_;
-    // Assignment from T_var not allowed.
-    void operator= (const Svc_Ctxt_DSRT_QoS_var &);
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Svc_Ctxt_DSRT_QoS;
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
-
-}
-TAO_NAMESPACE_CLOSE // module Kokyu
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
- void operator<<= (CORBA::Any &, const Kokyu::GuidType &); // copying version
- void operator<<= (CORBA::Any &, Kokyu::GuidType*); // noncopying version
- CORBA::Boolean operator>>= (const CORBA::Any &, Kokyu::GuidType *&); // deprecated
- CORBA::Boolean operator>>= (const CORBA::Any &, const Kokyu::GuidType *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
- void operator<<= (CORBA::Any &, const Kokyu::Svc_Ctxt_DSRT_QoS &); // copying version
- void operator<<= (CORBA::Any &, Kokyu::Svc_Ctxt_DSRT_QoS*); // noncopying version
- CORBA::Boolean operator>>= (const CORBA::Any &, Kokyu::Svc_Ctxt_DSRT_QoS *&); // deprecated
- CORBA::Boolean operator>>= (const CORBA::Any &, const Kokyu::Svc_Ctxt_DSRT_QoS *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:57
-
-#if !defined _TAO_CDR_OP_Kokyu_GuidType_H_
-#define _TAO_CDR_OP_Kokyu_GuidType_H_
-
- CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const Kokyu::GuidType &
-  );
- CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    Kokyu::GuidType &
-  );
-
-#endif /* _TAO_CDR_OP_Kokyu_GuidType_H_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
-
- CORBA::Boolean operator<< (TAO_OutputCDR &, const Kokyu::Svc_Ctxt_DSRT_QoS &);
- CORBA::Boolean operator>> (TAO_InputCDR &, Kokyu::Svc_Ctxt_DSRT_QoS &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1004
-
-#if defined (__ACE_INLINE__)
-#include "Kokyu_qosC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#endif /* ifndef */
-
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Kokyu_qosC.i b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Kokyu_qosC.i
deleted file mode 100644
index 56edaae1cd6..00000000000
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Kokyu_qosC.i
+++ /dev/null
@@ -1,559 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-#if !defined (_KOKYU_GUIDTYPE_CI_)
-#define _KOKYU_GUIDTYPE_CI_
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:226
-
-// *************************************************************
-// Inline operations for class Kokyu::GuidType_var
-// *************************************************************
-
-ACE_INLINE
-Kokyu::GuidType_var::GuidType_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Kokyu::GuidType_var::GuidType_var (GuidType *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Kokyu::GuidType_var::GuidType_var (const ::Kokyu::GuidType_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Kokyu::GuidType (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-// Fixed-size base types only.
-ACE_INLINE
-Kokyu::GuidType_var::GuidType_var (const ::Kokyu::GuidType &p)
-{
-  ACE_NEW (this->ptr_, ::Kokyu::GuidType (p));
-}
-
-ACE_INLINE
-Kokyu::GuidType_var::~GuidType_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Kokyu::GuidType_var &
-Kokyu::GuidType_var::operator= (GuidType *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-::Kokyu::GuidType_var &
-Kokyu::GuidType_var::operator= (const ::Kokyu::GuidType_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          GuidType *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              GuidType (*p.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              GuidType *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// Fixed-size types only.
-ACE_INLINE
-::Kokyu::GuidType_var &
-Kokyu::GuidType_var::operator= (const ::Kokyu::GuidType &p)
-{
-  if (this->ptr_ != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_, ::Kokyu::GuidType (p), *this);
-    }
-  
-  return *this;
-}
-
-ACE_INLINE
-const ::Kokyu::GuidType *
-Kokyu::GuidType_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Kokyu::GuidType *
-Kokyu::GuidType_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Kokyu::GuidType_var::operator const ::Kokyu::GuidType &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Kokyu::GuidType_var::operator ::Kokyu::GuidType &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Kokyu::GuidType_var::operator ::Kokyu::GuidType &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Octet &
-Kokyu::GuidType_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-const CORBA::Octet &
-Kokyu::GuidType_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE
-const ::Kokyu::GuidType &
-Kokyu::GuidType_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Kokyu::GuidType &
-Kokyu::GuidType_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-::Kokyu::GuidType *&
-Kokyu::GuidType_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Kokyu::GuidType *
-Kokyu::GuidType_var::_retn (void)
-{
-  ::Kokyu::GuidType *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE
-::Kokyu::GuidType *
-Kokyu::GuidType_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_ci.cpp:567
-
-// *************************************************************
-// Inline operations for class Kokyu::GuidType_out
-// *************************************************************
-
-ACE_INLINE
-Kokyu::GuidType_out::GuidType_out (GuidType *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Kokyu::GuidType_out::GuidType_out (GuidType_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Kokyu::GuidType_out::GuidType_out (const ::Kokyu::GuidType_out &p)
-  : ptr_ (ACE_const_cast (GuidType_out&, p).ptr_)
-{}
-
-ACE_INLINE
-::Kokyu::GuidType_out &
-Kokyu::GuidType_out::operator= (const ::Kokyu::GuidType_out &p)
-{
-  this->ptr_ = ACE_const_cast (GuidType_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-::Kokyu::GuidType_out &
-Kokyu::GuidType_out::operator= (GuidType *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Kokyu::GuidType_out::operator ::Kokyu::GuidType *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Kokyu::GuidType *&
-Kokyu::GuidType_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-::Kokyu::GuidType *
-Kokyu::GuidType_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Octet &
-Kokyu::GuidType_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:194
-
-// *************************************************************
-// Inline operations for class Kokyu::Svc_Ctxt_DSRT_QoS_var
-// *************************************************************
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_var::Svc_Ctxt_DSRT_QoS_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_var::Svc_Ctxt_DSRT_QoS_var (Svc_Ctxt_DSRT_QoS *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_var::Svc_Ctxt_DSRT_QoS_var (const ::Kokyu::Svc_Ctxt_DSRT_QoS_var &p)
-{
-  if (p.ptr_)
-    {
-      ACE_NEW (this->ptr_, ::Kokyu::Svc_Ctxt_DSRT_QoS (*p.ptr_));
-    }
-  else
-    {
-      this->ptr_ = 0;
-    }
-}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_var::~Svc_Ctxt_DSRT_QoS_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_var &
-Kokyu::Svc_Ctxt_DSRT_QoS_var::operator= (Svc_Ctxt_DSRT_QoS *_tao_struct_var)
-{
-  delete this->ptr_;
-  this->ptr_ = _tao_struct_var;
-  return *this;
-}
-
-ACE_INLINE
-::Kokyu::Svc_Ctxt_DSRT_QoS_var &
-Kokyu::Svc_Ctxt_DSRT_QoS_var::operator= (const ::Kokyu::Svc_Ctxt_DSRT_QoS_var &_tao_struct_var)
-{
-  if (this != &_tao_struct_var)
-    {
-      if (_tao_struct_var.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Svc_Ctxt_DSRT_QoS *deep_copy = 0;
-          ACE_NEW_RETURN (
-              deep_copy,
-              Svc_Ctxt_DSRT_QoS (*_tao_struct_var.ptr_),
-              *this
-            );
-          
-          if (deep_copy != 0)
-            {
-              Svc_Ctxt_DSRT_QoS *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::Kokyu::Svc_Ctxt_DSRT_QoS *
-Kokyu::Svc_Ctxt_DSRT_QoS_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Kokyu::Svc_Ctxt_DSRT_QoS *
-Kokyu::Svc_Ctxt_DSRT_QoS_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_var::operator const ::Kokyu::Svc_Ctxt_DSRT_QoS &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_var::operator ::Kokyu::Svc_Ctxt_DSRT_QoS &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_var::operator ::Kokyu::Svc_Ctxt_DSRT_QoS &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// Variable-size types only.
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_var::operator ::Kokyu::Svc_Ctxt_DSRT_QoS *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::Kokyu::Svc_Ctxt_DSRT_QoS &
-Kokyu::Svc_Ctxt_DSRT_QoS_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::Kokyu::Svc_Ctxt_DSRT_QoS &
-Kokyu::Svc_Ctxt_DSRT_QoS_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// Mapping for variable size.
-ACE_INLINE ::Kokyu::Svc_Ctxt_DSRT_QoS *&
-Kokyu::Svc_Ctxt_DSRT_QoS_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::Kokyu::Svc_Ctxt_DSRT_QoS *
-Kokyu::Svc_Ctxt_DSRT_QoS_var::_retn (void)
-{
-  ::Kokyu::Svc_Ctxt_DSRT_QoS *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::Kokyu::Svc_Ctxt_DSRT_QoS *
-Kokyu::Svc_Ctxt_DSRT_QoS_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// be/be_structure.cpp:523
-
-// *************************************************************
-// Inline operations for class Kokyu::Svc_Ctxt_DSRT_QoS_out
-// *************************************************************
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_out::Svc_Ctxt_DSRT_QoS_out (::Kokyu::Svc_Ctxt_DSRT_QoS *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_out::Svc_Ctxt_DSRT_QoS_out (Svc_Ctxt_DSRT_QoS_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_out::Svc_Ctxt_DSRT_QoS_out (const ::Kokyu::Svc_Ctxt_DSRT_QoS_out &p)
-  : ptr_ (ACE_const_cast (Svc_Ctxt_DSRT_QoS_out&, p).ptr_)
-{}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_out &
-Kokyu::Svc_Ctxt_DSRT_QoS_out::operator= (const ::Kokyu::Svc_Ctxt_DSRT_QoS_out &p)
-{
-  this->ptr_ = ACE_const_cast (Svc_Ctxt_DSRT_QoS_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE
-Kokyu::Svc_Ctxt_DSRT_QoS_out &
-Kokyu::Svc_Ctxt_DSRT_QoS_out::operator= (Svc_Ctxt_DSRT_QoS *_tao_struct_out)
-{
-  this->ptr_ = _tao_struct_out;
-  return *this;
-}
-
-ACE_INLINE 
-Kokyu::Svc_Ctxt_DSRT_QoS_out::operator ::Kokyu::Svc_Ctxt_DSRT_QoS *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Kokyu::Svc_Ctxt_DSRT_QoS *&
-Kokyu::Svc_Ctxt_DSRT_QoS_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Kokyu::Svc_Ctxt_DSRT_QoS *
-Kokyu::Svc_Ctxt_DSRT_QoS_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:84
-
-#if !defined _TAO_CDR_OP_Kokyu_GuidType_I_
-#define _TAO_CDR_OP_Kokyu_GuidType_I_
-
-CORBA::Boolean  operator<< (
-    TAO_OutputCDR &,
-    const Kokyu::GuidType &
-  );
-
-CORBA::Boolean  operator>> (
-    TAO_InputCDR &,
-    Kokyu::GuidType &
-  );
-
-#endif /* _TAO_CDR_OP_Kokyu_GuidType_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:71
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Kokyu::Svc_Ctxt_DSRT_QoS &_tao_aggregate
-  )
-{
-  if (
-    (strm << _tao_aggregate.guid) &&
-    (strm << _tao_aggregate.importance) &&
-    (strm << _tao_aggregate.criticality) &&
-    (strm << _tao_aggregate.desired_priority) &&
-    (strm << _tao_aggregate.deadline) &&
-    (strm << _tao_aggregate.estimated_initial_execution_time)
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Kokyu::Svc_Ctxt_DSRT_QoS &_tao_aggregate
-  )
-{
-  if (
-    (strm >> _tao_aggregate.guid) &&
-    (strm >> _tao_aggregate.importance) &&
-    (strm >> _tao_aggregate.criticality) &&
-    (strm >> _tao_aggregate.desired_priority) &&
-    (strm >> _tao_aggregate.deadline) &&
-    (strm >> _tao_aggregate.estimated_initial_execution_time)
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/MIF_Scheduler.cpp
deleted file mode 100644
index 0bb4982b62b..00000000000
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/MIF_Scheduler.cpp
+++ /dev/null
@@ -1,604 +0,0 @@
-//$Id$
-
-#include "MIF_Scheduler.h"
-#include "ace/Atomic_Op.h"
-#include "Kokyu_qosC.h"
-
-//this needs to be formally defined in IOP.pidl
-namespace
-{
-  static const IOP::ServiceId service_id = 0xdddd;
-}
-
-void guid_copy( Kokyu::GuidType& lhs, const RTScheduling::Current::IdType& rhs)
-{
-  lhs.length(rhs.length ());
-  ACE_OS::memcpy(lhs.get_buffer (),
-                 rhs.get_buffer (),
-                 rhs.length ());
-}
-
-void guid_copy( RTScheduling::Current::IdType& lhs, const Kokyu::GuidType& rhs)
-{
-  lhs.length(rhs.length ());
-  ACE_OS::memcpy(lhs.get_buffer (),
-                 rhs.get_buffer (),
-                 rhs.length ());
-}
-
-ACE_Atomic_Op<ACE_Thread_Mutex, long> server_guid_counter;
-
-MIF_Scheduling::SchedulingParameter
-MIF_Sched_Param_Policy::value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->value_;
-}
-
-void
-MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->value_ = value;
-}
-
-MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb)
-  : orb_ (orb)
-{
-  Kokyu::DSRT_ConfigInfo config;
-
-  config.sched_strategy_ = Kokyu::DSRT_MIF;
-  kokyu_dispatcher_ = Kokyu::Dispatcher_Factory::create_DSRT_dispatcher (config);
-
-  CORBA::Object_var object =
-    orb->resolve_initial_references ("RTScheduler_Current"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  this->current_ =
-    RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  IOP::CodecFactory_var codec_factory;
-  CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory");
-
-  if (CORBA::is_nil(obj.in ()))
-    {
-      ACE_ERROR ((LM_ERROR, "Nil Codec factory\n"));
-    }
-  else
-    {
-      codec_factory = IOP::CodecFactory::_narrow (obj.in ());
-    }
-
-  IOP::Encoding encoding;
-  encoding.format = IOP::ENCODING_CDR_ENCAPS;
-  encoding.major_version = 1;
-  encoding.minor_version = 2;
-
-  codec_ = codec_factory->create_codec (encoding);
-}
-
-MIF_Scheduler::~MIF_Scheduler (void)
-{
-  //  delete kokyu_dispatcher_;
-}
-
-void
-MIF_Scheduler::shutdown (void)
-{
-  kokyu_dispatcher_->shutdown ();
-}
-
-MIF_Scheduling::SchedulingParameterPolicy_ptr
-MIF_Scheduler::create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  MIF_Scheduling::SchedulingParameterPolicy_ptr sched_param_policy;
-  ACE_NEW_THROW_EX (sched_param_policy,
-                    MIF_Sched_Param_Policy,
-                    CORBA::NO_MEMORY (
-                                      CORBA::SystemException::_tao_minor_code (
-                                       TAO_DEFAULT_MINOR_CODE,
-                                       ENOMEM),
-                                      CORBA::COMPLETED_NO));
-
-  sched_param_policy->value (value);
-
-  return sched_param_policy;
-}
-
-
-void
-MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType &/*guid*/,
-                                             const char *,
-                                             CORBA::Policy_ptr sched_policy,
-                                             CORBA::Policy_ptr
-                                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
-{
-  int count;
-  ACE_OS::memcpy (&count,
-                  this->current_->id ()->get_buffer (),
-                  this->current_->id ()->length ());
-
-  Kokyu::DSRT_QoSDescriptor qos;
-  MIF_Scheduling::SchedulingParameterPolicy_var sched_param_policy =
-    MIF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy);
-
-  MIF_Scheduling::SchedulingParameter_var sched_param = sched_param_policy->value ();
-  CORBA::Short importance = sched_param->importance;
-  qos.importance_ = importance;
-  kokyu_dispatcher_->schedule (count, qos);
-}
-
-void
-MIF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid,
-                                                           const char *name,
-                                                           CORBA::Policy_ptr sched_param,
-                                                           CORBA::Policy_ptr implicit_sched_param
-                                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
-{
-  this->begin_new_scheduling_segment (guid,
-                                      name,
-                                      sched_param,
-                                      implicit_sched_param
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &/*guid*/,
-                                          const char */*name*/,
-                                          CORBA::Policy_ptr sched_policy,
-                                          CORBA::Policy_ptr /*implicit_sched_param*/
-                                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
-{
-  int count ;
-  ACE_OS::memcpy (&count,
-                  this->current_->id ()->get_buffer (),
-                  this->current_->id ()->length ());
-
-  MIF_Scheduling::SchedulingParameterPolicy_var sched_param_policy =
-    MIF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy);
-
-  MIF_Scheduling::SchedulingParameter_var sched_param = sched_param_policy->value ();
-  CORBA::Short importance = sched_param->importance;
-
-  Kokyu::DSRT_QoSDescriptor qos;
-  qos.importance_ = importance;
-
-  kokyu_dispatcher_->update_schedule (count, qos);
-}
-
-void
-MIF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
-                                       const char *
-                                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  int count;
-  ACE_OS::memcpy (&count,
-                  guid.get_buffer (),
-                  guid.length ());
-
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) call to end_sched_segment for guid %d\n", count));
-  kokyu_dispatcher_->cancel_schedule (count);
-}
-
-void
-MIF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
-                                                         const char *,
-                                                         CORBA::Policy_ptr
-                                                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-}
-
-
-void
-MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t): send_request "
-              "from \"%s\"\n",
-              operation.in ()));
-
-  // Make the context to send the context to the target
-  IOP::ServiceContext sc;
-  sc.context_id = ::service_id;
-
-  CORBA::Policy_ptr sched_policy =
-    this->current_->scheduling_parameter(ACE_ENV_ARG_PARAMETER);
-
-  int guid;
-  ACE_OS::memcpy (&guid,
-                  this->current_->id ()->get_buffer (),
-                  this->current_->id ()->length ());
-
-  CORBA::Short importance;
-  if (CORBA::is_nil (sched_policy))
-    {
-      importance = 0;
-    }
-  else
-    {
-      MIF_Scheduling::SchedulingParameterPolicy_var sched_param_policy =
-        MIF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy);
-
-      MIF_Scheduling::SchedulingParameter_var sched_param = sched_param_policy->value ();
-      importance = sched_param->importance;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t): send_request importance from current = %d\n"),
-                  importance));
-
-      Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
-
-      //Fill the guid in the SC Qos struct
-      sc_qos.guid.length (this->current_->id ()->length ());
-      //sc_qos.guid = *(this->current_->id ());
-      guid_copy (sc_qos.guid, *(this->current_->id ()));
-      sc_qos.importance = importance;
-      CORBA::Any sc_qos_as_any;
-      sc_qos_as_any <<= sc_qos;
-
-      ACE_TRY_NEW_ENV
-        {
-          sc.context_data =
-            ACE_reinterpret_cast(IOP::ServiceContext::_tao_seq_Octet &,
-                                 *codec_->encode (sc_qos_as_any));
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception caught:");
-        }
-      ACE_ENDTRY;
-
-
-      ACE_DEBUG ((LM_DEBUG, "after encode\n"));
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t): send_request : about to add sched SC\n")));
-
-      // Add this context to the service context list.
-      ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t): send_request : about to call scheduler to inform block\n")
-              ));
-
-  kokyu_dispatcher_->update_schedule (guid, Kokyu::BLOCK);
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t): guid = %d, send_request interceptor done\n"),
-              guid));
-}
-
-void
-MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
-                                RTScheduling::Current::IdType_out guid_out,
-                                CORBA::String_out /*name*/,
-                                CORBA::Policy_out sched_param_out,
-                                CORBA::Policy_out /*implicit_sched_param_out*/
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  ACE_DEBUG ((LM_DEBUG, "entered MIF_Scheduler::receive_request\n"));
-  RTScheduling::Current::IdType* guid;
-  ACE_NEW (guid,
-           RTScheduling::Current::IdType);
-
-
-  // Generate GUID.
-  guid->length (sizeof(long));
-
-  long temp = ++server_guid_counter;
-  ACE_OS::memcpy (guid->get_buffer (),
-                  &temp,
-                  sizeof(long));
-
-  int id;
-  ACE_OS::memcpy (&id,
-                  guid->get_buffer (),
-                  guid->length ());
-
-  guid_out.ptr () = guid;
-
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t): receive_request from "
-              "\"%s\"\n",
-              operation.in ()));
-
-  // Ignore the "_is_a" operation since it may have been invoked
-  // locally on the server side as a side effect of another call,
-  // meaning that the client hasn't added the service context yet.
-  if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0)
-    return;
-
-  IOP::ServiceContext_var sc =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Short importance;
-
-  if (sc.ptr () == 0)
-    {
-      importance = 0;
-    }
-  else
-    {
-      CORBA::OctetSeq oc_seq = CORBA::OctetSeq (sc->context_data.length (),
-                                                 sc->context_data.length (),
-                                                 sc->context_data.get_buffer (),
-                                                 0);
-      //Don't store in a _var, since >>= returns a pointer to an internal buffer
-      //and we are not supposed to free it.
-      Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
-      CORBA::Any sc_qos_as_any;
-      sc_qos_as_any = *codec_->decode (oc_seq);
-      sc_qos_as_any >>= sc_qos_ptr;
-
-      importance = sc_qos_ptr->importance;
-      //*(guid_out.ptr ()) = sc_qos_ptr->guid;
-      guid_copy (*(guid_out.ptr ()), sc_qos_ptr->guid);
-
-
-      ACE_OS::memcpy (&id,
-                      sc_qos_ptr->guid.get_buffer (),
-                      sc_qos_ptr->guid.length ());
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%t): Importance = %d, guid = %d in recvd service context\n",
-                  importance,
-                  id));
-
-      MIF_Scheduling::SchedulingParameter sched_param;
-      sched_param.importance = importance;
-      sched_param_out.ptr () = this->create_scheduling_parameter (sched_param);
-    }
-
-  Kokyu::DSRT_QoSDescriptor qos;
-  qos.importance_ = importance;
-  this->kokyu_dispatcher_->schedule (id, qos);
-
-  ACE_DEBUG ((LM_DEBUG, "(%t): guid = %d, receive_request interceptor done\n", id));
-}
-
-void
-MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Short importance = 0;
-
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t): send_reply from \"%s\"\n",
-              ri->operation ()));
-
-  // Make the context to send the context to the target
-  IOP::ServiceContext sc;
-  sc.context_id = ::service_id;
-
-  ACE_DEBUG ((LM_DEBUG, "in send_reply: before accessing current_->sched_param\n"));
-  CORBA::Policy_ptr sched_policy =
-    this->current_->scheduling_parameter(ACE_ENV_ARG_PARAMETER);
-  ACE_DEBUG ((LM_DEBUG, "in send_reply: after accessing current_->sched_param\n"));
-
-  int guid;
-  ACE_OS::memcpy (&guid,
-                  this->current_->id ()->get_buffer (),
-                  this->current_->id ()->length ());
-
-  if (CORBA::is_nil (sched_policy))
-  {
-    ACE_DEBUG ((LM_DEBUG, "sched_policy nil. importance not set in sched params\n"));
-    importance = 0;
-  }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "sched_policy not nil. importance set in sched params\n"));
-
-      MIF_Scheduling::SchedulingParameterPolicy_var sched_param_policy =
-        MIF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy);
-
-      MIF_Scheduling::SchedulingParameter_var sched_param = sched_param_policy->value ();
-
-      importance = sched_param->importance;
-
-      Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
-      //Fill the guid in the SC Qos struct
-      //sc_qos.guid = *(this->current_->id ());
-      guid_copy ( sc_qos.guid, *(this->current_->id ()));
-      sc_qos.importance = importance;
-      CORBA::Any sc_qos_as_any;
-      sc_qos_as_any <<= sc_qos;
-
-      sc.context_data = ACE_reinterpret_cast(
-                                             IOP::ServiceContext::_tao_seq_Octet &,
-                                             *codec_->encode (sc_qos_as_any));
-
-      // Add this context to the service context list.
-      ri->add_reply_service_context (sc, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "reply sc added\n"));
-    }
-
-  kokyu_dispatcher_->update_schedule (guid, Kokyu::BLOCK);
-
-  ACE_DEBUG ((LM_DEBUG, "(%t): guid = %d, send_reply interceptor done\n", guid));
-}
-
-void
-MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  int guid = 0;
-  CORBA::Short importance=0;
-
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "receive_reply from "
-              "\"%s\"\n",
-              operation.in ()));
-
-  // Check that the reply service context was received as
-  // expected.
-  IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (sc.ptr () == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "service context was not filled\n"));
-      importance = 0;
-    }
-  else
-    {
-      CORBA::OctetSeq oc_seq = CORBA::OctetSeq (sc->context_data.length (),
-                                                sc->context_data.length (),
-                                                sc->context_data.get_buffer (),
-                                                0);
-
-      //Don't store in a _var, since >>= returns a pointer to an internal buffer
-      //and we are not supposed to free it.
-      Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr;
-      CORBA::Any sc_qos_as_any;
-      sc_qos_as_any = *codec_->decode (oc_seq);
-      sc_qos_as_any >>= sc_qos_ptr;
-
-      importance = sc_qos_ptr->importance;
-
-      ACE_OS::memcpy (&guid,
-                      sc_qos_ptr->guid.get_buffer (),
-                      sc_qos_ptr->guid.length ());
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%t): Importance = %d, guid = %d in recvd service context\n",
-                  importance,
-                  guid));
-    }
-
-  Kokyu::DSRT_QoSDescriptor qos;
-  qos.importance_ = importance;
-  this->kokyu_dispatcher_->schedule (guid, qos);
-}
-
-void
-MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-MIF_Scheduler::cancel (const RTScheduling::Current::IdType &
-                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::PolicyList*
-MIF_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-        return 0;
-}
-
-void
-MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::PolicyList*
-MIF_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-        return 0;
-}
-
-char *
-MIF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-        return 0;
-}
-
-RTScheduling::ResourceManager_ptr
-MIF_Scheduler::create_resource_manager (const char *,
-                                        CORBA::Policy_ptr
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-        return 0;
-}
-
-void
-MIF_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
-                                         const char *,
-                                         CORBA::Policy_ptr
-                                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/MIF_Scheduler.h
deleted file mode 100644
index 31871275ce4..00000000000
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/MIF_Scheduler.h
+++ /dev/null
@@ -1,158 +0,0 @@
-//$Id$
-
-#ifndef MIF_SCHEDULER_H
-#define MIF_SCHEDULER_H
-
-#include "tao/RTScheduling/RTSchedulerC.h"
-#include "MIF_SchedulingC.h"
-#include "Kokyu.h"
-
-class MIF_Sched_Param_Policy:
-public MIF_Scheduling::SchedulingParameterPolicy,
-       public TAO_Local_RefCounted_Object
-{
- public:
-
-    MIF_Scheduling::SchedulingParameter value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void value (const MIF_Scheduling::SchedulingParameter & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
- private:
-    MIF_Scheduling::SchedulingParameter value_;
-};
-
-class MIF_Scheduler:
-public MIF_Scheduling::Scheduler,
-public TAO_Local_RefCounted_Object
-{
- public:
-
-  MIF_Scheduler (CORBA::ORB_ptr orb);
-
-  ~MIF_Scheduler (void);
-
-
-  virtual MIF_Scheduling::SchedulingParameterPolicy_ptr
-    create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS
-                                 )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void shutdown (void);
-
-  virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                             const char * name,
-                                             CORBA::Policy_ptr sched_param,
-                                             CORBA::Policy_ptr implicit_sched_param
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
-
-  virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                                const char * name,
-                                                CORBA::Policy_ptr sched_param,
-                                                CORBA::Policy_ptr implicit_sched_param
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
-
-  virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                          const char * name,
-                                          CORBA::Policy_ptr sched_param,
-                                          CORBA::Policy_ptr implicit_sched_param
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
-
-  virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                              const char * name,
-                                              CORBA::Policy_ptr outer_sched_param
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
-                                RTScheduling::Current::IdType_out guid,
-                                CORBA::String_out name,
-                                CORBA::Policy_out sched_param,
-                                CORBA::Policy_out implicit_sched_param
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void cancel (const RTScheduling::Current::IdType & guid
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter
-                                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void set_scheduling_parameter (PortableServer::Servant & resource,
-                                         const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
- private:
-  CORBA::ORB_var orb_;
-  IOP::Codec_var codec_;
-  RTScheduling::Current_var current_;
-  Kokyu::DSRT_Dispatcher_Auto_Ptr kokyu_dispatcher_;
-};
-
-#endif //MIF_SCHEDULER_H
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/MIF_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/MIF_Scheduling.idl
deleted file mode 100644
index 6b050a1afa1..00000000000
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/MIF_Scheduling.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-//$Id$
-#include <RTScheduler.pidl>
-#include <RTCORBA.pidl>
-
-module MIF_Scheduling
-{
-  struct SchedulingParameter
-  {
-    long importance;
-  };
-
-  local interface SchedulingParameterPolicy
-  : CORBA::Policy
-  {
-    attribute SchedulingParameter value;
-  };
-  
-  local interface Scheduler : RTScheduling::Scheduler
-  {
-    SchedulingParameterPolicy
-      create_scheduling_parameter 
-        (in SchedulingParameter value);
-  };
-};
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile
index 3e8efcee85a..b6cc1497c1e 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile
@@ -373,23 +373,37 @@ realclean: clean
   $(TAO_ROOT)/tao/PICurrent.inl \
   $(TAO_ROOT)/tao/ORB_Core.i testC.h testC.i \
   MIF_Scheduler.h MIF_SchedulingC.h MIF_SchedulingC.i \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(ACE_ROOT)/Kokyu/Kokyu.h \
+  $(ACE_ROOT)/Kokyu/Kokyu_dsrt.h \
   $(ACE_ROOT)/Kokyu/kokyu_export.h \
   $(ACE_ROOT)/Kokyu/Kokyu_defs.h \
   $(ACE_ROOT)/ace/Array.h \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i \
   $(ACE_ROOT)/Kokyu/Kokyu_defs.i \
-  $(ACE_ROOT)/Kokyu/Kokyu.i \
-  $(ACE_ROOT)/Kokyu/Dispatcher_Impl.h \
-  $(ACE_ROOT)/Kokyu/Dispatcher_Impl.i \
-  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl.h \
-  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl.i
+  $(ACE_ROOT)/Kokyu/Kokyu_dsrt.i \
+  $(ACE_ROOT)/Kokyu/Kokyu_dsrt.cpp \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+  $(ACE_ROOT)/Kokyu/Default_DSRT_Dispatcher_Impl_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl_T.i \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl_T.cpp \
+  $(ACE_ROOT)/Kokyu/Default_DSRT_Dispatcher_Impl_T.i \
+  $(ACE_ROOT)/Kokyu/Default_DSRT_Dispatcher_Impl_T.cpp \
+  $(ACE_ROOT)/Kokyu/DSRT_Scheduler_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Sched_Queue_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatch_Item_T.h \
+  $(ACE_ROOT)/ace/Bound_Ptr.h \
+  $(ACE_ROOT)/ace/Bound_Ptr.i \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatch_Item_T.i \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatch_Item_T.cpp \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(ACE_ROOT)/Kokyu/DSRT_Sched_Queue_T.cpp \
+  $(ACE_ROOT)/Kokyu/DSRT_Scheduler_T.cpp
 
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \
   $(TAO_ROOT)/tao/corba.h \
@@ -715,18 +729,37 @@ realclean: clean
   $(TAO_ROOT)/tao/PICurrent.inl \
   $(TAO_ROOT)/tao/ORB_Core.i MIF_Scheduler.h \
   MIF_SchedulingC.h MIF_SchedulingC.i \
-  $(ACE_ROOT)/Kokyu/Kokyu.h \
+  $(ACE_ROOT)/Kokyu/Kokyu_dsrt.h \
   $(ACE_ROOT)/Kokyu/kokyu_export.h \
   $(ACE_ROOT)/Kokyu/Kokyu_defs.h \
   $(ACE_ROOT)/ace/Array.h \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i \
   $(ACE_ROOT)/Kokyu/Kokyu_defs.i \
-  $(ACE_ROOT)/Kokyu/Kokyu.i \
-  $(ACE_ROOT)/Kokyu/Dispatcher_Impl.h \
-  $(ACE_ROOT)/Kokyu/Dispatcher_Impl.i \
-  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl.h \
-  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl.i
+  $(ACE_ROOT)/Kokyu/Kokyu_dsrt.i \
+  $(ACE_ROOT)/Kokyu/Kokyu_dsrt.cpp \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+  $(ACE_ROOT)/Kokyu/Default_DSRT_Dispatcher_Impl_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl_T.i \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl_T.cpp \
+  $(ACE_ROOT)/Kokyu/Default_DSRT_Dispatcher_Impl_T.i \
+  $(ACE_ROOT)/Kokyu/Default_DSRT_Dispatcher_Impl_T.cpp \
+  $(ACE_ROOT)/Kokyu/DSRT_Scheduler_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Sched_Queue_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatch_Item_T.h \
+  $(ACE_ROOT)/ace/Bound_Ptr.h \
+  $(ACE_ROOT)/ace/Bound_Ptr.i \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatch_Item_T.i \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatch_Item_T.cpp \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(ACE_ROOT)/Kokyu/DSRT_Sched_Queue_T.cpp \
+  $(ACE_ROOT)/Kokyu/DSRT_Scheduler_T.cpp
 
 .obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \
   $(TAO_ROOT)/tao/corba.h \
@@ -1142,20 +1175,7 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/RTScheduling/RTSchedulerC.i \
   MIF_SchedulingC.h MIF_SchedulingC.i \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(ACE_ROOT)/Kokyu/Kokyu.h \
+  $(ACE_ROOT)/Kokyu/Kokyu_dsrt.h \
   $(ACE_ROOT)/Kokyu/kokyu_export.h \
   $(ACE_ROOT)/Kokyu/Kokyu_defs.h \
   $(ACE_ROOT)/ace/Array.h \
@@ -1170,12 +1190,95 @@ realclean: clean
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i \
   $(ACE_ROOT)/Kokyu/Kokyu_defs.i \
-  $(ACE_ROOT)/Kokyu/Kokyu.i \
-  $(ACE_ROOT)/Kokyu/Dispatcher_Impl.h \
-  $(ACE_ROOT)/Kokyu/Dispatcher_Impl.i \
-  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl.h \
-  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl.i \
-  ../Kokyu_qosC.h ../Kokyu_qosC.i
+  $(ACE_ROOT)/Kokyu/Kokyu_dsrt.i \
+  $(ACE_ROOT)/Kokyu/Kokyu_dsrt.cpp \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/Kokyu/Default_DSRT_Dispatcher_Impl_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl_T.i \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatcher_Impl_T.cpp \
+  $(ACE_ROOT)/Kokyu/Default_DSRT_Dispatcher_Impl_T.i \
+  $(ACE_ROOT)/Kokyu/Default_DSRT_Dispatcher_Impl_T.cpp \
+  $(ACE_ROOT)/Kokyu/DSRT_Scheduler_T.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Notification_Strategy.h \
+  $(ACE_ROOT)/ace/Notification_Strategy.inl \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  $(ACE_ROOT)/Kokyu/DSRT_Sched_Queue_T.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatch_Item_T.h \
+  $(ACE_ROOT)/ace/Bound_Ptr.h \
+  $(ACE_ROOT)/ace/Bound_Ptr.i \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatch_Item_T.i \
+  $(ACE_ROOT)/Kokyu/DSRT_Dispatch_Item_T.cpp \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/Kokyu/DSRT_Sched_Queue_T.cpp \
+  $(ACE_ROOT)/Kokyu/DSRT_Scheduler_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i Kokyu_qosC.h \
+  Kokyu_qosC.i
 
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
@@ -2309,6 +2412,11 @@ realclean: clean
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/RTScheduling/RTSchedulerC.h \
+  $(TAO_ROOT)/tao/RTScheduling/rtscheduler_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -2324,11 +2432,6 @@ realclean: clean
   $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/RTScheduling/RTSchedulerC.h \
-  $(TAO_ROOT)/tao/RTScheduling/rtscheduler_export.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index 9290057b003..9981ef829ec 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -93,8 +93,8 @@ main (int argc, char *argv[])
   ACE_hthread_t main_thr_handle;
   ACE_Thread::self (main_thr_handle);
 
-  ACE_OS::thr_setprio (main_thr_handle, 
-		       ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD));
+  ACE_OS::thr_setprio (main_thr_handle,
+                       ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD));
 
   ACE_TRY_NEW_ENV
     {
@@ -177,9 +177,9 @@ main (int argc, char *argv[])
           if (enable_dynamic_scheduling)
             {
               MIF_Scheduling::SchedulingParameter sched_param;
-	      sched_param.importance = 0;
-              CORBA::Policy_var sched_param_policy = 
-		scheduler->create_scheduling_parameter (sched_param);
+              sched_param.importance = 0;
+              CORBA::Policy_var sched_param_policy =
+                scheduler->create_scheduling_parameter (sched_param);
               CORBA::Policy_ptr implicit_sched_param = 0;
               current->begin_scheduling_segment (0,
                                                  sched_param_policy.in (),