*** empty log message ***

3 files changed, 334 insertions, 0 deletions

diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index ffe7a01d65d..0f2f1ec492f 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -36,6 +36,7 @@
 #include "tao/InconsistentTypeCodeC.h"
 #include "tao/DomainC.h"
 #include "tao/WrongTransactionC.h"
+#include "tao/Services.h"
 #include "tao/NVList.h"
 #if defined(TAO_POLLER)
 #include "tao/PollableC.h"
@@ -116,6 +117,13 @@ CORBA::TypeCode_ptr CORBA::_tc_PollableSet = 0;
 CORBA::TypeCode_ptr CORBA::_tc_Pollable = 0;
 CORBA::TypeCode_ptr CORBA::_tc_DIIPollable = 0;
 
+// Service definitions
+CORBA::TypeCode_ptr CORBA::_tc_ServiceType = 0;
+CORBA::TypeCode_ptr CORBA::_tc_ServiceOption = 0;
+CORBA::TypeCode_ptr CORBA::_tc_ServiceDetailType = 0;
+CORBA::TypeCode_ptr CORBA::_tc_ServiceDetail = 0;
+CORBA::TypeCode_ptr CORBA::_tc_ServiceInformation = 0;
+
 // Internal to TAO ORB
 CORBA::TypeCode_ptr TC_opaque = 0;
 CORBA::TypeCode_ptr TC_ServiceContextList = 0;
@@ -504,6 +512,281 @@ TAO_TypeCodes::init (void)
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
+ // Service Types
+  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,
+  };
+
+  CORBA::_tc_ServiceOption =
+    new CORBA::TypeCode (CORBA::tk_alias,
+                         sizeof (_oc_CORBA_ServiceOption),
+                         (char *) &_oc_CORBA_ServiceOption,
+                         0,
+                         sizeof (CORBA::ServiceOption));
+
+  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,
+  };
+
+ CORBA::_tc_ServiceDetailType =
+   new CORBA::TypeCode (CORBA::tk_alias,
+                        sizeof (_oc_CORBA_ServiceDetailType),
+                        (char *) &_oc_CORBA_ServiceDetailType,
+                        0,
+                        sizeof (CORBA::ServiceDetailType));
+
+  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,
+  };
+
+ CORBA::_tc_ServiceType =
+   new CORBA::TypeCode (CORBA::tk_alias,
+                        sizeof (_oc_CORBA_ServiceType),
+                        (char *) &_oc_CORBA_ServiceType,
+                        0,
+                        sizeof (CORBA::ServiceType));
+
+  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_sequence, // typecode kind
+    12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_octet,
+    0,
+  };
+
+  CORBA::_tc_ServiceDetail =
+    new CORBA::TypeCode (CORBA::tk_struct,
+                         sizeof (_oc_CORBA_ServiceDetail),
+                         (char *) &_oc_CORBA_ServiceDetail,
+                         0,
+                         sizeof (CORBA::ServiceDetail));
+
+
+  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,
+    0,
+    16,
+    ACE_NTOHL (0x73657276),
+    ACE_NTOHL (0x6963655f),
+    ACE_NTOHL (0x64657461),
+    ACE_NTOHL (0x696c7300),  // name = service_details
+    CORBA::tk_sequence, // typecode kind
+    232, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    216, // encapsulation length
+    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_sequence, // typecode kind
+    12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_octet,
+    0,
+    0,
+  };
+
+ CORBA::_tc_ServiceInformation =
+    new CORBA::TypeCode (CORBA::tk_struct,
+                         sizeof (_oc_CORBA_ServiceInformation),
+                         (char *) &_oc_CORBA_ServiceInformation,
+                         0,
+                         sizeof (CORBA::ServiceInformation)); 
+
   // ****************************************************************
 
   static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
@@ -1270,6 +1553,14 @@ TAO_TypeCodes::fini (void)
 
   CORBA::release (CORBA::_tc_DomainManagerList);
 
+  // Service types
+   //= Service type
+   CORBA::release (CORBA::_tc_ServiceType);
+   CORBA::release (CORBA::_tc_ServiceOption);
+   CORBA::release (CORBA::_tc_ServiceDetailType);
+   CORBA::release (CORBA::_tc_ServiceDetail);
+   CORBA::release (CORBA::_tc_ServiceInformation);
+
   // TAO specific
   CORBA::release (TC_opaque);
 
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 171c423e4c8..e75e7d6ccbb 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -79,6 +79,7 @@
 #include "tao/Union.h"
 #include "tao/ValueBase.h"
 #include "tao/ValueFactory.h"
+#include "tao/Services.h"
 
 #if !defined (ACE_NESTED_CLASS)
 #if defined (ACE_WIN32)
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index b9ac8a5363b..e108c13ea22 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -212,6 +212,17 @@ class CORBA_Environment_var;
 class CORBA_Environment_out;
 typedef class CORBA_Environment *CORBA_Environment_ptr;
 
+// = Service Forward declaration
+struct CORBA_ServiceDetail;
+struct CORBA_ServiceDetail_var;
+struct CORBA_ServiceDetail_out;
+typedef CORBA_ServiceDetail * CORBA_ServiceDetail_ptr;
+
+struct CORBA_ServiceInformation;
+struct CORBA_ServiceInformation_var;
+struct CORBA_ServiceInformation_out;
+typedef CORBA_ServiceInformation * CORBA_ServiceInformation_ptr;
+
 class CORBA_Principal;
 typedef class CORBA_Principal *CORBA_Principal_ptr;
 
@@ -695,6 +706,37 @@ TAO_SYSTEM_EXCEPTION_LIST
   typedef CORBA_PolicyList_out PolicyList_out;
   static CORBA::TypeCode_ptr _tc_PolicyList;
 
+  // = Service definitions
+  typedef CORBA::UShort ServiceType;
+  typedef ServiceType CORBA_ServiceType;
+  typedef CORBA::UShort_out ServiceType_out;
+  typedef ServiceType_out CORBA_ServiceType_out;
+  static CORBA::TypeCode_ptr _tc_ServiceType;
+
+  typedef CORBA::ULong ServiceOption;
+  typedef ServiceOption CORBA_ServiceOption;
+  typedef CORBA::ULong_out ServiceOption_out;
+  typedef ServiceOption_out CORBA_ServiceOption_out;
+  static  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;
+  static  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;
+  static 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;
+  static CORBA::TypeCode_ptr _tc_ServiceInformation;
+
   typedef CORBA_PolicyTypeSeq PolicyTypeSeq;
   typedef CORBA_PolicyTypeSeq_var PolicyTypeSeq_var;
   typedef CORBA_PolicyTypeSeq_out PolicyTypeSeq_out;