ChangeLogTag: Fri Jan 10 09:30:51 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

24 files changed, 3355 insertions, 3003 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6a6fd2755b4..fee337aec24 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,39 @@
+Fri Jan 10 09:30:51 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/ObjectIDList.cpp:
+        * tao/ObjectIDList.h:
+        * tao/ObjectIDList.i:
+        * tao/Services.cpp:
+        * tao/Services.h:
+        * tao/Services.i:
+
+	  Removed these files containing hand-crafted generated
+	  code.
+
+        * tao/ObjectIdListC.cpp:
+        * tao/ObjectIdListC.h:
+        * tao/ObjectIdListC.i:
+        * tao/Services.pidl:
+        * tao/ServicesC.cpp:
+        * tao/ServicesC.h:
+        * tao/ServicesC.i:
+
+	  Replaced the removed files with those above, and added
+	  a .pidl file to generate the ServicesC.* files.
+
+        * tao/ORB.h:
+        * tao/ORB_Core.cpp:
+        * tao/StringSeq.pidl:
+        * tao/TAO.dsp:
+        * tao/TAO_Server_Request.h:
+        * tao/Typecode_Constants.cpp:
+        * tao/corba.h:
+        * tao/corbafwd.cpp:
+        * tao/corbafwd.h:
+        * tao/orb.idl:
+
+	  Changes related to the new files listed above.
+
 Thu Jan  9 18:51:43 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Acceptor_Filter.h:
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 534be08fc88..d2847821837 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -25,8 +25,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Exception.h"
-#include "Services.h"
+#include "ServicesC.h"
 #include "CORBA_String.h"
+#include "ObjectIdListC.h"
 #include "objectid.h"
 
 // IRIX needs this for the throw specs
@@ -102,7 +103,7 @@ public:
       );
     };
 
-  typedef char *ObjectId;
+  typedef CORBA_ORB_ObjectId ObjectId;
   typedef CORBA::String_var ObjectId_var;
   typedef CORBA::String_out ObjectId_out;
   static CORBA::TypeCode_ptr _tc_ObjectId;
@@ -110,7 +111,6 @@ public:
   typedef CORBA_ORB_ObjectIdList ObjectIdList;
   typedef CORBA_ORB_ObjectIdList_var ObjectIdList_var;
   typedef CORBA_ORB_ObjectIdList_out ObjectIdList_out;
-  typedef CORBA_ORB_ObjectIdList *ObjectIdList_ptr;
   static CORBA::TypeCode_ptr _tc_ObjectIdList;
 
   /// Return a duplicate of <{orb}>.  When work with this duplicate is
@@ -511,7 +511,7 @@ private:
 
   /// Resolve the given service based on the service ID.
   CORBA::Object_ptr resolve_service (TAO_MCAST_SERVICEID service_id
-                                    ACE_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
 
   /// Convert an OMG IOR into an object reference.
   CORBA::Object_ptr ior_string_to_object (const char* ior
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index eb47b4f318e..763329bf158 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -19,7 +19,7 @@
 
 #include "Object_Loader.h"
 
-#include "ObjectIDList.h"
+#include "ObjectIDListC.h"
 
 #include "Services_Activate.h"
 #include "Invocation.h"
diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp
deleted file mode 100644
index 83732dce984..00000000000
--- a/TAO/tao/ObjectIDList.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-// Hand Modified by Vishal Kachroo <vishal@cs.wustl.edu>
-//
-
-#include "tao/ObjectIDList.h"
-#include "tao/Typecode.h"
-#include "tao/ORB.h"
-#include "tao/Any.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/ObjectIDList.i"
-#endif /* !defined INLINE */
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CS_)
-#define _CORBA_ORB_OBJECTIDLIST_CS_
-
-// *************************************************************
-// CORBA_ORB_ObjectIdList
-// *************************************************************
-
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (void)
-{}
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max) // uses max size
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max)
-{}
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max, length, buffer, release)
-{}
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &seq) // copy ctor
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (seq)
-{}
-CORBA_ORB_ObjectIdList::~CORBA_ORB_ObjectIdList (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), ACE_NTOHL (0x422f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49644c69), ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectIdList:1.0
-  13, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0),  // name = ObjectIdList
-  CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), ACE_NTOHL (0x422f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0
-      9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x0),  // name = ObjectId
-      CORBA::tk_string,
-      0, // string length
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList (CORBA::tk_alias, sizeof (_oc_CORBA_ORB_ObjectIdList), (char *) &_oc_CORBA_ORB_ObjectIdList, 0, sizeof (CORBA_ORB_ObjectIdList));
-CORBA::TypeCode_ptr CORBA::ORB::_tc_ObjectIdList = &_tc_TAO_tc_CORBA_ORB_ObjectIdList;
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA_ORB_ObjectIdList &_tao_elem
-  ) // copying
-{
-    TAO_OutputCDR stream;
-    stream << _tao_elem;
-
-    _tao_any._tao_replace (CORBA::ORB::_tc_ObjectIdList,
-                           TAO_ENCAP_BYTE_ORDER,
-                           stream.begin ());
-}
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_ORB_ObjectIdList &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm, CORBA_ORB_ObjectIdList &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-void CORBA_ORB_ObjectIdList::_tao_any_destructor (void *x)
-{
-  CORBA_ORB_ObjectIdList *tmp = ACE_static_cast(CORBA_ORB_ObjectIdList*,x);
-  delete tmp;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *_tao_elem)
-{
-    TAO_OutputCDR stream;
-    stream << *_tao_elem;
-
-    _tao_any._tao_replace (CORBA::ORB::_tc_ObjectIdList,
-                           TAO_ENCAP_BYTE_ORDER,
-                           stream.begin (),
-                           1,
-                           _tao_elem,
-                           CORBA_ORB_ObjectIdList::_tao_any_destructor);
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::ORB::_tc_ObjectIdList ACE_ENV_ARG_PARAMETER)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_ORB_ObjectIdList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_ORB_ObjectIdList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
-                           _tao_any._tao_byte_order ());
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::ORB::_tc_ObjectIdList,
-            1,
-            _tao_elem,
-            CORBA_ORB_ObjectIdList::_tao_any_destructor);
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/ObjectIDList.h b/TAO/tao/ObjectIDList.h
deleted file mode 100644
index 164e6597093..00000000000
--- a/TAO/tao/ObjectIDList.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-//  Hand Modified by Vishal Kachroo <vishal@cs.wustl.edu>
-//
-
-#ifndef OBJECTIDLIST_H_
-#define OBJECTIDLIST_H_
-#include "ace/pre.h"
-
-#include "tao/corbafwd.h"
-#include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CH_)
-#define _CORBA_ORB_OBJECTIDLIST_CH_
-
-// *************************************************************
-// ObjectIdList
-// *************************************************************
-
-class TAO_Export CORBA_ORB_ObjectIdList : public
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-TAO_Unbounded_String_Sequence
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-{
-public:
- CORBA_ORB_ObjectIdList (void); // default ctor
- CORBA_ORB_ObjectIdList (CORBA::ULong max); // uses max size
- CORBA_ORB_ObjectIdList (
-               CORBA::ULong max,
-               CORBA::ULong length,
-               char * *buffer,
-               CORBA::Boolean release=0
-               );
- CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &); // copy ctor
- ~CORBA_ORB_ObjectIdList (void); // dtor
-
-  static void _tao_any_destructor (void*);
-};
-
-typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST___VAR_CH_)
-#define _CORBA_ORB_OBJECTIDLIST___VAR_CH_
-
-// *************************************************************
-// class CORBA::ORB::ObjectIdList_var
-// *************************************************************
-
-class TAO_Export CORBA_ORB_ObjectIdList_var
-{
-public:
-  CORBA_ORB_ObjectIdList_var (void); // default constructor
-  CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *);
-  CORBA_ORB_ObjectIdList_var (const CORBA_ORB_ObjectIdList_var &); // copy constructor
-  ~CORBA_ORB_ObjectIdList_var (void); // destructor
-
-  CORBA_ORB_ObjectIdList_var &operator= (CORBA_ORB_ObjectIdList *);
-  CORBA_ORB_ObjectIdList_var &operator= (const CORBA_ORB_ObjectIdList_var &);
-  CORBA_ORB_ObjectIdList *operator-> (void);
-  const CORBA_ORB_ObjectIdList *operator-> (void) const;
-
-  operator const CORBA_ORB_ObjectIdList &() const;
-  operator CORBA_ORB_ObjectIdList &();
-  operator CORBA_ORB_ObjectIdList &() const;
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot);
-  // in, inout, out, _retn
-  const CORBA_ORB_ObjectIdList &in (void) const;
-  CORBA_ORB_ObjectIdList &inout (void);
-  CORBA_ORB_ObjectIdList *&out (void);
-  CORBA_ORB_ObjectIdList *_retn (void);
-  CORBA_ORB_ObjectIdList *ptr (void) const;
-
-private:
-  CORBA_ORB_ObjectIdList *ptr_;
-};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_)
-#define _CORBA_ORB_OBJECTIDLIST___OUT_CH_
-
-class TAO_Export CORBA_ORB_ObjectIdList_out
-{
-public:
-  CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&);
-  CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &);
-  CORBA_ORB_ObjectIdList_out (const CORBA_ORB_ObjectIdList_out &);
-  CORBA_ORB_ObjectIdList_out &operator= (const CORBA_ORB_ObjectIdList_out &);
-  CORBA_ORB_ObjectIdList_out &operator= (CORBA_ORB_ObjectIdList *);
-  operator CORBA_ORB_ObjectIdList *&();
-  CORBA_ORB_ObjectIdList *&ptr (void);
-  CORBA_ORB_ObjectIdList *operator-> (void);
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot);
-
-private:
-  CORBA_ORB_ObjectIdList *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ORB_ObjectIdList_var &);
-};
-
-#endif /* end #if !defined */
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ORB_ObjectIdList &); //
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ORB_ObjectIdList &);
-
-#if defined (__ACE_INLINE__)
-#include "tao/ObjectIDList.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* ifndef */
diff --git a/TAO/tao/ObjectIDList.i b/TAO/tao/ObjectIDList.i
deleted file mode 100644
index 29c465f6a6f..00000000000
--- a/TAO/tao/ObjectIDList.i
+++ /dev/null
@@ -1,199 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-//
-// Hand modified by Vishal Kachroo <vishal@cs.wustl.edu>
-//
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_I_)
-#define _CORBA_ORB_OBJECTIDLIST_I_
-
-// *************************************************************
-// Inline operations for class CORBA::ORB::ObjectIdList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (const CORBA_ORB_ObjectIdList_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ORB_ObjectIdList(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::~CORBA_ORB_ObjectIdList_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_var &
-CORBA_ORB_ObjectIdList_var::operator= (CORBA_ORB_ObjectIdList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_var &
-CORBA_ORB_ObjectIdList_var::operator= (const CORBA_ORB_ObjectIdList_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ORB_ObjectIdList (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator const CORBA_ORB_ObjectIdList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator CORBA_ORB_ObjectIdList &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator CORBA_ORB_ObjectIdList &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager
-CORBA_ORB_ObjectIdList_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_ORB_ObjectIdList &
-CORBA_ORB_ObjectIdList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList &
-CORBA_ORB_ObjectIdList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CORBA_ORB_ObjectIdList *&
-CORBA_ORB_ObjectIdList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::_retn (void)
-{
-  CORBA_ORB_ObjectIdList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ORB_ObjectIdList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (const CORBA_ORB_ObjectIdList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ORB_ObjectIdList_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_out &
-CORBA_ORB_ObjectIdList_out::operator= (const CORBA_ORB_ObjectIdList_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ORB_ObjectIdList_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_out &
-CORBA_ORB_ObjectIdList_out::operator= (CORBA_ORB_ObjectIdList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::operator CORBA_ORB_ObjectIdList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *&
-CORBA_ORB_ObjectIdList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager
-CORBA_ORB_ObjectIdList_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp
new file mode 100644
index 00000000000..1caa09e2dab
--- /dev/null
+++ b/TAO/tao/ObjectIdListC.cpp
@@ -0,0 +1,268 @@
+// -*- 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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
+#include "ObjectIdListC.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 "ObjectIdListC.i"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ORB_ObjectId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f52), 
+  ACE_NTOHL (0x422f4f62), 
+  ACE_NTOHL (0x6a656374), 
+  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0
+    9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x0),  // name = ObjectId
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectId (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ORB_ObjectId),
+    (char *) &_oc_CORBA_ORB_ObjectId,
+    0,
+    sizeof (CORBA_ORB_ObjectId)
+  );
+
+::CORBA::TypeCode_ptr CORBA::ORB::_tc_ObjectId =
+  &_tc_TAO_tc_CORBA_ORB_ObjectId;
+
+#if !defined (_CORBA_ORB_OBJECTIDLIST_CS_)
+#define _CORBA_ORB_OBJECTIDLIST_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
+// *************************************************************
+// CORBA_ORB_ObjectIdList
+// *************************************************************
+
+CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (void)
+{}
+
+CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+TAO_Unbounded_String_Sequence
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    char * *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+TAO_Unbounded_String_Sequence
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+TAO_Unbounded_String_Sequence
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA_ORB_ObjectIdList::~CORBA_ORB_ObjectIdList (void) // dtor
+{}
+
+
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f52), 
+  ACE_NTOHL (0x422f4f62), 
+  ACE_NTOHL (0x6a656374), 
+  ACE_NTOHL (0x49644c69), 
+  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectIdList:1.0
+    13,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x0),  // name = ObjectIdList
+    CORBA::tk_sequence, // typecode kind
+  84, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_alias, // typecode kind for typedefs
+    68, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      35,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f4f52), 
+      ACE_NTOHL (0x422f4f62), 
+      ACE_NTOHL (0x6a656374), 
+      ACE_NTOHL (0x49643a31), 
+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0
+            9,
+      ACE_NTOHL (0x4f626a65), 
+      ACE_NTOHL (0x63744964), 
+      ACE_NTOHL (0x0),  // name = ObjectId
+            CORBA::tk_string, 
+      0U, // string length
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ORB_ObjectIdList),
+    (char *) &_oc_CORBA_ORB_ObjectIdList,
+    0,
+    sizeof (CORBA_ORB_ObjectIdList)
+  );
+
+::CORBA::TypeCode_ptr _tc_CORBA_ORB_ObjectIdList =
+  &_tc_TAO_tc_CORBA_ORB_ObjectIdList;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ORB_ObjectIdList &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_ORB_ObjectIdList &_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.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h
new file mode 100644
index 00000000000..4e5f99b5d2e
--- /dev/null
+++ b/TAO/tao/ObjectIdListC.h
@@ -0,0 +1,222 @@
+// -*- 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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_OBJECTIDLISTC_H_
+#define _TAO_IDL_ORIG_OBJECTIDLISTC_H_
+
+#include "ace/pre.h"
+#include "tao/corbafwd.h"
+#include "tao/Sequence.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368
+
+typedef char * CORBA_ORB_ObjectId;
+
+#if !defined (_CORBA_ORB_OBJECTIDLIST_CH_)
+#define _CORBA_ORB_OBJECTIDLIST_CH_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+
+class CORBA_ORB_ObjectIdList;
+class CORBA_ORB_ObjectIdList_var;
+
+// *************************************************************
+// CORBA_ORB_ObjectIdList
+// *************************************************************
+
+class TAO_Export CORBA_ORB_ObjectIdList : public 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+TAO_Unbounded_String_Sequence
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_String_Sequence
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+{
+public:
+  CORBA_ORB_ObjectIdList (void);
+  CORBA_ORB_ObjectIdList (CORBA::ULong max);
+  CORBA_ORB_ObjectIdList (
+      CORBA::ULong max, 
+      CORBA::ULong length, 
+      char * *buffer, 
+      CORBA::Boolean release = 0
+    );
+  CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &);
+  ~CORBA_ORB_ObjectIdList (void);
+  
+  typedef CORBA_ORB_ObjectIdList_var _var_type;
+};
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_ORB_OBJECTIDLIST___VAR_CH_)
+#define _CORBA_ORB_OBJECTIDLIST___VAR_CH_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549
+
+// *************************************************************
+// class CORBA_ORB_ObjectIdList_var
+// *************************************************************
+
+class TAO_Export CORBA_ORB_ObjectIdList_var
+{
+public:
+  CORBA_ORB_ObjectIdList_var (void);
+  CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *);
+  CORBA_ORB_ObjectIdList_var (const CORBA_ORB_ObjectIdList_var &);
+  ~CORBA_ORB_ObjectIdList_var (void);
+  
+  CORBA_ORB_ObjectIdList_var &operator= (CORBA_ORB_ObjectIdList *);
+  CORBA_ORB_ObjectIdList_var &operator= (const CORBA_ORB_ObjectIdList_var &);
+  CORBA_ORB_ObjectIdList *operator-> (void);
+  const CORBA_ORB_ObjectIdList *operator-> (void) const;
+  
+  operator const CORBA_ORB_ObjectIdList &() const;
+  operator CORBA_ORB_ObjectIdList &();
+  operator CORBA_ORB_ObjectIdList &() const;
+  
+  // Variable-size base types only.
+  operator CORBA_ORB_ObjectIdList *&();
+  
+  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+  
+  // in, inout, out, _retn 
+  const CORBA_ORB_ObjectIdList &in (void) const;
+  CORBA_ORB_ObjectIdList &inout (void);
+  CORBA_ORB_ObjectIdList *&out (void);
+  CORBA_ORB_ObjectIdList *_retn (void);
+  CORBA_ORB_ObjectIdList *ptr (void) const;
+
+private:
+  CORBA_ORB_ObjectIdList *ptr_;
+};
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_)
+#define _CORBA_ORB_OBJECTIDLIST___OUT_CH_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753
+
+class TAO_Export CORBA_ORB_ObjectIdList_out
+{
+public:
+  CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&);
+  CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &);
+  CORBA_ORB_ObjectIdList_out (const CORBA_ORB_ObjectIdList_out &);
+  CORBA_ORB_ObjectIdList_out &operator= (const CORBA_ORB_ObjectIdList_out &);
+  CORBA_ORB_ObjectIdList_out &operator= (CORBA_ORB_ObjectIdList *);
+  operator CORBA_ORB_ObjectIdList *&();
+  CORBA_ORB_ObjectIdList *&ptr (void);
+  CORBA_ORB_ObjectIdList *operator-> (void);
+  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+private:
+  CORBA_ORB_ObjectIdList *&ptr_;
+  // Assignment from T_var not allowed.
+  void operator= (const CORBA_ORB_ObjectIdList_var &);
+};
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
+#ifndef __ACE_INLINE__
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_
+#define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_ORB_ObjectIdList &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_ORB_ObjectIdList &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
+#endif /* __ACE_INLINE__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+
+#if defined (__ACE_INLINE__)
+#include "ObjectIdListC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/ObjectIdListC.i b/TAO/tao/ObjectIdListC.i
new file mode 100644
index 00000000000..051f6ce3d56
--- /dev/null
+++ b/TAO/tao/ObjectIdListC.i
@@ -0,0 +1,278 @@
+// -*- 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 (_CORBA_ORB_OBJECTIDLIST_CI_)
+#define _CORBA_ORB_OBJECTIDLIST_CI_
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226
+
+// *************************************************************
+// Inline operations for class CORBA_ORB_ObjectIdList_var
+// *************************************************************
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (const ::CORBA_ORB_ObjectIdList_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA_ORB_ObjectIdList (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_var::~CORBA_ORB_ObjectIdList_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_var &
+CORBA_ORB_ObjectIdList_var::operator= (CORBA_ORB_ObjectIdList *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA_ORB_ObjectIdList_var &
+CORBA_ORB_ObjectIdList_var::operator= (const ::CORBA_ORB_ObjectIdList_var &p)
+{
+  if (this != &p)
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CORBA_ORB_ObjectIdList *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              CORBA_ORB_ObjectIdList (*p.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              CORBA_ORB_ObjectIdList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE
+const ::CORBA_ORB_ObjectIdList *
+CORBA_ORB_ObjectIdList_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA_ORB_ObjectIdList *
+CORBA_ORB_ObjectIdList_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_var::operator const ::CORBA_ORB_ObjectIdList &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_var::operator ::CORBA_ORB_ObjectIdList &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_var::operator ::CORBA_ORB_ObjectIdList &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA_ORB_ObjectIdList_var::operator ::CORBA_ORB_ObjectIdList *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_SeqElem_String_Manager
+CORBA_ORB_ObjectIdList_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE
+const ::CORBA_ORB_ObjectIdList &
+CORBA_ORB_ObjectIdList_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA_ORB_ObjectIdList &
+CORBA_ORB_ObjectIdList_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+::CORBA_ORB_ObjectIdList *&
+CORBA_ORB_ObjectIdList_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA_ORB_ObjectIdList *
+CORBA_ORB_ObjectIdList_var::_retn (void)
+{
+  ::CORBA_ORB_ObjectIdList *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE
+::CORBA_ORB_ObjectIdList *
+CORBA_ORB_ObjectIdList_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567
+
+// *************************************************************
+// Inline operations for class CORBA_ORB_ObjectIdList_out
+// *************************************************************
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (const ::CORBA_ORB_ObjectIdList_out &p)
+  : ptr_ (ACE_const_cast (CORBA_ORB_ObjectIdList_out&, p).ptr_)
+{}
+
+ACE_INLINE
+::CORBA_ORB_ObjectIdList_out &
+CORBA_ORB_ObjectIdList_out::operator= (const ::CORBA_ORB_ObjectIdList_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_ORB_ObjectIdList_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA_ORB_ObjectIdList_out &
+CORBA_ORB_ObjectIdList_out::operator= (CORBA_ORB_ObjectIdList *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+CORBA_ORB_ObjectIdList_out::operator ::CORBA_ORB_ObjectIdList *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA_ORB_ObjectIdList *&
+CORBA_ORB_ObjectIdList_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+::CORBA_ORB_ObjectIdList *
+CORBA_ORB_ObjectIdList_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+TAO_SeqElem_String_Manager
+CORBA_ORB_ObjectIdList_out::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
+#if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_I_
+#define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_I_
+
+CORBA::Boolean TAO_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA_ORB_ObjectIdList &
+  );
+
+CORBA::Boolean TAO_Export operator>> (
+    TAO_InputCDR &,
+    CORBA_ORB_ObjectIdList &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_I_ */
+
diff --git a/TAO/tao/Services.cpp b/TAO/tao/Services.cpp
deleted file mode 100644
index 0605075a92d..00000000000
--- a/TAO/tao/Services.cpp
+++ /dev/null
@@ -1,575 +0,0 @@
-//$Id$
-/* -*- C++ -*- */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/Services.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Environment.h"
-#include "tao/Typecode.h"
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Services.i"
-#endif /* !defined INLINE */
-
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CS_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CS_
-
-// *************************************************************
-// CORBA::ServiceDetail::_tao_seq_Octet
-// *************************************************************
-
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
-#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)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (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)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
-#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)
-{}
-
-CORBA::ServiceDetail::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-static const CORBA::Long _oc_CORBA_ServiceDetail__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_CORBA_ServiceDetail__tao_seq_Octet), (char *) &_oc_CORBA_ServiceDetail__tao_seq_Octet, 0, sizeof (CORBA::ServiceDetail::_tao_seq_Octet));
-CORBA::TypeCode_ptr CORBA::ServiceDetail::_tc__tao_seq_Octet = &_tc_TAO_tc_CORBA_ServiceDetail__tao_seq_Octet;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
-
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ULong* tmp = CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (length);
-
-    if (this->buffer_ != 0)
-    {
-      CORBA::ULong *old = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->release_)
-        CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (old);
-
-    }
-    this->buffer_ = tmp;
-  }
-
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-
-    CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-
-    CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
-
-// *************************************************************
-// CORBA::ServiceInformation::_tao_seq_ServiceOption
-// *************************************************************
-
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (void)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max) // uses max size
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max, length, buffer, release)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (const _tao_seq_ServiceOption &seq) // copy ctor
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (seq)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
-
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ServiceDetail* tmp = CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (length);
-
-    if (this->buffer_ != 0)
-    {
-      CORBA::ServiceDetail *old = ACE_reinterpret_cast (CORBA::ServiceDetail *,this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->release_)
-        CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (old);
-
-    }
-    this->buffer_ = tmp;
-  }
-
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-
-    CORBA::ServiceDetail *tmp = ACE_reinterpret_cast (CORBA::ServiceDetail *,this->buffer_);
-
-    CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
-
-// *************************************************************
-// CORBA::ServiceInformation::_tao_seq_ServiceDetail
-// *************************************************************
-
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (void)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max) // uses max size
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max, CORBA::ULong length, CORBA::ServiceDetail *buffer, CORBA::Boolean release)
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max, length, buffer, release)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &seq) // copy ctor
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (seq)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ServiceDetail &_tao_elem)
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-
-  _tao_any._tao_replace (CORBA::_tc_ServiceDetail,
-                         TAO_ENCAP_BYTE_ORDER,
-                         stream.begin ());
-}
-
-void CORBA::ServiceDetail::_tao_any_destructor (void *x)
-{
-  CORBA::ServiceDetail *tmp = ACE_static_cast(CORBA::ServiceDetail*,x);
-  delete tmp;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ServiceDetail *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-
-  _tao_any._tao_replace (CORBA::_tc_ServiceDetail,
-                         TAO_ENCAP_BYTE_ORDER,
-                         stream.begin (),
-                         1,
-                         _tao_elem,
-                         CORBA::ServiceDetail::_tao_any_destructor);
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceDetail *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ServiceDetail ACE_ENV_ARG_PARAMETER)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ServiceDetail *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ServiceDetail, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
-                           _tao_any._tao_byte_order ());
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ServiceDetail,
-            1,
-            _tao_elem,
-            CORBA::ServiceDetail::_tao_any_destructor);
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ServiceInformation &_tao_elem) // copying
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-
-  _tao_any._tao_replace (CORBA::_tc_ServiceInformation,
-                         TAO_ENCAP_BYTE_ORDER,
-                         stream.begin ());
-}
-
-void CORBA::ServiceInformation::_tao_any_destructor (void *x)
-{
-  CORBA::ServiceInformation *tmp = ACE_static_cast(CORBA::ServiceInformation*,x);
-  delete tmp;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ServiceInformation *_tao_elem) // non copying
-{
-    TAO_OutputCDR stream;
-    stream << *_tao_elem;
-    _tao_any._tao_replace (CORBA::_tc_ServiceInformation,
-                           TAO_ENCAP_BYTE_ORDER,
-                           stream.begin (),
-                           1,
-                           _tao_elem,
-                           CORBA::ServiceInformation::_tao_any_destructor);
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceInformation *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ServiceInformation ACE_ENV_ARG_PARAMETER)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ServiceInformation *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ServiceInformation, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
-                           _tao_any._tao_byte_order ());
-      if (stream >> *_tao_elem)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ServiceInformation,
-            1,
-            _tao_elem,
-            CORBA::ServiceInformation::_tao_any_destructor);
-        return 1;
-      }
-      else
-      {
-        delete _tao_elem;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_ServiceDetail::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_ServiceDetail::_tao_seq_Octet *)&_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; // error
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail::_tao_seq_Octet &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // 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; // error
-}
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const CORBA_ServiceDetail &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.service_detail_type) &&
-    (strm << _tao_aggregate.service_detail)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.service_detail_type) &&
-    (strm >> _tao_aggregate.service_detail)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean
-operator<< (
-            TAO_OutputCDR &strm,
-            const CORBA_ServiceInformation::_tao_seq_ServiceOption &_tao_sequence
-            )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm,
-            CORBA_ServiceInformation::_tao_seq_ServiceOption &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-CORBA::Boolean
-operator<< (
-            TAO_OutputCDR &strm,
-            const CORBA_ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence
-            )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm,
-            CORBA_ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence)
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm,
-            const CORBA_ServiceInformation &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.service_options) &&
-    (strm << _tao_aggregate.service_details)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm,
-                           CORBA_ServiceInformation &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.service_options) &&
-    (strm >> _tao_aggregate.service_details)
-  )
-    return 1;
-  else
-    return 0;
-
-}
diff --git a/TAO/tao/Services.h b/TAO/tao/Services.h
deleted file mode 100644
index 221ad5054f2..00000000000
--- a/TAO/tao/Services.h
+++ /dev/null
@@ -1,543 +0,0 @@
-//=============================================================================
-/**
- *  @file    Services.h
- *
- *  $Id$
- *
- *
- *  Service_Detail stubs. This code generated by the The ACE ORB (TAO) IDL
- *  Compiler and was then hand crafted
- *
- *
- */
-//=============================================================================
-
-
-#ifndef TAO_SERVICES_H
-#define TAO_SERVICES_H
-#include "ace/pre.h"
-
-#include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-struct TAO_Export CORBA_ServiceDetail
-{
-  static void _tao_any_destructor (void*);
-
-  CORBA::ServiceDetailType service_detail_type;
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CH_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CH_
-
-  // *************************************************************
-  // _tao_seq_Octet
-  // *************************************************************
-
-  class  _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-  {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-                      CORBA::ULong max,
-                      CORBA::ULong length,
-                      CORBA::Octet *buffer,
-                      CORBA::Boolean release=0
-                      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      virtual ~_tao_seq_Octet (void); // dtor
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      _tao_seq_Octet (
-                      CORBA::ULong length,
-                      const ACE_Message_Block* mb
-                      )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-    };
-
-  static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___VAR_CH_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___VAR_CH_
-
-  // *************************************************************
-  // class CORBA::ServiceDetail::_tao_seq_Octet_var
-  // *************************************************************
-
-  class  _tao_seq_Octet_var
-    {
-    public:
-      _tao_seq_Octet_var (void); // default constructor
-      _tao_seq_Octet_var (_tao_seq_Octet *);
-      _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor
-      ~_tao_seq_Octet_var (void); // destructor
-
-      _tao_seq_Octet_var &operator= (_tao_seq_Octet *);
-      _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &);
-      _tao_seq_Octet *operator-> (void);
-      const _tao_seq_Octet *operator-> (void) const;
-
-      operator const _tao_seq_Octet &() const;
-      operator _tao_seq_Octet &();
-      operator _tao_seq_Octet &() const;
-      CORBA::Octet &operator[] (CORBA::ULong slot);
-      // in, inout, out, _retn
-      const _tao_seq_Octet &in (void) const;
-      _tao_seq_Octet &inout (void);
-      _tao_seq_Octet *&out (void);
-      _tao_seq_Octet *_retn (void);
-      _tao_seq_Octet *ptr (void) const;
-
-    private:
-      _tao_seq_Octet *ptr_;
-    };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___OUT_CH_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___OUT_CH_
-
-    class  _tao_seq_Octet_out
-    {
-    public:
-      _tao_seq_Octet_out (_tao_seq_Octet *&);
-      _tao_seq_Octet_out (_tao_seq_Octet_var &);
-      _tao_seq_Octet_out (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (_tao_seq_Octet *);
-      operator _tao_seq_Octet *&();
-      _tao_seq_Octet *&ptr (void);
-      _tao_seq_Octet *operator-> (void);
-      CORBA::Octet &operator[] (CORBA::ULong slot);
-
-    private:
-      _tao_seq_Octet *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_Octet_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    _tao_seq_Octet service_detail;
-};
-
-class  CORBA_ServiceDetail_var
-{
- public:
-  CORBA_ServiceDetail_var (void); // default constructor
-  CORBA_ServiceDetail_var (CORBA_ServiceDetail *);
-  CORBA_ServiceDetail_var (const CORBA_ServiceDetail_var &); // copy constructor
-  ~CORBA_ServiceDetail_var (void); // destructor
-
-  CORBA_ServiceDetail_var &operator= (CORBA_ServiceDetail *);
-  CORBA_ServiceDetail_var &operator= (const CORBA_ServiceDetail_var &);
-  CORBA_ServiceDetail *operator-> (void);
-  const CORBA_ServiceDetail *operator-> (void) const;
-
-  /// in, inout, out, _retn
-  operator const CORBA_ServiceDetail &() const;
-  operator CORBA_ServiceDetail &();
-  operator CORBA_ServiceDetail &() const;
-  const CORBA_ServiceDetail &in (void) const;
-  CORBA_ServiceDetail &inout (void);
-  CORBA_ServiceDetail *&out (void);
-  CORBA_ServiceDetail *_retn (void);
-  CORBA_ServiceDetail *ptr (void) const;
-
- private:
-  CORBA_ServiceDetail *ptr_;
-};
-
-class  CORBA_ServiceDetail_out
-{
- public:
-  CORBA_ServiceDetail_out (CORBA_ServiceDetail *&);
-  CORBA_ServiceDetail_out (CORBA_ServiceDetail_var &);
-  CORBA_ServiceDetail_out (const CORBA_ServiceDetail_out &);
-  CORBA_ServiceDetail_out &operator= (const CORBA_ServiceDetail_out &);
-  CORBA_ServiceDetail_out &operator= (CORBA_ServiceDetail *);
-  operator CORBA_ServiceDetail *&();
-  CORBA_ServiceDetail *&ptr (void);
-  CORBA_ServiceDetail *operator-> (void);
-
- private:
-  /// assignment from T_var not allowed
-  CORBA_ServiceDetail *&ptr_;
-  void operator= (const CORBA_ServiceDetail_var &);
-};
-
-struct  CORBA_ServiceInformation
-{
-  static void _tao_any_destructor (void*);
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
-
-  class _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum,
-                                                                               CORBA::ULong length,
-                                                                               CORBA::ULong *data,
-                                                                               CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption & rhs);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &operator= (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void); // Dtor.
-
-      // = Accessors.
-      CORBA::ULong &operator[] (CORBA::ULong i);
-      const CORBA::ULong &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA::ULong *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA::ULong *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-      CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::ULong *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-                    CORBA::ULong length,
-                    CORBA::ULong *data,
-                    CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
-
-  // *************************************************************
-  // _tao_seq_ServiceOption
-  // *************************************************************
-
-  class  _tao_seq_ServiceOption : public
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-    {
-    public:
-      _tao_seq_ServiceOption (void); // default ctor
-      _tao_seq_ServiceOption (CORBA::ULong max); // uses max size
-      _tao_seq_ServiceOption (
-                              CORBA::ULong max,
-                              CORBA::ULong length,
-                              CORBA::ULong *buffer,
-                              CORBA::Boolean release=0
-                              );
-      _tao_seq_ServiceOption (const _tao_seq_ServiceOption &); // copy ctor
-      ~_tao_seq_ServiceOption (void); // dtor
-    };
-  typedef _tao_seq_ServiceOption *_tao_seq_ServiceOption_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_ServiceOption;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___VAR_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___VAR_CH_
-
-  // *************************************************************
-  // class CORBA::ServiceInformation::_tao_seq_ServiceOption_var
-  // *************************************************************
-
-  class  _tao_seq_ServiceOption_var
-    {
-    public:
-      _tao_seq_ServiceOption_var (void); // default constructor
-      _tao_seq_ServiceOption_var (_tao_seq_ServiceOption *);
-      _tao_seq_ServiceOption_var (const _tao_seq_ServiceOption_var &); // copy constructor
-      ~_tao_seq_ServiceOption_var (void); // destructor
-      _tao_seq_ServiceOption_var &operator= (_tao_seq_ServiceOption *);
-      _tao_seq_ServiceOption_var &operator= (const _tao_seq_ServiceOption_var &);
-      _tao_seq_ServiceOption *operator-> (void);
-      const _tao_seq_ServiceOption *operator-> (void) const;
-
-      operator const _tao_seq_ServiceOption &() const;
-      operator _tao_seq_ServiceOption &();
-      operator _tao_seq_ServiceOption &() const;
-      CORBA::ServiceOption &operator[] (CORBA::ULong slot);
-      // in, inout, out, _retn
-      const _tao_seq_ServiceOption &in (void) const;
-      _tao_seq_ServiceOption &inout (void);
-      _tao_seq_ServiceOption *&out (void);
-      _tao_seq_ServiceOption *_retn (void);
-      _tao_seq_ServiceOption *ptr (void) const;
-
-    private:
-      _tao_seq_ServiceOption *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___OUT_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___OUT_CH_
-
-  class  _tao_seq_ServiceOption_out
-    {
-    public:
-      _tao_seq_ServiceOption_out (_tao_seq_ServiceOption *&);
-      _tao_seq_ServiceOption_out (_tao_seq_ServiceOption_var &);
-      _tao_seq_ServiceOption_out (const _tao_seq_ServiceOption_out &);
-      _tao_seq_ServiceOption_out &operator= (const _tao_seq_ServiceOption_out &);
-      _tao_seq_ServiceOption_out &operator= (_tao_seq_ServiceOption *);
-      operator _tao_seq_ServiceOption *&();
-      _tao_seq_ServiceOption *&ptr (void);
-      _tao_seq_ServiceOption *operator-> (void);
-      CORBA::ServiceOption &operator[] (CORBA::ULong slot);
-    private:
-      _tao_seq_ServiceOption *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_ServiceOption_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-  _tao_seq_ServiceOption service_options;
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
-
-  class _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum,
-                                                                               CORBA::ULong length,
-                                                                               CORBA_ServiceDetail *data,
-                                                                               CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail & rhs);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &operator= (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void); // Dtor.
-      // = Accessors.
-      CORBA_ServiceDetail &operator[] (CORBA::ULong i);
-      const CORBA_ServiceDetail &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_ServiceDetail *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_ServiceDetail *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-      CORBA_ServiceDetail *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_ServiceDetail *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-                    CORBA::ULong length,
-                    CORBA_ServiceDetail *data,
-                    CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
-
-  // *************************************************************
-  // _tao_seq_ServiceDetail
-  // *************************************************************
-
-  class  _tao_seq_ServiceDetail : public
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-    {
-    public:
-      _tao_seq_ServiceDetail (void); // default ctor
-      _tao_seq_ServiceDetail (CORBA::ULong max); // uses max size
-      _tao_seq_ServiceDetail (
-                              CORBA::ULong max,
-                              CORBA::ULong length,
-                              CORBA_ServiceDetail *buffer,
-                              CORBA::Boolean release=0
-                              );
-      _tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &); // copy ctor
-      ~_tao_seq_ServiceDetail (void); // dtor
-    };
-  typedef _tao_seq_ServiceDetail *_tao_seq_ServiceDetail_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_ServiceDetail;
-
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___VAR_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___VAR_CH_
-
-  // *************************************************************
-  // class CORBA::ServiceInformation::_tao_seq_ServiceDetail_var
-  // *************************************************************
-
-  class  _tao_seq_ServiceDetail_var
-    {
-    public:
-      _tao_seq_ServiceDetail_var (void); // default constructor
-      _tao_seq_ServiceDetail_var (_tao_seq_ServiceDetail *);
-      _tao_seq_ServiceDetail_var (const _tao_seq_ServiceDetail_var &); // copy constructor
-      ~_tao_seq_ServiceDetail_var (void); // destructor
-
-      _tao_seq_ServiceDetail_var &operator= (_tao_seq_ServiceDetail *);
-      _tao_seq_ServiceDetail_var &operator= (const _tao_seq_ServiceDetail_var &);
-      _tao_seq_ServiceDetail *operator-> (void);
-      const _tao_seq_ServiceDetail *operator-> (void) const;
-
-      operator const _tao_seq_ServiceDetail &() const;
-      operator _tao_seq_ServiceDetail &();
-      operator _tao_seq_ServiceDetail &() const;
-      CORBA_ServiceDetail &operator[] (CORBA::ULong slot);
-      // in, inout, out, _retn
-      const _tao_seq_ServiceDetail &in (void) const;
-      _tao_seq_ServiceDetail &inout (void);
-      _tao_seq_ServiceDetail *&out (void);
-      _tao_seq_ServiceDetail *_retn (void);
-      _tao_seq_ServiceDetail *ptr (void) const;
-
-    private:
-      _tao_seq_ServiceDetail *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___OUT_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___OUT_CH_
-
-  class  _tao_seq_ServiceDetail_out
-    {
-    public:
-      _tao_seq_ServiceDetail_out (_tao_seq_ServiceDetail *&);
-      _tao_seq_ServiceDetail_out (_tao_seq_ServiceDetail_var &);
-      _tao_seq_ServiceDetail_out (const _tao_seq_ServiceDetail_out &);
-      _tao_seq_ServiceDetail_out &operator= (const _tao_seq_ServiceDetail_out &);
-      _tao_seq_ServiceDetail_out &operator= (_tao_seq_ServiceDetail *);
-      operator _tao_seq_ServiceDetail *&();
-      _tao_seq_ServiceDetail *&ptr (void);
-      _tao_seq_ServiceDetail *operator-> (void);
-      CORBA_ServiceDetail &operator[] (CORBA::ULong slot);
-
-    private:
-      _tao_seq_ServiceDetail *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_ServiceDetail_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    _tao_seq_ServiceDetail service_details;
-};
-
-
-class  CORBA_ServiceInformation_var
-{
- public:
-  CORBA_ServiceInformation_var (void); // default constructor
-  CORBA_ServiceInformation_var (CORBA_ServiceInformation *);
-  CORBA_ServiceInformation_var (const CORBA_ServiceInformation_var &); // copy constructor
-  ~CORBA_ServiceInformation_var (void); // destructor
-
-  CORBA_ServiceInformation_var &operator= (CORBA_ServiceInformation *);
-  CORBA_ServiceInformation_var &operator= (const CORBA_ServiceInformation_var &);
-  CORBA_ServiceInformation *operator-> (void);
-  const CORBA_ServiceInformation *operator-> (void) const;
-
-  /// in, inout, out, _retn
-  operator const CORBA_ServiceInformation &() const;
-  operator CORBA_ServiceInformation &();
-  operator CORBA_ServiceInformation &() const;
-  const CORBA_ServiceInformation &in (void) const;
-  CORBA_ServiceInformation &inout (void);
-  CORBA_ServiceInformation *&out (void);
-  CORBA_ServiceInformation *_retn (void);
-  CORBA_ServiceInformation *ptr (void) const;
-
- private:
-  CORBA_ServiceInformation *ptr_;
-};
-
-class  CORBA_ServiceInformation_out
-{
- public:
-  CORBA_ServiceInformation_out (CORBA_ServiceInformation *&);
-  CORBA_ServiceInformation_out (CORBA_ServiceInformation_var &);
-  CORBA_ServiceInformation_out (const CORBA_ServiceInformation_out &);
-  CORBA_ServiceInformation_out &operator= (const CORBA_ServiceInformation_out &);
-  CORBA_ServiceInformation_out &operator= (CORBA_ServiceInformation *);
-
-  operator CORBA_ServiceInformation *&();
-  CORBA_ServiceInformation *&ptr (void);
-  CORBA_ServiceInformation *operator-> (void);
-
- private:
-  /// assignment from T_var not allowed
-  CORBA_ServiceInformation *&ptr_;
-  void operator= (const CORBA_ServiceInformation_var &);
-};
-
-
-void  operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&);
-void  operator<<= (CORBA::Any &, const CORBA_ServiceInformation &); // copying version
-void  operator<<= (CORBA::Any &, CORBA_ServiceInformation*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA_ServiceInformation *&);
-
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceDetail &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceDetail &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceDetail::_tao_seq_Octet &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceDetail::_tao_seq_Octet &);
-
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceInformation &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceInformation &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceInformation::_tao_seq_ServiceOption &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceInformation::_tao_seq_ServiceOption &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceInformation::_tao_seq_ServiceDetail &);
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceInformation::_tao_seq_ServiceDetail &);
-
-#if defined (__ACE_INLINE__)
-#include "tao/Services.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* TAO_SERVICES_H */
diff --git a/TAO/tao/Services.i b/TAO/tao/Services.i
deleted file mode 100644
index 4ed4a386630..00000000000
--- a/TAO/tao/Services.i
+++ /dev/null
@@ -1,1245 +0,0 @@
-//$Id$
-/* -*- C++ -*- */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
-//
-// Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceDetail_var::CORBA_ServiceDetail_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceDetail_var::CORBA_ServiceDetail_var ( CORBA_ServiceDetail *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
- CORBA_ServiceDetail_var::CORBA_ServiceDetail_var (const  CORBA_ServiceDetail_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new  CORBA_ServiceDetail(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
- CORBA_ServiceDetail_var::~CORBA_ServiceDetail_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail_var &
- CORBA_ServiceDetail_var::operator= ( CORBA_ServiceDetail *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE  CORBA_ServiceDetail_var &
- CORBA_ServiceDetail_var::operator= (const  CORBA_ServiceDetail_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new  CORBA_ServiceDetail (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
- CORBA_ServiceDetail_var::operator const  CORBA_ServiceDetail &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
- CORBA_ServiceDetail_var::operator  CORBA_ServiceDetail &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
- CORBA_ServiceDetail_var::operator  CORBA_ServiceDetail &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const  CORBA_ServiceDetail &
- CORBA_ServiceDetail_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail &
- CORBA_ServiceDetail_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE  CORBA_ServiceDetail *&
- CORBA_ServiceDetail_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::_retn (void)
-{
-   CORBA_ServiceDetail *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail_out
-// *************************************************************
-
-ACE_INLINE
- CORBA_ServiceDetail_out::CORBA_ServiceDetail_out ( CORBA_ServiceDetail *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
- CORBA_ServiceDetail_out::CORBA_ServiceDetail_out ( CORBA_ServiceDetail_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
- CORBA_ServiceDetail_out::CORBA_ServiceDetail_out (const  CORBA_ServiceDetail_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceDetail_out&,p).ptr_)
-{}
-
-ACE_INLINE  CORBA_ServiceDetail_out &
- CORBA_ServiceDetail_out::operator= (const  CORBA_ServiceDetail_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceDetail_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceDetail_out &
-CORBA_ServiceDetail_out::operator= (CORBA_ServiceDetail *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail_out::operator CORBA_ServiceDetail *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail *&
-CORBA_ServiceDetail_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail *
-CORBA_ServiceDetail_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CI_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail::_tao_seq_Octet_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::_tao_seq_Octet_var (CORBA_ServiceDetail::_tao_seq_Octet *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::_tao_seq_Octet_var (const CORBA_ServiceDetail::_tao_seq_Octet_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceDetail::_tao_seq_Octet(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_var &
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator= (CORBA_ServiceDetail::_tao_seq_Octet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_var &
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator= (const CORBA_ServiceDetail::_tao_seq_Octet_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceDetail::_tao_seq_Octet (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator const CORBA_ServiceDetail::_tao_seq_Octet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator CORBA_ServiceDetail::_tao_seq_Octet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator CORBA_ServiceDetail::_tao_seq_Octet &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_ServiceDetail::_tao_seq_Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *&
-CORBA_ServiceDetail::_tao_seq_Octet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::_retn (void)
-{
-  CORBA_ServiceDetail::_tao_seq_Octet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail::_tao_seq_Octet_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_out::_tao_seq_Octet_out (CORBA_ServiceDetail::_tao_seq_Octet *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_out::_tao_seq_Octet_out (CORBA_ServiceDetail::_tao_seq_Octet_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_out::_tao_seq_Octet_out (const CORBA_ServiceDetail::_tao_seq_Octet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceDetail::_tao_seq_Octet_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_out &
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator= (const CORBA_ServiceDetail::_tao_seq_Octet_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceDetail::_tao_seq_Octet_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_out &
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator= (CORBA_ServiceDetail::_tao_seq_Octet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator CORBA_ServiceDetail::_tao_seq_Octet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *&
-CORBA_ServiceDetail::_tao_seq_Octet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation_var::CORBA_ServiceInformation_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation_var::CORBA_ServiceInformation_var (CORBA_ServiceInformation *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation_var::CORBA_ServiceInformation_var (const CORBA_ServiceInformation_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceInformation(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation_var::~CORBA_ServiceInformation_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation_var &
-CORBA_ServiceInformation_var::operator= (CORBA_ServiceInformation *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation_var &
-CORBA_ServiceInformation_var::operator= (const CORBA_ServiceInformation_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceInformation (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_var::operator const CORBA_ServiceInformation &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_var::operator CORBA_ServiceInformation &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_var::operator CORBA_ServiceInformation &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA_ServiceInformation &
-CORBA_ServiceInformation_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation &
-CORBA_ServiceInformation_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceInformation *&
-CORBA_ServiceInformation_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::_retn (void)
-{
-  CORBA_ServiceInformation *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation_out::CORBA_ServiceInformation_out (CORBA_ServiceInformation *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation_out::CORBA_ServiceInformation_out (CORBA_ServiceInformation_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation_out::CORBA_ServiceInformation_out (const CORBA_ServiceInformation_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceInformation_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceInformation_out &
-CORBA_ServiceInformation_out::operator= (const CORBA_ServiceInformation_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceInformation_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation_out &
-CORBA_ServiceInformation_out::operator= (CORBA_ServiceInformation *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_out::operator CORBA_ServiceInformation *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *&
-CORBA_ServiceInformation_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::ULong *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::ULong[size];
-  }
-  
-  ACE_INLINE void CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (CORBA::ULong *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ULong *tmp1 = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->maximum_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator= (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-        CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-        this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::ULong *tmp1 = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::ULong &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::ULong &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::ULong *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ULong *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->length_);
-        this->buffer_ = result;
-	this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::ULong *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::ULong *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ULong *tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-      CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation::_tao_seq_ServiceOption_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_tao_seq_ServiceOption_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_tao_seq_ServiceOption_var (CORBA_ServiceInformation::_tao_seq_ServiceOption *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_tao_seq_ServiceOption_var (const CORBA_ServiceInformation::_tao_seq_ServiceOption_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceOption(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::~_tao_seq_ServiceOption_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_var &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator= (CORBA_ServiceInformation::_tao_seq_ServiceOption *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_var &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceOption_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceOption (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator const CORBA_ServiceInformation::_tao_seq_ServiceOption &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator CORBA_ServiceInformation::_tao_seq_ServiceOption &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator CORBA_ServiceInformation::_tao_seq_ServiceOption &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *&
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_retn (void)
-{
-  CORBA_ServiceInformation::_tao_seq_ServiceOption *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ServiceInformation::_tao_seq_ServiceOption_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::_tao_seq_ServiceOption_out (CORBA_ServiceInformation::_tao_seq_ServiceOption *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::_tao_seq_ServiceOption_out (CORBA_ServiceInformation::_tao_seq_ServiceOption_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::_tao_seq_ServiceOption_out (const CORBA_ServiceInformation::_tao_seq_ServiceOption_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceOption_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_out &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceOption_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceOption_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_out &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator= (CORBA_ServiceInformation::_tao_seq_ServiceOption *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator CORBA_ServiceInformation::_tao_seq_ServiceOption *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *&
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA_ServiceDetail *
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA_ServiceDetail[size];
-  }
-  
-  ACE_INLINE void CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (CORBA::ServiceDetail *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_ServiceDetail *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA_ServiceDetail *tmp1 = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->maximum_);
-    CORBA_ServiceDetail * const tmp2 = ACE_reinterpret_cast (CORBA_ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator= (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA_ServiceDetail *tmp = ACE_reinterpret_cast (CORBA_ServiceDetail *, this->buffer_);
-        CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-        this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_ServiceDetail *tmp1 = ACE_reinterpret_cast (CORBA_ServiceDetail *, this->buffer_);
-    CORBA_ServiceDetail * const tmp2 = ACE_reinterpret_cast (CORBA_ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA_ServiceDetail &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_ServiceDetail* tmp = ACE_reinterpret_cast(CORBA_ServiceDetail*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA_ServiceDetail &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_ServiceDetail * const tmp = ACE_reinterpret_cast (CORBA_ServiceDetail* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA_ServiceDetail *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA_ServiceDetail *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->length_);
-        this->buffer_ = result;
-	this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_ServiceDetail*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA_ServiceDetail*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA_ServiceDetail *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA_ServiceDetail * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA_ServiceDetail *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA_ServiceDetail *tmp = ACE_reinterpret_cast(CORBA_ServiceDetail*,this->buffer_);
-      CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ServiceInformation::_tao_seq_ServiceDetail_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_tao_seq_ServiceDetail_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_tao_seq_ServiceDetail_var (CORBA_ServiceInformation::_tao_seq_ServiceDetail *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_tao_seq_ServiceDetail_var (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceDetail(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::~_tao_seq_ServiceDetail_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator= (CORBA_ServiceInformation::_tao_seq_ServiceDetail *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceDetail (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator const CORBA_ServiceInformation::_tao_seq_ServiceDetail &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator CORBA_ServiceInformation::_tao_seq_ServiceDetail &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator CORBA_ServiceInformation::_tao_seq_ServiceDetail &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *&
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_retn (void)
-{
-  CORBA_ServiceInformation::_tao_seq_ServiceDetail *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation::_tao_seq_ServiceDetail_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::_tao_seq_ServiceDetail_out (CORBA_ServiceInformation::_tao_seq_ServiceDetail *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::_tao_seq_ServiceDetail_out (CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::_tao_seq_ServiceDetail_out (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceDetail_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceDetail_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator= (CORBA_ServiceInformation::_tao_seq_ServiceDetail *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator CORBA_ServiceInformation::_tao_seq_ServiceDetail *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *&
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator[] (CORBA::ULong slot)
-{
-  return this->ptr_->operator[] (slot);
-}
-
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl
new file mode 100644
index 00000000000..27f35bd1b94
--- /dev/null
+++ b/TAO/tao/Services.pidl
@@ -0,0 +1,49 @@
+// -*- IDL -*-
+//
+// $Id$
+
+// ================================================================
+//
+//   This file was used to generate the code in ServicesC.*
+//   The command used to generate code is:
+//
+//     tao_idl
+//       -o orig -Gp -Gd -Ge 1
+//          -Wb,export_macro=TAO_Export
+//          -Wb,export_include="tao/corbafwd.h"
+//          -Wb,pre_include="ace/pre.h"
+//          -Wb,post_include="ace/post.h"
+//          Services.pidl
+//
+// ================================================================
+
+
+#ifndef TAO_CORBA_SERVICES_IDL
+#define TAO_CORBA_SERVICES_IDL
+
+#include <OctetSeq.pidl>
+
+#pragma prefix "omg.org"
+
+module CORBA
+{
+  typedef unsigned short ServiceType;
+  typedef unsigned long ServiceOption;
+  typedef unsigned long ServiceDetailType;
+
+  const ServiceType Security = 1;
+
+  struct ServiceDetail
+  {
+    ServiceDetailType service_detail_type;
+    OctetSeq service_detail;
+  };
+
+  struct ServiceInformation
+  {
+    sequence <ServiceOption> service_options;
+    sequence <ServiceDetail> service_details;
+  };
+};
+
+#endif  /* TAO_CORBA_SERVICES_IDL */
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
new file mode 100644
index 00000000000..412cd5fe5a5
--- /dev/null
+++ b/TAO/tao/ServicesC.cpp
@@ -0,0 +1,945 @@
+// -*- 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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
+
+
+#include "ServicesC.h"
+#include "tao/Any_T.h"
+#include "tao/Environment.h"
+#include "tao/ORB_Core.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ServicesC.i"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ServiceType[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  34,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65547970), 
+  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ServiceType:1.0
+    12,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636554), 
+  ACE_NTOHL (0x79706500),  // name = ServiceType
+    CORBA::tk_ushort,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceType (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceType),
+    (char *) &_oc_CORBA_ServiceType,
+    0,
+    sizeof (CORBA::ServiceType)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceType,
+    &_tc_TAO_tc_CORBA_ServiceType
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ServiceOption[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x654f7074), 
+  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
+    14,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6963654f), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e000000),  // name = ServiceOption
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOption (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceOption),
+    (char *) &_oc_CORBA_ServiceOption,
+    0,
+    sizeof (CORBA::ServiceOption)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceOption,
+    &_tc_TAO_tc_CORBA_ServiceOption
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65446574), 
+  ACE_NTOHL (0x61696c54), 
+  ACE_NTOHL (0x7970653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
+    18,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636544), 
+  ACE_NTOHL (0x65746169), 
+  ACE_NTOHL (0x6c547970), 
+  ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailType (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceDetailType),
+    (char *) &_oc_CORBA_ServiceDetailType,
+    0,
+    sizeof (CORBA::ServiceDetailType)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceDetailType,
+    &_tc_TAO_tc_CORBA_ServiceDetailType
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ServiceDetail[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65446574), 
+  ACE_NTOHL (0x61696c3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
+    14,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636544), 
+  ACE_NTOHL (0x65746169), 
+  ACE_NTOHL (0x6c000000),  // name = ServiceDetail
+  2, // member count
+    20,
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x64657461), 
+  ACE_NTOHL (0x696c5f74), 
+  ACE_NTOHL (0x79706500),  // name = service_detail_type
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f5365), 
+    ACE_NTOHL (0x72766963), 
+    ACE_NTOHL (0x65446574), 
+    ACE_NTOHL (0x61696c54), 
+    ACE_NTOHL (0x7970653a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
+        18,
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x69636544), 
+    ACE_NTOHL (0x65746169), 
+    ACE_NTOHL (0x6c547970), 
+    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+        CORBA::tk_ulong,
+
+
+  15,
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x64657461), 
+  ACE_NTOHL (0x696c0000),  // name = service_detail
+    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 (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+        9,
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
+    ACE_NTOHL (0x0),  // name = OctetSeq
+        CORBA::tk_sequence, // typecode kind
+    12, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_octet,
+
+      0U,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_ServiceDetail),
+    (char *) &_oc_CORBA_ServiceDetail,
+    0,
+    sizeof (CORBA::ServiceDetail)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceDetail,
+    &_tc_TAO_tc_CORBA_ServiceDetail
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void CORBA::ServiceDetail::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServiceDetail *tmp = ACE_static_cast (ServiceDetail*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_ServiceInformation[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5365), 
+  ACE_NTOHL (0x72766963), 
+  ACE_NTOHL (0x65496e66), 
+  ACE_NTOHL (0x6f726d61), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
+    19,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636549), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e0000),  // name = ServiceInformation
+  2, // member count
+    16,
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x6f707469), 
+  ACE_NTOHL (0x6f6e7300),  // name = service_options
+    CORBA::tk_sequence, // typecode kind
+  84, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_alias, // typecode kind for typedefs
+    68, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      36,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5365), 
+      ACE_NTOHL (0x72766963), 
+      ACE_NTOHL (0x654f7074), 
+      ACE_NTOHL (0x696f6e3a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
+            14,
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x6963654f), 
+      ACE_NTOHL (0x7074696f), 
+      ACE_NTOHL (0x6e000000),  // name = ServiceOption
+            CORBA::tk_ulong,
+
+
+    0U,
+
+  16,
+  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6963655f), 
+  ACE_NTOHL (0x64657461), 
+  ACE_NTOHL (0x696c7300),  // name = service_details
+    CORBA::tk_sequence, // typecode kind
+  296, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    280, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      36,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x434f5242), 
+      ACE_NTOHL (0x412f5365), 
+      ACE_NTOHL (0x72766963), 
+      ACE_NTOHL (0x65446574), 
+      ACE_NTOHL (0x61696c3a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
+            14,
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x69636544), 
+      ACE_NTOHL (0x65746169), 
+      ACE_NTOHL (0x6c000000),  // name = ServiceDetail
+      2, // member count
+            20,
+      ACE_NTOHL (0x73657276), 
+      ACE_NTOHL (0x6963655f), 
+      ACE_NTOHL (0x64657461), 
+      ACE_NTOHL (0x696c5f74), 
+      ACE_NTOHL (0x79706500),  // name = service_detail_type
+            CORBA::tk_alias, // typecode kind for typedefs
+      76, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        40,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f5365), 
+        ACE_NTOHL (0x72766963), 
+        ACE_NTOHL (0x65446574), 
+        ACE_NTOHL (0x61696c54), 
+        ACE_NTOHL (0x7970653a), 
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
+                18,
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x69636544), 
+        ACE_NTOHL (0x65746169), 
+        ACE_NTOHL (0x6c547970), 
+        ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+                CORBA::tk_ulong,
+
+
+      15,
+      ACE_NTOHL (0x73657276), 
+      ACE_NTOHL (0x6963655f), 
+      ACE_NTOHL (0x64657461), 
+      ACE_NTOHL (0x696c0000),  // name = service_detail
+            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 (0x434f5242), 
+        ACE_NTOHL (0x412f4f63), 
+        ACE_NTOHL (0x74657453), 
+        ACE_NTOHL (0x65713a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+                9,
+        ACE_NTOHL (0x4f637465), 
+        ACE_NTOHL (0x74536571), 
+        ACE_NTOHL (0x0),  // name = OctetSeq
+                CORBA::tk_sequence, // typecode kind
+        12, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          CORBA::tk_octet,
+
+          0U,
+
+
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceInformation (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_ServiceInformation),
+    (char *) &_oc_CORBA_ServiceInformation,
+    0,
+    sizeof (CORBA::ServiceInformation)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServiceInformation,
+    &_tc_TAO_tc_CORBA_ServiceInformation
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67
+
+void CORBA::ServiceInformation::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServiceInformation *tmp = ACE_static_cast (ServiceInformation*, _tao_void_pointer);
+  delete tmp;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
+
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ULong* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ULong *old =
+        ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (old);
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ULong *tmp =
+    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void)
+{
+  this->_deallocate_buffer ();
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
+#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
+// *************************************************************
+// CORBA::ServiceInformation::_tao_seq_ServiceOption
+// *************************************************************
+
+CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (void)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ULong *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (const _tao_seq_ServiceOption &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void) // dtor
+{}
+
+void CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_any_destructor (void *_tao_void_pointer)
+{
+  _tao_seq_ServiceOption *tmp = ACE_static_cast (_tao_seq_ServiceOption*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
+
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::ServiceDetail* tmp = 0;
+  tmp = _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (length);
+  
+  if (this->buffer_ != 0)
+    {
+      CORBA::ServiceDetail *old =
+        ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+      
+      if (this->release_)
+        {
+          _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (old);
+        }
+    }
+  
+  this->buffer_ = tmp;
+}
+
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+  
+  CORBA::ServiceDetail *tmp =
+    ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
+  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
+  this->buffer_ = 0;
+} 
+
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void)
+{
+  this->_deallocate_buffer ();
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
+#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250
+
+// *************************************************************
+// CORBA::ServiceInformation::_tao_seq_ServiceDetail
+// *************************************************************
+
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (void)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ServiceDetail>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ServiceDetail *buffer,
+    CORBA::Boolean release
+  )
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ServiceDetail>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &seq)
+  : 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+TAO_Unbounded_Sequence<CORBA::ServiceDetail>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+
+CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void) // dtor
+{}
+
+void CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_any_destructor (void *_tao_void_pointer)
+{
+  _tao_seq_ServiceDetail *tmp = ACE_static_cast (_tao_seq_ServiceDetail*, _tao_void_pointer);
+  delete tmp;
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ServiceDetail &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert_copy (
+      _tao_any,
+      CORBA::ServiceDetail::_tao_any_destructor,
+      CORBA::_tc_ServiceDetail,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ServiceDetail *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert (
+      _tao_any,
+      CORBA::ServiceDetail::_tao_any_destructor,
+      CORBA::_tc_ServiceDetail,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ServiceDetail *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ServiceDetail *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ServiceDetail *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::extract (
+        _tao_any,
+        CORBA::ServiceDetail::_tao_any_destructor,
+        CORBA::_tc_ServiceDetail,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ServiceInformation &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert_copy (
+      _tao_any,
+      CORBA::ServiceInformation::_tao_any_destructor,
+      CORBA::_tc_ServiceInformation,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ServiceInformation *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert (
+      _tao_any,
+      CORBA::ServiceInformation::_tao_any_destructor,
+      CORBA::_tc_ServiceInformation,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ServiceInformation *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ServiceInformation *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ServiceInformation *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::extract (
+        _tao_any,
+        CORBA::ServiceInformation::_tao_any_destructor,
+        CORBA::_tc_ServiceInformation,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  template class TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ServiceInformation::_tao_seq_ServiceOption &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ServiceInformation::_tao_seq_ServiceOption &_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.
+      return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+    }
+  
+  return 0;
+}
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
+  if (strm << _tao_seq_len)
+    {
+      // Encode all elements.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm << _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ServiceInformation::_tao_seq_ServiceDetail &_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.
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag = (strm >> _tao_sequence[i]);
+        }
+      
+      return _tao_marshal_flag;
+    }
+  
+  return 0;
+}
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_ */
+
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
new file mode 100644
index 00000000000..804f772b74b
--- /dev/null
+++ b/TAO/tao/ServicesC.h
@@ -0,0 +1,551 @@
+// -*- 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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_SERVICESC_H_
+#define _TAO_IDL_ORIG_SERVICESC_H_
+
+#include "ace/pre.h"
+#include "tao/Sequence.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "OctetSeqC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  CORBA
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::UShort ServiceType;
+  typedef CORBA::UShort_out ServiceType_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceType;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::ULong ServiceOption;
+  typedef CORBA::ULong_out ServiceOption_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceOption;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334
+  
+  typedef CORBA::ULong ServiceDetailType;
+  typedef CORBA::ULong_out ServiceDetailType_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetailType;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::UShort Security = 1U;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class ServiceDetail_var;
+  
+  struct TAO_Export ServiceDetail
+  {
+    typedef ServiceDetail_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    CORBA::ServiceDetailType service_detail_type;
+    CORBA::OctetSeq service_detail;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
+  class TAO_Export ServiceDetail_var
+  {
+  public:
+    ServiceDetail_var (void);
+    ServiceDetail_var (ServiceDetail *);
+    ServiceDetail_var (const ServiceDetail_var &);
+    ~ServiceDetail_var (void);
+    
+    ServiceDetail_var &operator= (ServiceDetail *);
+    ServiceDetail_var &operator= (const ServiceDetail_var &);
+    ServiceDetail *operator-> (void);
+    const ServiceDetail *operator-> (void) const;
+    
+    operator const ServiceDetail &() const;
+    operator ServiceDetail &();
+    operator ServiceDetail &() const;
+    
+    // Variable-size types only.
+    operator ServiceDetail *&();
+    
+    // in, inout, out, _retn 
+    const ServiceDetail &in (void) const;
+    ServiceDetail &inout (void);
+    ServiceDetail *&out (void);
+    ServiceDetail *_retn (void);
+    ServiceDetail *ptr (void) const;
+  
+  private:
+    ServiceDetail *ptr_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
+  class TAO_Export ServiceDetail_out
+  {
+  public:
+    ServiceDetail_out (ServiceDetail *&);
+    ServiceDetail_out (ServiceDetail_var &);
+    ServiceDetail_out (const ServiceDetail_out &);
+    ServiceDetail_out &operator= (const ServiceDetail_out &);
+    ServiceDetail_out &operator= (ServiceDetail *);
+    operator ServiceDetail *&();
+    ServiceDetail *&ptr (void);
+    ServiceDetail *operator-> (void);
+    
+  private:
+    ServiceDetail *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ServiceDetail_var &);
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetail;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49
+  
+  class ServiceInformation_var;
+  
+  struct TAO_Export ServiceInformation
+  {
+    typedef ServiceInformation_var _var_type;
+    
+    static void _tao_any_destructor (void *);
+    
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
+    
+    class TAO_Export _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void);
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          CORBA::ULong *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
+          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
+        );
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &operator= (
+          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void);
+      
+      // = Accessors.
+      CORBA::ULong &operator[] (CORBA::ULong i);
+      const CORBA::ULong &operator[] (CORBA::ULong i) const;
+      
+      // = Static operations.
+      static CORBA::ULong *allocbuf (CORBA::ULong size);
+      static void freebuf (CORBA::ULong *buffer);
+      
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
+      const CORBA::ULong *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          CORBA::ULong *data,
+          CORBA::Boolean release
+        );
+    };
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
+#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
+    class _tao_seq_ServiceOption;
+    
+    // *************************************************************
+    // CORBA::ServiceInformation::_tao_seq_ServiceOption
+    // *************************************************************
+    
+    class TAO_Export _tao_seq_ServiceOption : public 
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+    _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+    TAO_Unbounded_Sequence<CORBA::ULong>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    {
+    public:
+      _tao_seq_ServiceOption (void);
+      _tao_seq_ServiceOption (CORBA::ULong max);
+      _tao_seq_ServiceOption (
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          CORBA::ULong *buffer, 
+          CORBA::Boolean release = 0
+        );
+      _tao_seq_ServiceOption (const _tao_seq_ServiceOption &);
+      ~_tao_seq_ServiceOption (void);
+      
+      static void _tao_any_destructor (void*);
+      
+      
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
+    
+    typedef _tao_seq_ServiceOption _service_options_seq;
+    _tao_seq_ServiceOption service_options;
+    
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
+    
+    class TAO_Export _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
+      : public TAO_Unbounded_Base_Sequence
+    {
+    public:
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void);
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
+          CORBA::ULong maximum,
+          CORBA::ULong length,
+          ACE_NESTED_CLASS (CORBA, ServiceDetail) *data,
+          CORBA::Boolean release = 0
+        );
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
+          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
+        );
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &operator= (
+          const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
+        );
+      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void);
+      
+      // = Accessors.
+      ACE_NESTED_CLASS (CORBA, ServiceDetail) &operator[] (CORBA::ULong i);
+      const ACE_NESTED_CLASS (CORBA, ServiceDetail) &operator[] (CORBA::ULong i) const;
+      
+      // = Static operations.
+      static ACE_NESTED_CLASS (CORBA, ServiceDetail) *allocbuf (CORBA::ULong size);
+      static void freebuf (ACE_NESTED_CLASS (CORBA, ServiceDetail) *buffer);
+      
+      // Implement the TAO_Base_Sequence methods (see Sequence.h)
+      virtual void _allocate_buffer (CORBA::ULong length);
+      virtual void _deallocate_buffer (void);
+      ACE_NESTED_CLASS (CORBA, ServiceDetail) *get_buffer (CORBA::Boolean orphan = 0);
+      const ACE_NESTED_CLASS (CORBA, ServiceDetail) *get_buffer (void) const;
+      void replace (
+          CORBA::ULong max,
+          CORBA::ULong length,
+          ACE_NESTED_CLASS (CORBA, ServiceDetail) *data,
+          CORBA::Boolean release
+        );
+    };
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
+#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371
+    
+    class _tao_seq_ServiceDetail;
+    
+    // *************************************************************
+    // CORBA::ServiceInformation::_tao_seq_ServiceDetail
+    // *************************************************************
+    
+    class TAO_Export _tao_seq_ServiceDetail : public 
+    
+    // TAO_IDL - Generated from 
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+    _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+    TAO_Unbounded_Sequence<ACE_NESTED_CLASS (CORBA, ServiceDetail)>
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    {
+    public:
+      _tao_seq_ServiceDetail (void);
+      _tao_seq_ServiceDetail (CORBA::ULong max);
+      _tao_seq_ServiceDetail (
+          CORBA::ULong max, 
+          CORBA::ULong length, 
+          ACE_NESTED_CLASS (CORBA, ServiceDetail) *buffer, 
+          CORBA::Boolean release = 0
+        );
+      _tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &);
+      ~_tao_seq_ServiceDetail (void);
+      
+      static void _tao_any_destructor (void*);
+      
+      
+    };
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447
+    
+    typedef _tao_seq_ServiceDetail _service_details_seq;
+    _tao_seq_ServiceDetail service_details;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71
+  
+  class TAO_Export ServiceInformation_var
+  {
+  public:
+    ServiceInformation_var (void);
+    ServiceInformation_var (ServiceInformation *);
+    ServiceInformation_var (const ServiceInformation_var &);
+    ~ServiceInformation_var (void);
+    
+    ServiceInformation_var &operator= (ServiceInformation *);
+    ServiceInformation_var &operator= (const ServiceInformation_var &);
+    ServiceInformation *operator-> (void);
+    const ServiceInformation *operator-> (void) const;
+    
+    operator const ServiceInformation &() const;
+    operator ServiceInformation &();
+    operator ServiceInformation &() const;
+    
+    // Variable-size types only.
+    operator ServiceInformation *&();
+    
+    // in, inout, out, _retn 
+    const ServiceInformation &in (void) const;
+    ServiceInformation &inout (void);
+    ServiceInformation *&out (void);
+    ServiceInformation *_retn (void);
+    ServiceInformation *ptr (void) const;
+  
+  private:
+    ServiceInformation *ptr_;
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445
+  
+  class TAO_Export ServiceInformation_out
+  {
+  public:
+    ServiceInformation_out (ServiceInformation *&);
+    ServiceInformation_out (ServiceInformation_var &);
+    ServiceInformation_out (const ServiceInformation_out &);
+    ServiceInformation_out &operator= (const ServiceInformation_out &);
+    ServiceInformation_out &operator= (ServiceInformation *);
+    operator ServiceInformation *&();
+    ServiceInformation *&ptr (void);
+    ServiceInformation *operator-> (void);
+    
+  private:
+    ServiceInformation *&ptr_;
+    // Assignment from T_var not allowed.
+    void operator= (const ServiceInformation_var &);
+  };
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceInformation;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
+}
+TAO_NAMESPACE_CLOSE // module CORBA
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetail *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceInformation &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
+#ifndef __ACE_INLINE__
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceDetail &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceDetail &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInformation &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &);
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_H_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ServiceInformation::_tao_seq_ServiceOption &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ServiceInformation::_tao_seq_ServiceOption &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_H_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_H_
+
+TAO_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ServiceInformation::_tao_seq_ServiceDetail &
+  );
+TAO_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::ServiceInformation::_tao_seq_ServiceDetail &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_H_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
+#endif /* __ACE_INLINE__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009
+
+#if defined (__ACE_INLINE__)
+#include "ServicesC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/ServicesC.i b/TAO/tao/ServicesC.i
new file mode 100644
index 00000000000..c4fb452b840
--- /dev/null
+++ b/TAO/tao/ServicesC.i
@@ -0,0 +1,988 @@
+// -*- 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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
+// *************************************************************
+// Inline operations for class CORBA::ServiceDetail_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ServiceDetail_var::ServiceDetail_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::ServiceDetail_var (ServiceDetail *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::ServiceDetail_var (const ::CORBA::ServiceDetail_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ServiceDetail (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::~ServiceDetail_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_var &
+CORBA::ServiceDetail_var::operator= (ServiceDetail *_tao_struct_var)
+{
+  delete this->ptr_;
+  this->ptr_ = _tao_struct_var;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ServiceDetail_var &
+CORBA::ServiceDetail_var::operator= (const ::CORBA::ServiceDetail_var &_tao_struct_var)
+{
+  if (this != &_tao_struct_var)
+    {
+      if (_tao_struct_var.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ServiceDetail *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ServiceDetail (*_tao_struct_var.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ServiceDetail *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE const ::CORBA::ServiceDetail *
+CORBA::ServiceDetail_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail *
+CORBA::ServiceDetail_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::operator const ::CORBA::ServiceDetail &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::CORBA::ServiceDetail &
+CORBA::ServiceDetail_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail &
+CORBA::ServiceDetail_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// Mapping for variable size.
+ACE_INLINE ::CORBA::ServiceDetail *&
+CORBA::ServiceDetail_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail *
+CORBA::ServiceDetail_var::_retn (void)
+{
+  ::CORBA::ServiceDetail *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail *
+CORBA::ServiceDetail_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
+// *************************************************************
+// Inline operations for class CORBA::ServiceDetail_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ServiceDetail_out::ServiceDetail_out (::CORBA::ServiceDetail *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_out::ServiceDetail_out (ServiceDetail_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_out::ServiceDetail_out (const ::CORBA::ServiceDetail_out &p)
+  : ptr_ (ACE_const_cast (ServiceDetail_out&, p).ptr_)
+{}
+
+ACE_INLINE
+CORBA::ServiceDetail_out &
+CORBA::ServiceDetail_out::operator= (const ::CORBA::ServiceDetail_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServiceDetail_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ServiceDetail_out &
+CORBA::ServiceDetail_out::operator= (ServiceDetail *_tao_struct_out)
+{
+  this->ptr_ = _tao_struct_out;
+  return *this;
+}
+
+ACE_INLINE 
+CORBA::ServiceDetail_out::operator ::CORBA::ServiceDetail *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail *&
+CORBA::ServiceDetail_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceDetail *
+CORBA::ServiceDetail_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194
+
+// *************************************************************
+// Inline operations for class CORBA::ServiceInformation_var
+// *************************************************************
+
+ACE_INLINE
+CORBA::ServiceInformation_var::ServiceInformation_var (void)
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::ServiceInformation_var (ServiceInformation *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::ServiceInformation_var (const ::CORBA::ServiceInformation_var &p)
+{
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_, ::CORBA::ServiceInformation (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::~ServiceInformation_var (void)
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_var &
+CORBA::ServiceInformation_var::operator= (ServiceInformation *_tao_struct_var)
+{
+  delete this->ptr_;
+  this->ptr_ = _tao_struct_var;
+  return *this;
+}
+
+ACE_INLINE
+::CORBA::ServiceInformation_var &
+CORBA::ServiceInformation_var::operator= (const ::CORBA::ServiceInformation_var &_tao_struct_var)
+{
+  if (this != &_tao_struct_var)
+    {
+      if (_tao_struct_var.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ServiceInformation *deep_copy = 0;
+          ACE_NEW_RETURN (
+              deep_copy,
+              ServiceInformation (*_tao_struct_var.ptr_),
+              *this
+            );
+          
+          if (deep_copy != 0)
+            {
+              ServiceInformation *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
+  return *this;
+}
+
+ACE_INLINE const ::CORBA::ServiceInformation *
+CORBA::ServiceInformation_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation *
+CORBA::ServiceInformation_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::operator const ::CORBA::ServiceInformation &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation &() // cast 
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation &() const // cast 
+{
+  return *this->ptr_;
+}
+
+// Variable-size types only.
+ACE_INLINE
+CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation *&() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const ::CORBA::ServiceInformation &
+CORBA::ServiceInformation_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation &
+CORBA::ServiceInformation_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// Mapping for variable size.
+ACE_INLINE ::CORBA::ServiceInformation *&
+CORBA::ServiceInformation_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation *
+CORBA::ServiceInformation_var::_retn (void)
+{
+  ::CORBA::ServiceInformation *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation *
+CORBA::ServiceInformation_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523
+
+// *************************************************************
+// Inline operations for class CORBA::ServiceInformation_out
+// *************************************************************
+
+ACE_INLINE
+CORBA::ServiceInformation_out::ServiceInformation_out (::CORBA::ServiceInformation *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_out::ServiceInformation_out (ServiceInformation_var &p)
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_out::ServiceInformation_out (const ::CORBA::ServiceInformation_out &p)
+  : ptr_ (ACE_const_cast (ServiceInformation_out&, p).ptr_)
+{}
+
+ACE_INLINE
+CORBA::ServiceInformation_out &
+CORBA::ServiceInformation_out::operator= (const ::CORBA::ServiceInformation_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServiceInformation_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation_out &
+CORBA::ServiceInformation_out::operator= (ServiceInformation *_tao_struct_out)
+{
+  this->ptr_ = _tao_struct_out;
+  return *this;
+}
+
+ACE_INLINE 
+CORBA::ServiceInformation_out::operator ::CORBA::ServiceInformation *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation *&
+CORBA::ServiceInformation_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::CORBA::ServiceInformation *
+CORBA::ServiceInformation_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_
+
+ACE_INLINE
+CORBA::ULong *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (CORBA::ULong size)
+{
+  CORBA::ULong *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ULong[size], 0);
+  return retval;
+}
+
+ACE_INLINE
+void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (CORBA::ULong *buffer)
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void)
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ULong *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (
+    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ULong *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->maximum_);
+      CORBA::ULong * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::ULong *tmp =
+            ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ULong *tmp1 =
+    ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
+  CORBA::ULong * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
+  
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE
+CORBA::ULong &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i)
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ULong* tmp =
+    ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE
+const CORBA::ULong &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i) const
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ULong * const tmp =
+    ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE
+CORBA::ULong *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ULong *result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+        }
+    }
+  else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::ULong *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ULong *data,
+    CORBA::Boolean release
+  )
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  
+  if (this->buffer_ && this->release_ == 1)
+    {
+      CORBA::ULong *tmp =
+        ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
+    }
+  
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_
+
+ACE_INLINE
+CORBA::ServiceDetail *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (CORBA::ULong size)
+{
+  CORBA::ServiceDetail *retval = 0;
+  ACE_NEW_RETURN (retval, CORBA::ServiceDetail[size], 0);
+  return retval;
+}
+
+ACE_INLINE
+void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (CORBA::ServiceDetail *buffer)
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void)
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum) 
+  : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (maximum))
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::ServiceDetail *data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (
+    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::ServiceDetail *tmp1 =
+        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->maximum_);
+      CORBA::ServiceDetail * const tmp2 =
+        ACE_reinterpret_cast (CORBA::ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+      
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+ACE_INLINE
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator= (
+    const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+  
+  if (this->release_)
+    {
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          CORBA::ServiceDetail *tmp =
+            ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
+          
+          _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
+          
+          this->buffer_ =
+            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      this->buffer_ =
+        _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
+    }
+  
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+  
+  CORBA::ServiceDetail *tmp1 =
+    ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_);
+  CORBA::ServiceDetail * const tmp2 =
+    ACE_reinterpret_cast (CORBA::ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
+  
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
+  
+  return *this;
+}
+
+// = Accessors.
+ACE_INLINE
+CORBA::ServiceDetail &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i)
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ServiceDetail* tmp =
+    ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE
+const CORBA::ServiceDetail &
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i) const
+{
+  ACE_ASSERT (i < this->maximum_);
+  CORBA::ServiceDetail * const tmp =
+    ACE_reinterpret_cast (CORBA::ServiceDetail* ACE_CAST_CONST, this->buffer_);
+  return tmp[i];
+}
+
+// Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+ACE_INLINE
+CORBA::ServiceDetail *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::ServiceDetail *result = 0;
+  
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result =
+            _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_);
+        }
+    }
+  else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result =
+            ACE_reinterpret_cast(CORBA::ServiceDetail*,this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+  
+  return result;
+}
+
+ACE_INLINE
+const CORBA::ServiceDetail *
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (void) const
+{
+  return ACE_reinterpret_cast (const CORBA::ServiceDetail * ACE_CAST_CONST, this->buffer_);
+}
+
+ACE_INLINE
+void
+CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::replace (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::ServiceDetail *data,
+    CORBA::Boolean release
+  )
+{
+  this->maximum_ = max;
+  this->length_ = length;
+  
+  if (this->buffer_ && this->release_ == 1)
+    {
+      CORBA::ServiceDetail *tmp =
+        ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_);
+      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
+    }
+  
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+#endif /* end #if !defined */
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ServiceDetail &_tao_aggregate
+  )
+{
+  if (
+    (strm << _tao_aggregate.service_detail_type) &&
+    (strm << _tao_aggregate.service_detail)
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ServiceDetail &_tao_aggregate
+  )
+{
+  if (
+    (strm >> _tao_aggregate.service_detail_type) &&
+    (strm >> _tao_aggregate.service_detail)
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_I_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_I_
+
+CORBA::Boolean TAO_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ServiceInformation::_tao_seq_ServiceOption &
+  );
+
+CORBA::Boolean TAO_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ServiceInformation::_tao_seq_ServiceOption &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_
+#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_
+
+CORBA::Boolean TAO_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA::ServiceInformation::_tao_seq_ServiceDetail &
+  );
+
+CORBA::Boolean TAO_Export operator>> (
+    TAO_InputCDR &,
+    CORBA::ServiceInformation::_tao_seq_ServiceDetail &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103
+
+ACE_INLINE
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ServiceInformation &_tao_aggregate
+  )
+{
+  if (
+    (strm << _tao_aggregate.service_options) &&
+    (strm << _tao_aggregate.service_details)
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+ACE_INLINE
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ServiceInformation &_tao_aggregate
+  )
+{
+  if (
+    (strm >> _tao_aggregate.service_options) &&
+    (strm >> _tao_aggregate.service_details)
+   )
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl
index d3cabd03271..bdcc17cda09 100644
--- a/TAO/tao/StringSeq.pidl
+++ b/TAO/tao/StringSeq.pidl
@@ -4,7 +4,7 @@
 
 // ================================================================
 //
-//   This file was used to generate the code in PortableInterceptorC.*
+//   This file was used to generate the code in StringSeqC.*
 //   The command used to generate code is:
 //
 //     tao_idl
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 136bc24a8e6..cab6db6dde2 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -639,7 +639,7 @@ SOURCE=.\Object_Ref_Table.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.cpp

+SOURCE=.\ObjectIdListC.cpp

 # End Source File

 # Begin Source File

 

@@ -803,11 +803,11 @@ SOURCE=.\Service_Context.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.cpp

+SOURCE=.\Services_Activate.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Services_Activate.cpp

+SOURCE=.\ServicesC.cpp

 # End Source File

 # Begin Source File

 

@@ -1475,7 +1475,7 @@ SOURCE=.\objectid.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.h

+SOURCE=.\ObjectIdListC.h

 # End Source File

 # Begin Source File

 

@@ -1651,11 +1651,11 @@ SOURCE=.\Service_Context.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.h

+SOURCE=.\Services_Activate.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Services_Activate.h

+SOURCE=.\ServicesC.h

 # End Source File

 # Begin Source File

 

@@ -2167,7 +2167,7 @@ SOURCE=.\Object_Loader.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.i

+SOURCE=.\ObjectIdListC.i

 # End Source File

 # Begin Source File

 

@@ -2275,7 +2275,7 @@ SOURCE=.\Service_Context.inl
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.i

+SOURCE=.\ServicesC.i

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index a01052131ad..9f31546d452 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -187,7 +187,7 @@ public:
   // void requesting_principal (CORBA_Principal_ptr principal);
 
   /// Set the requesting principal
-  void requesting_principal (const CORBA_OctetSeq & principal);
+  void requesting_principal (const CORBA::OctetSeq & principal);
 
   /// Return the reference to the tagged profile
   TAO_Tagged_Profile &profile (void);
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index 0e726865648..bcbedce4871 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -34,7 +34,6 @@
 #include "tao/CurrentC.h"
 #include "tao/DomainC.h"
 #include "tao/WrongTransactionC.h"
-#include "tao/Services.h"
 #include "tao/NVList.h"
 #include "tao/BoundsC.h"
 
@@ -180,28 +179,6 @@ TAO_NAMESPACE_END
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-// Service definitions
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceType, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceOption, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceDetailType, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceDetail, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceInformation, 0)
-TAO_NAMESPACE_END
-
 // Internal to TAO ORB
 CORBA::TypeCode_ptr TC_opaque = 0;
 CORBA::TypeCode_ptr TC_completion_status = 0;
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index c5bfe1743be..cd29bf0e6ac 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -54,7 +54,7 @@
 #include "tao/ValueFactory.h"
 #include "tao/AbstractBase.h"
 #include "tao/PolicyC.h"
-#include "tao/Services.h"
+#include "tao/ServicesC.h"
 #include "tao/DomainC.h"
 #include "tao/WrongTransactionC.h"
 
@@ -65,7 +65,7 @@
 #include "tao/Sequence.h"
 #include "tao/Managed_Types.h"
 #include "tao/Object_KeyC.h"
-#include "tao/ObjectIDList.h"
+#include "tao/ObjectIDListC.h"
 
 #include "tao/Remote_Object_Proxy_Impl.h"
 
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
index 9bf1d21ddf7..9b18fb97c5b 100644
--- a/TAO/tao/corbafwd.cpp
+++ b/TAO/tao/corbafwd.cpp
@@ -61,15 +61,6 @@ CORBA::wstring_dup (const WChar *const str)
                         str);
 }
 
-// ****************************************************************
-
-TAO_NAMESPACE_TYPE (const CORBA::ServiceType)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ServiceType, Security, 1)
-TAO_NAMESPACE_END
-
-// ****************************************************************
-
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (CORBA)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Visibility, 0)
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index f1499ac4819..b81c44aa410 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -216,17 +216,6 @@ class CORBA_Environment_var;
 class CORBA_Environment_out;
 typedef class CORBA_Environment *CORBA_Environment_ptr;
 
-// = Service Forward declaration
-struct CORBA_ServiceDetail;
-class CORBA_ServiceDetail_var;
-class CORBA_ServiceDetail_out;
-typedef CORBA_ServiceDetail * CORBA_ServiceDetail_ptr;
-
-struct CORBA_ServiceInformation;
-class CORBA_ServiceInformation_var;
-class CORBA_ServiceInformation_out;
-typedef CORBA_ServiceInformation * CORBA_ServiceInformation_ptr;
-
 class CORBA_Principal;
 class CORBA_Principal_var;
 class CORBA_Principal_out;
@@ -658,38 +647,6 @@ TAO_NAMESPACE CORBA
   typedef CORBA::String_out ORBid_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ORBid;
 
-  // = Service definitions
-  typedef CORBA::UShort ServiceType;
-  typedef ServiceType CORBA_ServiceType;
-  typedef CORBA::UShort_out ServiceType_out;
-  typedef ServiceType_out CORBA_ServiceType_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceType;
-  TAO_NAMESPACE_STORAGE_CLASS const ServiceType Security;
-
-  typedef CORBA::ULong ServiceOption;
-  typedef ServiceOption CORBA_ServiceOption;
-  typedef CORBA::ULong_out ServiceOption_out;
-  typedef ServiceOption_out CORBA_ServiceOption_out;
-  TAO_NAMESPACE_STORAGE_CLASS  CORBA::TypeCode_ptr _tc_ServiceOption;
-
-  typedef CORBA::ULong ServiceDetailType;
-  typedef ServiceDetailType CORBA_ServiceDetailType;
-  typedef CORBA::ULong_out ServiceDetailType_out;
-  typedef ServiceDetailType_out CORBA_ServiceDetailType_out;
-  TAO_NAMESPACE_STORAGE_CLASS  CORBA::TypeCode_ptr _tc_ServiceDetailType;
-
-  typedef CORBA_ServiceDetail ServiceDetail;
-  typedef CORBA_ServiceDetail_var ServiceDetail_var;
-  typedef CORBA_ServiceDetail_out ServiceDetail_out;
-  typedef CORBA_ServiceDetail *ServiceDetail_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceDetail;
-
-  typedef CORBA_ServiceInformation ServiceInformation;
-  typedef CORBA_ServiceInformation_var ServiceInformation_var;
-  typedef CORBA_ServiceInformation_out ServiceInformation_out;
-  typedef CORBA_ServiceInformation *ServiceInformation_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceInformation;
-
   // =================== Valuetypes =====================
 
   typedef CORBA::Short Visibility;
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index cda9339e394..5f6f56d77dd 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -8,6 +8,7 @@
 #define TAO_ORB_IDL
 
 #include <Policy.pidl>
+#include <Services.pidl>
 
 #pragma prefix "omg.org"
 
@@ -93,22 +94,6 @@ module CORBA
   typedef string ObjectId;
   typedef sequence <ObjectId> ObjectIdList;
 
-  typedef unsigned short ServiceType;
-  typedef unsigned long ServiceOption;
-  typedef unsigned long ServiceDetailType;
-
-  struct ServiceDetail
-  {
-    ServiceDetailType service_detail_type;
-    sequence <octet> service_detail;
-  };
-
-  struct ServiceInformation
-  {
-    sequence <ServiceOption> service_options;
-    sequence <ServiceDetail> service_details;
-  };
-
   // Portable Interceptor specification adds these types.
   typedef sequence<string> StringSeq;
   typedef sequence<wstring> WStringSeq;