ChangeLogTag:Fri Jun 01 23:15:05 2001 Ossama Othman <ossama@uci.edu>

4 files changed, 881 insertions, 878 deletions

diff --git a/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff
index 346c1cba939..11b9b1fc5b5 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff
@@ -1,395 +1,402 @@
---- orig/IFR_Base.pidl	Mon Apr 23 20:19:25 2001
-+++ IFR_Base.pidl	Thu Apr 19 00:40:20 2001
-@@ -66,12 +66,14 @@
+--- IFR_Base.pidl.old	Fri Jun  1 22:22:17 2001
++++ IFR_Base.pidl	Fri Jun  1 22:17:44 2001
+@@ -66,14 +66,12 @@
  #ifndef _IFR_BASE_IDL_
  #define _IFR_BASE_IDL_
  
--#include <orb.idl>
--
++#include <orb.idl>
++
  #pragma prefix "omg.org"
  
- module CORBA
+ module CORBA 
  {
-+  typedef string Identifier;
-+  typedef string ScopedName;
-+  typedef string RepositoryId;
-+
+-  typedef string Identifier;
+-  typedef string ScopedName;
+-  typedef string RepositoryId;
+-
    enum DefinitionKind 
    {
      dk_none, 
-@@ -101,34 +103,36 @@
+@@ -103,36 +101,34 @@
      dk_AbstractInterface,
      dk_LocalInterface
    };
--};
++};
  
--  interface CORBA_IRObject 
-+  interface IRObject 
+-  interface IRObject 
++  interface CORBA_IRObject 
    {
      // read interface
--    readonly attribute CORBA::DefinitionKind def_kind;
-+    readonly attribute DefinitionKind def_kind;
+-    readonly attribute DefinitionKind def_kind;
++    readonly attribute CORBA::DefinitionKind def_kind;
      // write interface
      void destroy ();
    };
  
--  interface CORBA_Repository;
--  interface CORBA_Container;
-+  typedef string VersionSpec;
+-  typedef string VersionSpec;
++  interface CORBA_Repository;
++  interface CORBA_Container;
  
--  interface CORBA_Contained : CORBA_IRObject 
-+  interface Contained;
-+  interface Repository;
-+  interface Container;
-+
-+  interface Contained : IRObject 
+-  interface Contained;
+-  interface Repository;
+-  interface Container;
+-
+-  interface Contained : IRObject 
++  interface CORBA_Contained : CORBA_IRObject 
    {
      // read/write interface
--    attribute string id;
--    attribute string name;
--    attribute string version;
-+    attribute RepositoryId id;
-+    attribute Identifier name;
-+    attribute VersionSpec version;
+-    attribute RepositoryId id;
+-    attribute Identifier name;
+-    attribute VersionSpec version;
++    attribute string id;
++    attribute string name;
++    attribute string version;
  
      // read interface
--    readonly attribute CORBA_Container defined_in;
--    readonly attribute string absolute_name;
--    readonly attribute CORBA_Repository containing_repository;
-+    readonly attribute Container defined_in;
-+    readonly attribute ScopedName absolute_name;
-+    readonly attribute Repository containing_repository;
+-    readonly attribute Container defined_in;
+-    readonly attribute ScopedName absolute_name;
+-    readonly attribute Repository containing_repository;
++    readonly attribute CORBA_Container defined_in;
++    readonly attribute string absolute_name;
++    readonly attribute CORBA_Repository containing_repository;
      
      struct Description 
      {
--      CORBA::DefinitionKind kind;
-+      DefinitionKind kind;
+-      DefinitionKind kind;
++      CORBA::DefinitionKind kind;
        any value;
      };
  
-@@ -136,194 +140,195 @@
+@@ -140,196 +136,196 @@
  
      // write interface
      void move (
--        in CORBA_Container new_container,
--        in string new_name,
--        in string new_version
-+        in Container new_container,
-+        in Identifier new_name,
-+        in VersionSpec new_version
+-        in Container new_container,
+-        in Identifier new_name,
+-        in VersionSpec new_version
++        in CORBA_Container new_container,
++        in string new_name,
++        in string new_version
        );
    };
  
--  typedef sequence <CORBA_Contained> CORBA_ContainedSeq;
-+  typedef sequence <Contained> ContainedSeq;
+-  typedef sequence <Contained> ContainedSeq;
++  typedef sequence <CORBA_Contained> CORBA_ContainedSeq;
  
--  interface CORBA_ModuleDef;
--  interface CORBA_ConstantDef;
--  interface CORBA_IDLType;
--  interface CORBA_StructDef;
--  interface CORBA_UnionDef;
--  interface CORBA_EnumDef;
--  interface CORBA_AliasDef;
--  interface CORBA_InterfaceDef;
--  typedef sequence<CORBA_InterfaceDef> CORBA_InterfaceDefSeq;
--  interface CORBA_ExceptionDef;
--  interface CORBA_NativeDef;
--  interface CORBA_ValueDef;
--  typedef sequence<CORBA_ValueDef> CORBA_ValueDefSeq;
--  interface CORBA_ValueBoxDef;
--  interface CORBA_AbstractInterfaceDef;
--  typedef sequence<CORBA_AbstractInterfaceDef> CORBA_AbstractInterfaceDefSeq;
--  interface CORBA_LocalInterfaceDef;
--  typedef sequence<CORBA_LocalInterfaceDef> CORBA_LocalInterfaceDefSeq;
-+  interface ModuleDef;
-+  interface ConstantDef;
-+  interface IDLType;
-+  interface StructDef;
-+  interface UnionDef;
-+  interface EnumDef;
-+  interface AliasDef;
-+  interface InterfaceDef;
-+  typedef sequence<InterfaceDef> InterfaceDefSeq;
-+  interface ExceptionDef;
-+  interface NativeDef;
-+  interface ValueDef;
-+  typedef sequence<ValueDef> ValueDefSeq;
-+  interface ValueBoxDef;
-+  interface AbstractInterfaceDef;
-+  typedef sequence<AbstractInterfaceDef> AbstractInterfaceDefSeq;
-+  interface LocalInterfaceDef;
-+  typedef sequence<LocalInterfaceDef> LocalInterfaceDefSeq;
+-  interface ModuleDef;
+-  interface ConstantDef;
+-  interface IDLType;
+-  interface StructDef;
+-  interface UnionDef;
+-  interface EnumDef;
+-  interface AliasDef;
+-  interface InterfaceDef;
+-  typedef sequence<InterfaceDef> InterfaceDefSeq;
+-  interface ExceptionDef;
+-  interface NativeDef;
+-  interface ValueDef;
+-  typedef sequence<ValueDef> ValueDefSeq;
+-  interface ValueBoxDef;
+-  interface AbstractInterfaceDef;
+-  typedef sequence<AbstractInterfaceDef> AbstractInterfaceDefSeq;
+-  interface LocalInterfaceDef;
+-  typedef sequence<LocalInterfaceDef> LocalInterfaceDefSeq;
++  interface CORBA_ModuleDef;
++  interface CORBA_ConstantDef;
++  interface CORBA_IDLType;
++  interface CORBA_StructDef;
++  interface CORBA_UnionDef;
++  interface CORBA_EnumDef;
++  interface CORBA_AliasDef;
++  interface CORBA_InterfaceDef;
++  typedef sequence<CORBA_InterfaceDef> CORBA_InterfaceDefSeq;
++  interface CORBA_ExceptionDef;
++  interface CORBA_NativeDef;
++  interface CORBA_ValueDef;
++  typedef sequence<CORBA_ValueDef> CORBA_ValueDefSeq;
++  interface CORBA_ValueBoxDef;
++  interface CORBA_AbstractInterfaceDef;
++  typedef sequence<CORBA_AbstractInterfaceDef> CORBA_AbstractInterfaceDefSeq;
++  interface CORBA_LocalInterfaceDef;
++  typedef sequence<CORBA_LocalInterfaceDef> CORBA_LocalInterfaceDefSeq;
  
--  struct CORBA_StructMember 
-+  struct StructMember 
+-  struct StructMember 
++  struct CORBA_StructMember 
    {
--    string name;
--    CORBA::TypeCode type;
--    CORBA_IDLType type_def;
-+    Identifier name;
-+    TypeCode type;
-+    IDLType type_def;
+-    Identifier name;
+-    TypeCode type;
+-    IDLType type_def;
++    string name;
++    CORBA::TypeCode type;
++    CORBA_IDLType type_def;
    };
  
--  typedef sequence <CORBA_StructMember> CORBA_StructMemberSeq;
-+  typedef sequence <StructMember> StructMemberSeq;
+-  typedef sequence <StructMember> StructMemberSeq;
++  typedef sequence <CORBA_StructMember> CORBA_StructMemberSeq;
  
--  struct CORBA_Initializer 
-+  struct Initializer 
+-  struct Initializer 
++  struct CORBA_Initializer 
    {
--    CORBA_StructMemberSeq members;
--    string name;
-+    StructMemberSeq members;
-+    Identifier name;
+-    StructMemberSeq members;
+-    Identifier name;
++    CORBA_StructMemberSeq members;
++    string name;
    };
  
--  typedef sequence <CORBA_Initializer> CORBA_InitializerSeq;
-+  typedef sequence <Initializer> InitializerSeq;
+-  typedef sequence <Initializer> InitializerSeq;
++  typedef sequence <CORBA_Initializer> CORBA_InitializerSeq;
  
--  struct CORBA_UnionMember 
-+  struct UnionMember 
+-  struct UnionMember 
++  struct CORBA_UnionMember 
    {
--    string name;
-+    Identifier name;
+-    Identifier name;
++    string name;
      any label;
--    CORBA::TypeCode type;
--    CORBA_IDLType type_def;
-+    TypeCode type;
-+    IDLType type_def;
+-    TypeCode type;
+-    IDLType type_def;
++    CORBA::TypeCode type;
++    CORBA_IDLType type_def;
    };
  
--  typedef sequence <CORBA_UnionMember> CORBA_UnionMemberSeq;
--  typedef sequence <string> CORBA_EnumMemberSeq;
-+  typedef sequence <UnionMember> UnionMemberSeq;
-+  typedef sequence <Identifier> EnumMemberSeq;
+-  typedef sequence <UnionMember> UnionMemberSeq;
+-  typedef sequence <Identifier> EnumMemberSeq;
++  typedef sequence <CORBA_UnionMember> CORBA_UnionMemberSeq;
++  typedef sequence <string> CORBA_EnumMemberSeq;
  
--  interface CORBA_Container : CORBA_IRObject 
-+  interface Container : IRObject 
+-  interface Container : IRObject 
++  interface CORBA_Container : CORBA_IRObject 
    {
      // read interface
--    CORBA_Contained lookup (
--        in string search_name
-+    Contained lookup (
-+        in ScopedName search_name
+-    Contained lookup (
+-        in ScopedName search_name
++    CORBA_Contained lookup (
++        in string search_name
        );
--    CORBA_ContainedSeq contents (
--        in CORBA::DefinitionKind limit_type,
-+    ContainedSeq contents (
-+        in DefinitionKind limit_type,
+-    ContainedSeq contents (
+-        in DefinitionKind limit_type,
++    CORBA_ContainedSeq contents (
++        in CORBA::DefinitionKind limit_type,
          in boolean exclude_inherited
        );
--    CORBA_ContainedSeq lookup_name (
--        in string search_name,
-+    ContainedSeq lookup_name (
-+        in Identifier search_name,
+-    ContainedSeq lookup_name (
+-        in Identifier search_name,
++    CORBA_ContainedSeq lookup_name (
++        in string search_name,
          in long levels_to_search,
--        in CORBA::DefinitionKind limit_type,
-+        in DefinitionKind limit_type,
+-        in DefinitionKind limit_type,
++        in CORBA::DefinitionKind limit_type,
          in boolean exclude_inherited
        );
      struct Description 
      {
--      CORBA_Contained contained_object;
--      CORBA::DefinitionKind kind;
-+      Contained contained_object;
-+      DefinitionKind kind;
+-      Contained contained_object;
+-      DefinitionKind kind;
++      CORBA_Contained contained_object;
++      CORBA::DefinitionKind kind;
        any value;
      };
  
      typedef sequence<Description> DescriptionSeq;
  
      DescriptionSeq describe_contents (
--        in CORBA::DefinitionKind limit_type,
-+        in DefinitionKind limit_type,
+-        in DefinitionKind limit_type,
++        in CORBA::DefinitionKind limit_type,
          in boolean exclude_inherited,
          in long max_returned_objs
        );
      // write interface
--    CORBA_ModuleDef create_module (
--        in string id,
--        in string name,
--        in string version
+-    ModuleDef create_module (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version
 -      );
--    CORBA_ConstantDef create_constant (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType type,
-+    ModuleDef create_module (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version
+-    ConstantDef create_constant (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType type,
++    CORBA_ModuleDef create_module (
++        in string id,
++        in string name,
++        in string version
 +      );
-+    ConstantDef create_constant (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType type,
++    CORBA_ConstantDef create_constant (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType type,
          in any value
        );
--    CORBA_StructDef create_struct (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_StructMemberSeq members
+-    StructDef create_struct (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in StructMemberSeq members
 -      );
--    CORBA_UnionDef create_union (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType discriminator_type,
--        in CORBA_UnionMemberSeq members
+-    UnionDef create_union (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType discriminator_type,
+-        in UnionMemberSeq members
 -      );
--    CORBA_EnumDef create_enum (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_EnumMemberSeq members
+-    EnumDef create_enum (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in EnumMemberSeq members
 -      );
--    CORBA_AliasDef create_alias (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType original_type
+-    AliasDef create_alias (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType original_type
 -      );
--    CORBA_InterfaceDef create_interface (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_InterfaceDefSeq base_interfaces
+-    InterfaceDef create_interface (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in InterfaceDefSeq base_interfaces
 -      );
--    CORBA_ValueDef create_value(
--        in string id,
--        in string name,
--        in string version,
-+    StructDef create_struct (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in StructMemberSeq members
+-    ValueDef create_value(
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
++    CORBA_StructDef create_struct (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_StructMemberSeq members
 +      );
-+    UnionDef create_union (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType discriminator_type,
-+        in UnionMemberSeq members
++    CORBA_UnionDef create_union (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType discriminator_type,
++        in CORBA_UnionMemberSeq members
 +      );
-+    EnumDef create_enum (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in EnumMemberSeq members
++    CORBA_EnumDef create_enum (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_EnumMemberSeq members
 +      );
-+    AliasDef create_alias (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType original_type
++    CORBA_AliasDef create_alias (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType original_type
 +      );
-+    InterfaceDef create_interface (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in InterfaceDefSeq base_interfaces
++    CORBA_InterfaceDef create_interface (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_InterfaceDefSeq base_interfaces
 +      );
-+    ValueDef create_value(
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
++    CORBA_ValueDef create_value(
++        in string id,
++        in string name,
++        in string version,
          in boolean is_custom,
          in boolean is_abstract,
--        in CORBA_ValueDef base_value,
-+        in ValueDef base_value,
+-        in ValueDef base_value,
++        in CORBA_ValueDef base_value,
          in boolean is_truncatable,
--        in CORBA_ValueDefSeq abstract_base_values,
--        in CORBA_InterfaceDefSeq supported_interfaces,
--        in CORBA_InitializerSeq initializers
-+        in ValueDefSeq abstract_base_values,
-+        in InterfaceDefSeq supported_interfaces,
-+        in InitializerSeq initializers
-       );
--    CORBA_ValueBoxDef create_value_box(
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType original_type_def
-+    ValueBoxDef create_value_box(
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType original_type_def
-       );
--    CORBA_ExceptionDef create_exception(
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_StructMemberSeq members
-+    ExceptionDef create_exception(
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in StructMemberSeq members
-       );
--    CORBA_NativeDef create_native(
--        in string id,
--        in string name,
--        in string version
-+    NativeDef create_native(
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version
-       );
--    CORBA_AbstractInterfaceDef create_abstract_interface (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_AbstractInterfaceDefSeq base_interfaces
-+    AbstractInterfaceDef create_abstract_interface (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in AbstractInterfaceDefSeq base_interfaces
-       );
--    CORBA_LocalInterfaceDef create_local_interface (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_InterfaceDefSeq base_interfaces
-+    LocalInterfaceDef create_local_interface (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in InterfaceDefSeq base_interfaces
+-        in ValueDefSeq abstract_base_values,
+-        in InterfaceDefSeq supported_interfaces,
+-        in InitializerSeq initializers
+-      );
+-    ValueBoxDef create_value_box(
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType original_type_def
+-      );
+-    ExceptionDef create_exception(
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in StructMemberSeq members
+-      );
+-    NativeDef create_native(
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version
+-      );
+-    AbstractInterfaceDef create_abstract_interface (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in AbstractInterfaceDefSeq base_interfaces
+-      );
+-    LocalInterfaceDef create_local_interface (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in InterfaceDefSeq base_interfaces
++        in CORBA_ValueDefSeq abstract_base_values,
++        in CORBA_InterfaceDefSeq supported_interfaces,
++        in CORBA_InitializerSeq initializers
++      );
++    CORBA_ValueBoxDef create_value_box(
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType original_type_def
++      );
++    CORBA_ExceptionDef create_exception(
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_StructMemberSeq members
++      );
++    CORBA_NativeDef create_native(
++        in string id,
++        in string name,
++        in string version
++      );
++    CORBA_AbstractInterfaceDef create_abstract_interface (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_AbstractInterfaceDefSeq base_interfaces
++      );
++    CORBA_LocalInterfaceDef create_local_interface (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_InterfaceDefSeq base_interfaces
        );
    };
  
--  interface CORBA_IDLType : CORBA_IRObject 
-+  interface IDLType : IRObject 
+-  interface IDLType : IRObject 
++  interface CORBA_IDLType : CORBA_IRObject 
    {
--    readonly attribute CORBA::TypeCode type;
-+    readonly attribute TypeCode type;
+-    readonly attribute TypeCode type;
++    readonly attribute CORBA::TypeCode type;
    };
  
--  interface CORBA_TypedefDef : CORBA_Contained, CORBA_IDLType 
-+  interface TypedefDef : Contained, IDLType 
+-  interface TypedefDef : Contained, IDLType 
++  interface CORBA_TypedefDef : CORBA_Contained, CORBA_IDLType 
    {
    };
  
--  struct CORBA_TypeDescription 
-+  struct TypeDescription 
+-  struct TypeDescription 
++  struct CORBA_TypeDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode type;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode type;
-+  };
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode type;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode type;
    };
+-};
++
  
  #pragma prefix ""
+ 
diff --git a/TAO/tao/IFR_Client/diffs/IFR_Basic.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Basic.pidl.diff
index e230cf75219..576834ebd4d 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_Basic.pidl.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_Basic.pidl.diff
@@ -1,453 +1,448 @@
---- orig/IFR_Basic.pidl	Mon Apr 23 20:54:29 2001
-+++ IFR_Basic.pidl	Thu Apr 19 15:41:50 2001
-@@ -71,6 +71,13 @@
+--- IFR_Basic.pidl.old	Fri Jun  1 22:48:20 2001
++++ IFR_Basic.pidl	Fri Jun  1 22:43:58 2001
+@@ -71,13 +71,6 @@
  
- module CORBA
+ module CORBA 
  {
-+  interface PrimitiveDef;
-+  interface StringDef;
-+  interface SequenceDef;
-+  interface ArrayDef;
-+  interface WstringDef;
-+  interface FixedDef;
-+
+-  interface PrimitiveDef;
+-  interface StringDef;
+-  interface SequenceDef;
+-  interface ArrayDef;
+-  interface WstringDef;
+-  interface FixedDef;
+-
    enum PrimitiveKind 
    {
      pk_null, 
-@@ -97,282 +104,276 @@
+@@ -104,276 +97,277 @@
      pk_value_base
    };
  
--  enum AttributeMode 
--  {
--    ATTR_NORMAL, 
--    ATTR_READONLY
--  };
--
--  enum OperationMode 
--  {
--    OP_NORMAL, 
--    OP_ONEWAY
--  };
--
--  enum ParameterMode 
--  {
--    PARAM_IN, 
--    PARAM_OUT, 
--    PARAM_INOUT
--  };
--};
--
--  interface CORBA_PrimitiveDef;
--  interface CORBA_StringDef;
--  interface CORBA_SequenceDef;
--  interface CORBA_ArrayDef;
--  interface CORBA_WstringDef;
--  interface CORBA_FixedDef;
--
--  interface CORBA_Repository : CORBA_Container 
-+  interface Repository : Container 
+-  interface Repository : Container 
++  enum AttributeMode 
++  {
++    ATTR_NORMAL, 
++    ATTR_READONLY
++  };
++
++  enum OperationMode 
++  {
++    OP_NORMAL, 
++    OP_ONEWAY
++  };
++};
++
++  interface CORBA_PrimitiveDef;
++  interface CORBA_StringDef;
++  interface CORBA_SequenceDef;
++  interface CORBA_ArrayDef;
++  interface CORBA_WstringDef;
++  interface CORBA_FixedDef;
++
++  interface CORBA_Repository : CORBA_Container 
    {
      // read interface
--    CORBA_Contained lookup_id (
--        in string search_id
-+    Contained lookup_id (
-+        in RepositoryId search_id
+-    Contained lookup_id (
+-        in RepositoryId search_id
++    CORBA_Contained lookup_id (
++        in string search_id
        );
--    CORBA::TypeCode get_canonical_typecode (
--        in CORBA::TypeCode tc
-+    TypeCode get_canonical_typecode (
-+        in TypeCode tc
+-    TypeCode get_canonical_typecode (
+-        in TypeCode tc
++    CORBA::TypeCode get_canonical_typecode (
++        in CORBA::TypeCode tc
        );
--    CORBA_PrimitiveDef get_primitive (
--        in CORBA::PrimitiveKind kind
-+    PrimitiveDef get_primitive (
-+        in PrimitiveKind kind
+-    PrimitiveDef get_primitive (
+-        in PrimitiveKind kind
++    CORBA_PrimitiveDef get_primitive (
++        in CORBA::PrimitiveKind kind
        );
      // write interface
--    CORBA_StringDef create_string (
-+    StringDef create_string (
+-    StringDef create_string (
++    CORBA_StringDef create_string (
          in unsigned long bound
        );
--    CORBA_WstringDef create_wstring (
-+    WstringDef create_wstring (
+-    WstringDef create_wstring (
++    CORBA_WstringDef create_wstring (
          in unsigned long bound
        );
--    CORBA_SequenceDef create_sequence (
-+    SequenceDef create_sequence (
+-    SequenceDef create_sequence (
++    CORBA_SequenceDef create_sequence (
          in unsigned long bound,
--        in CORBA_IDLType element_type
-+        in IDLType element_type
+-        in IDLType element_type
++        in CORBA_IDLType element_type
        );
--    CORBA_ArrayDef create_array (
-+    ArrayDef create_array (
+-    ArrayDef create_array (
++    CORBA_ArrayDef create_array (
          in unsigned long length,
--        in CORBA_IDLType element_type
-+        in IDLType element_type
+-        in IDLType element_type
++        in CORBA_IDLType element_type
        );
--    CORBA_FixedDef create_fixed (
-+    FixedDef create_fixed (
+-    FixedDef create_fixed (
++    CORBA_FixedDef create_fixed (
          in unsigned short digits,
          in short scale
        );
    };
  
--  interface CORBA_ModuleDef : CORBA_Container, CORBA_Contained 
-+  interface ModuleDef : Container, Contained 
+-  interface ModuleDef : Container, Contained 
++  interface CORBA_ModuleDef : CORBA_Container, CORBA_Contained 
    {
    };
  
--  struct CORBA_ModuleDescription 
-+  struct ModuleDescription 
+-  struct ModuleDescription 
++  struct CORBA_ModuleDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
++    string name;
++    string id;
++    string defined_in;
++    string version;
    };
  
--  interface CORBA_ConstantDef : CORBA_Contained 
-+  interface ConstantDef : Contained 
+-  interface ConstantDef : Contained 
++  interface CORBA_ConstantDef : CORBA_Contained 
    {
--    readonly attribute CORBA::TypeCode type;
--    attribute CORBA_IDLType type_def;
-+    readonly attribute TypeCode type;
-+    attribute IDLType type_def;
+-    readonly attribute TypeCode type;
+-    attribute IDLType type_def;
++    readonly attribute CORBA::TypeCode type;
++    attribute CORBA_IDLType type_def;
      attribute any value;
    };
  
--  struct CORBA_ConstantDescription 
-+  struct ConstantDescription 
+-  struct ConstantDescription 
++  struct CORBA_ConstantDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode type;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode type;
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode type;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode type;
      any value;
    };
  
--  interface CORBA_StructDef : CORBA_TypedefDef, CORBA_Container 
-+  interface StructDef : TypedefDef, Container 
+-  interface StructDef : TypedefDef, Container 
++  interface CORBA_StructDef : CORBA_TypedefDef, CORBA_Container 
    {
--    attribute CORBA_StructMemberSeq members;
-+    attribute StructMemberSeq members;
+-    attribute StructMemberSeq members;
++    attribute CORBA_StructMemberSeq members;
    };
  
--  interface CORBA_UnionDef : CORBA_TypedefDef, CORBA_Container 
-+  interface UnionDef : TypedefDef, Container 
+-  interface UnionDef : TypedefDef, Container 
++  interface CORBA_UnionDef : CORBA_TypedefDef, CORBA_Container 
    {
--    readonly attribute CORBA::TypeCode discriminator_type;
--    attribute CORBA_IDLType discriminator_type_def;
--    attribute CORBA_UnionMemberSeq members;
-+    readonly attribute TypeCode discriminator_type;
-+    attribute IDLType discriminator_type_def;
-+    attribute UnionMemberSeq members;
+-    readonly attribute TypeCode discriminator_type;
+-    attribute IDLType discriminator_type_def;
+-    attribute UnionMemberSeq members;
++    readonly attribute CORBA::TypeCode discriminator_type;
++    attribute CORBA_IDLType discriminator_type_def;
++    attribute CORBA_UnionMemberSeq members;
    };
  
--  interface CORBA_EnumDef : CORBA_TypedefDef 
-+  interface EnumDef : TypedefDef 
+-  interface EnumDef : TypedefDef 
++  interface CORBA_EnumDef : CORBA_TypedefDef 
    {
--    attribute CORBA_EnumMemberSeq members;
-+    attribute EnumMemberSeq members;
+-    attribute EnumMemberSeq members;
++    attribute CORBA_EnumMemberSeq members;
    };
  
--  interface CORBA_AliasDef : CORBA_TypedefDef 
-+  interface AliasDef : TypedefDef 
+-  interface AliasDef : TypedefDef 
++  interface CORBA_AliasDef : CORBA_TypedefDef 
    {
--    attribute CORBA_IDLType original_type_def;
-+    attribute IDLType original_type_def;
+-    attribute IDLType original_type_def;
++    attribute CORBA_IDLType original_type_def;
    };
  
--  interface CORBA_NativeDef : CORBA_TypedefDef 
-+  interface NativeDef : TypedefDef 
+-  interface NativeDef : TypedefDef 
++  interface CORBA_NativeDef : CORBA_TypedefDef 
    {
    };
  
--  interface CORBA_PrimitiveDef: CORBA_IDLType 
-+  interface PrimitiveDef: IDLType 
+-  interface PrimitiveDef: IDLType 
++  interface CORBA_PrimitiveDef: CORBA_IDLType 
    {
--    readonly attribute CORBA::PrimitiveKind kind;
-+    readonly attribute PrimitiveKind kind;
+-    readonly attribute PrimitiveKind kind;
++    readonly attribute CORBA::PrimitiveKind kind;
    };
  
--  interface CORBA_StringDef : CORBA_IDLType 
-+  interface StringDef : IDLType 
+-  interface StringDef : IDLType 
++  interface CORBA_StringDef : CORBA_IDLType 
    {
      attribute unsigned long bound;
    };
  
--  interface CORBA_WstringDef : CORBA_IDLType 
-+  interface WstringDef : IDLType 
+-  interface WstringDef : IDLType 
++  interface CORBA_WstringDef : CORBA_IDLType 
    {
      attribute unsigned long bound;
    };
  
--  interface CORBA_SequenceDef : CORBA_IDLType 
-+  interface SequenceDef : IDLType 
+-  interface SequenceDef : IDLType 
++  interface CORBA_SequenceDef : CORBA_IDLType 
    {
      attribute unsigned long bound;
--    readonly attribute CORBA::TypeCode element_type;
--    attribute CORBA_IDLType element_type_def;
-+    readonly attribute TypeCode element_type;
-+    attribute IDLType element_type_def;
+-    readonly attribute TypeCode element_type;
+-    attribute IDLType element_type_def;
++    readonly attribute CORBA::TypeCode element_type;
++    attribute CORBA_IDLType element_type_def;
    };
  
--  interface CORBA_ArrayDef : CORBA_IDLType 
-+  interface ArrayDef : IDLType 
+-  interface ArrayDef : IDLType 
++  interface CORBA_ArrayDef : CORBA_IDLType 
    {
-     attribute unsigned long length;
--    readonly attribute CORBA::TypeCode element_type;
--    attribute CORBA_IDLType element_type_def;
-+  readonly attribute TypeCode element_type;
-+  attribute IDLType element_type_def;
+   attribute unsigned long length;
+-  readonly attribute TypeCode element_type;
+-  attribute IDLType element_type_def;
+-  };
+-
+-  interface ExceptionDef : Contained, Container 
+-  {
+-    readonly attribute TypeCode type;
+-    attribute StructMemberSeq members;
+-  };
+-
+-  struct ExceptionDescription 
+-  {
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode type;
++  readonly attribute CORBA::TypeCode element_type;
++  attribute CORBA_IDLType element_type_def;
    };
  
--  interface CORBA_ExceptionDef : CORBA_Contained, CORBA_Container 
-+  interface ExceptionDef : Contained, Container 
+-  typedef sequence <ExceptionDef> ExceptionDefSeq;
+-  typedef sequence <ExceptionDescription> ExcDescriptionSeq;
+-
+-  enum AttributeMode 
++  interface CORBA_ExceptionDef : CORBA_Contained, CORBA_Container 
    {
--    readonly attribute CORBA::TypeCode type;
--    attribute CORBA_StructMemberSeq members;
-+    readonly attribute TypeCode type;
-+    attribute StructMemberSeq members;
+-    ATTR_NORMAL, 
+-    ATTR_READONLY
++    readonly attribute CORBA::TypeCode type;
++    attribute CORBA_StructMemberSeq members;
    };
  
--  struct CORBA_ExceptionDescription 
-+  struct ExceptionDescription 
+-  interface AttributeDef : Contained 
++  struct CORBA_ExceptionDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode type;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode type;
+-    readonly attribute TypeCode type;
+-    attribute IDLType type_def;
+-    attribute AttributeMode mode;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode type;
    };
  
--  typedef sequence <CORBA_ExceptionDef> CORBA_ExceptionDefSeq;
--  typedef sequence <CORBA_ExceptionDescription> CORBA_ExcDescriptionSeq;
-+  typedef sequence <ExceptionDef> ExceptionDefSeq;
-+  typedef sequence <ExceptionDescription> ExcDescriptionSeq;
+-  struct AttributeDescription 
+-  {
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode type;
+-    AttributeMode mode;
+-  };
++  typedef sequence <CORBA_ExceptionDef> CORBA_ExceptionDefSeq;
++  typedef sequence <CORBA_ExceptionDescription> CORBA_ExcDescriptionSeq;
  
--  interface CORBA_AttributeDef : CORBA_Contained 
-+  enum AttributeMode 
+-  enum OperationMode 
++  interface CORBA_AttributeDef : CORBA_Contained 
    {
--    readonly attribute CORBA::TypeCode type;
--    attribute CORBA_IDLType type_def;
--    attribute CORBA::AttributeMode mode;
-+    ATTR_NORMAL, 
-+    ATTR_READONLY
+-    OP_NORMAL, 
+-    OP_ONEWAY
++    readonly attribute CORBA::TypeCode type;
++    attribute CORBA_IDLType type_def;
++    attribute CORBA::AttributeMode mode;
    };
  
--  struct CORBA_AttributeDescription 
-+  interface AttributeDef : Contained 
+-  enum ParameterMode 
++  struct CORBA_AttributeDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode type;
--    CORBA::AttributeMode mode;
-+    readonly attribute TypeCode type;
-+    attribute IDLType type_def;
-+    attribute AttributeMode mode;
+-    PARAM_IN, 
+-    PARAM_OUT, 
+-    PARAM_INOUT
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode type;
++    CORBA::AttributeMode mode;
    };
  
--  struct CORBA_ParameterDescription 
-+  struct AttributeDescription 
+-  struct ParameterDescription 
++  struct CORBA_ParameterDescription 
    {
--    string name;
--    CORBA::TypeCode type;
--    CORBA_IDLType type_def;
--    CORBA::ParameterMode mode;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode type;
-+    AttributeMode mode;
+-    Identifier name;
+-    TypeCode type;
+-    IDLType type_def;
+-    ParameterMode mode;
++    string name;
++    CORBA::TypeCode type;
++    CORBA_IDLType type_def;
++    CORBA::ParameterMode mode;
    };
  
--  typedef sequence <CORBA_ParameterDescription> CORBA_ParDescriptionSeq;
--  typedef sequence <string> CORBA_ContextIdSeq;
-+  enum OperationMode 
-+  {
-+    OP_NORMAL, 
-+    OP_ONEWAY
-+  };
+-  typedef sequence <ParameterDescription> ParDescriptionSeq;
+-  typedef Identifier ContextIdentifier;
+-  typedef sequence <ContextIdentifier> ContextIdSeq;
++  typedef sequence <CORBA_ParameterDescription> CORBA_ParDescriptionSeq;
++  typedef string CORBA_Contextstring;
++  typedef sequence <CORBA_Contextstring> CORBA_ContextIdSeq;
  
--  interface CORBA_OperationDef : CORBA_Contained 
-+  enum ParameterMode 
+-  interface OperationDef : Contained 
++  interface CORBA_OperationDef : CORBA_Contained 
    {
--    readonly attribute CORBA::TypeCode result;
--    attribute CORBA_IDLType result_def;
--    attribute CORBA_ParDescriptionSeq params;
--    attribute CORBA::OperationMode mode;
--    attribute CORBA_ContextIdSeq contexts;
--    attribute CORBA_ExceptionDefSeq exceptions;
-+    PARAM_IN, 
-+    PARAM_OUT, 
-+    PARAM_INOUT
-+  };
-+
-+  struct ParameterDescription 
-+  {
-+    Identifier name;
-+    TypeCode type;
-+    IDLType type_def;
-+    ParameterMode mode;
+-    readonly attribute TypeCode result;
+-    attribute IDLType result_def;
+-    attribute ParDescriptionSeq params;
+-    attribute OperationMode mode;
+-    attribute ContextIdSeq contexts;
+-    attribute ExceptionDefSeq exceptions;
++    readonly attribute CORBA::TypeCode result;
++    attribute CORBA_IDLType result_def;
++    attribute CORBA_ParDescriptionSeq params;
++    attribute CORBA::OperationMode mode;
++    attribute CORBA_ContextIdSeq contexts;
++    attribute CORBA_ExceptionDefSeq exceptions;
    };
  
--  struct CORBA_OperationDescription 
-+  typedef sequence <ParameterDescription> ParDescriptionSeq;
-+  typedef Identifier ContextIdentifier;
-+  typedef sequence <ContextIdentifier> ContextIdSeq;
-+
-+  interface OperationDef : Contained 
+-  struct OperationDescription 
++  struct CORBA_OperationDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode result;
--    CORBA::OperationMode mode;
--    CORBA_ContextIdSeq contexts;
--    CORBA_ParDescriptionSeq parameters;
--    CORBA_ExcDescriptionSeq exceptions;
-+    readonly attribute TypeCode result;
-+    attribute IDLType result_def;
-+    attribute ParDescriptionSeq params;
-+    attribute OperationMode mode;
-+    attribute ContextIdSeq contexts;
-+    attribute ExceptionDefSeq exceptions;
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode result;
+-    OperationMode mode;
+-    ContextIdSeq contexts;
+-    ParDescriptionSeq parameters;
+-    ExcDescriptionSeq exceptions;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode result;
++    CORBA::OperationMode mode;
++    CORBA_ContextIdSeq contexts;
++    CORBA_ParDescriptionSeq parameters;
++    CORBA_ExcDescriptionSeq exceptions;
    };
  
--  typedef sequence <string> CORBA_RepositoryIdSeq;
--  typedef sequence <CORBA_OperationDescription> CORBA_OpDescriptionSeq;
--  typedef sequence <CORBA_AttributeDescription> CORBA_AttrDescriptionSeq;
-+  struct OperationDescription 
-+  {
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode result;
-+    OperationMode mode;
-+    ContextIdSeq contexts;
-+    ParDescriptionSeq parameters;
-+    ExcDescriptionSeq exceptions;
-+  };
+-  typedef sequence <RepositoryId> RepositoryIdSeq;
+-  typedef sequence <OperationDescription> OpDescriptionSeq;
+-  typedef sequence <AttributeDescription> AttrDescriptionSeq;
++  typedef sequence <string> CORBA_RepositoryIdSeq;
++  typedef sequence <CORBA_OperationDescription> CORBA_OpDescriptionSeq;
++  typedef sequence <CORBA_AttributeDescription> CORBA_AttrDescriptionSeq;
  
--  interface CORBA_InterfaceDef : CORBA_Container, CORBA_Contained, CORBA_IDLType 
-+  typedef sequence <RepositoryId> RepositoryIdSeq;
-+  typedef sequence <OperationDescription> OpDescriptionSeq;
-+  typedef sequence <AttributeDescription> AttrDescriptionSeq;
-+
-+  interface InterfaceDef : Container, Contained, IDLType 
+-  interface InterfaceDef : Container, Contained, IDLType 
++  interface CORBA_InterfaceDef : CORBA_Container, CORBA_Contained, CORBA_IDLType 
    {
      // read/write interface
--    attribute CORBA_InterfaceDefSeq base_interfaces;
-+    attribute InterfaceDefSeq base_interfaces;
+-    attribute InterfaceDefSeq base_interfaces;
++    attribute CORBA_InterfaceDefSeq base_interfaces;
      // read interface
      boolean is_a (
--        in string interface_id
-+        in RepositoryId interface_id
+-        in RepositoryId interface_id
++        in string interface_id
        );
  
      struct FullInterfaceDescription 
      {
--      string name;
--      string id;
--      string defined_in;
--      string version;
--      CORBA_OpDescriptionSeq operations;
--      CORBA_AttrDescriptionSeq attributes;
--      CORBA_RepositoryIdSeq base_interfaces;
--      CORBA::TypeCode type;
-+      Identifier name;
-+      RepositoryId id;
-+      RepositoryId defined_in;
-+      VersionSpec version;
-+      OpDescriptionSeq operations;
-+      AttrDescriptionSeq attributes;
-+      RepositoryIdSeq base_interfaces;
-+      TypeCode type;
+-      Identifier name;
+-      RepositoryId id;
+-      RepositoryId defined_in;
+-      VersionSpec version;
+-      OpDescriptionSeq operations;
+-      AttrDescriptionSeq attributes;
+-      RepositoryIdSeq base_interfaces;
+-      TypeCode type;
++      string name;
++      string id;
++      string defined_in;
++      string version;
++      CORBA_OpDescriptionSeq operations;
++      CORBA_AttrDescriptionSeq attributes;
++      CORBA_RepositoryIdSeq base_interfaces;
++      CORBA::TypeCode type;
      };
  
      FullInterfaceDescription describe_interface ();
  
      // write interface
--    CORBA_AttributeDef create_attribute (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType type,
--        in CORBA::AttributeMode mode
-+    AttributeDef create_attribute (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType type,
-+        in AttributeMode mode
+-    AttributeDef create_attribute (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType type,
+-        in AttributeMode mode
++    CORBA_AttributeDef create_attribute (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType type,
++        in CORBA::AttributeMode mode
        );
--    CORBA_OperationDef create_operation (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType result,
--        in CORBA::OperationMode mode,
--        in CORBA_ParDescriptionSeq params,
--        in CORBA_ExceptionDefSeq exceptions,
--        in CORBA_ContextIdSeq contexts
-+    OperationDef create_operation (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType result,
-+        in OperationMode mode,
-+        in ParDescriptionSeq params,
-+        in ExceptionDefSeq exceptions,
-+        in ContextIdSeq contexts
+-    OperationDef create_operation (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType result,
+-        in OperationMode mode,
+-        in ParDescriptionSeq params,
+-        in ExceptionDefSeq exceptions,
+-        in ContextIdSeq contexts
++    CORBA_OperationDef create_operation (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType result,
++        in CORBA::OperationMode mode,
++        in CORBA_ParDescriptionSeq params,
++        in CORBA_ExceptionDefSeq exceptions,
++        in CORBA_ContextIdSeq contexts
        );
    };
  
--  struct CORBA_InterfaceDescription 
-+  struct InterfaceDescription 
+-  struct InterfaceDescription 
++  struct CORBA_InterfaceDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA_RepositoryIdSeq base_interfaces;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    RepositoryIdSeq base_interfaces;
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    RepositoryIdSeq base_interfaces;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA_RepositoryIdSeq base_interfaces;
    };
  
--  interface CORBA_AbstractInterfaceDef : CORBA_InterfaceDef 
-+  interface AbstractInterfaceDef : InterfaceDef 
+-  interface AbstractInterfaceDef : InterfaceDef 
++  interface CORBA_AbstractInterfaceDef : CORBA_InterfaceDef 
    {
    };
  
--  interface CORBA_LocalInterfaceDef : CORBA_InterfaceDef 
-+  interface LocalInterfaceDef : InterfaceDef 
+-  interface LocalInterfaceDef : InterfaceDef 
++  interface CORBA_LocalInterfaceDef : CORBA_InterfaceDef 
    {
    };
-+};
+-};
++
  
  #pragma prefix ""
  
diff --git a/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff
index 65dcf794b95..5668e0f9b93 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff
@@ -1,264 +1,264 @@
---- orig/IFR_Components.pidl	Fri Apr 20 03:46:56 2001
-+++ IFR_Components.pidl	Fri Apr 20 03:39:21 2001
-@@ -71,6 +71,44 @@
+--- IFR_Components.pidl.old	Fri Jun  1 23:05:46 2001
++++ IFR_Components.pidl	Fri Jun  1 23:03:13 2001
+@@ -71,44 +71,6 @@
  
  module IR
  {
-+  enum DefinitionKind 
-+  {
-+    dk_none, 
-+    dk_all,
-+    dk_Attribute, 
-+    dk_Constant, 
-+    dk_Exception, 
-+    dk_Interface,
-+    dk_Module, 
-+    dk_Operation, 
-+    dk_Typedef,
-+    dk_Alias, 
-+    dk_Struct, 
-+    dk_Union, 
-+    dk_Enum,
-+    dk_Primitive, 
-+    dk_String, 
-+    dk_Sequence, 
-+    dk_Array,
-+    dk_Repository,
-+    dk_Wstring, 
-+    dk_Fixed,
-+    dk_Value, 
-+    dk_ValueBox, 
-+    dk_ValueMember,
-+    dk_Native,
-+    dk_Component,
-+    dk_Home,
-+    dk_Factory,
-+    dk_Finder,
-+    dk_PrimaryKey,
-+    dk_Emits,
-+    dk_Publishes,
-+    dk_Consumes,
-+    dk_Provides,
-+    dk_Uses
-+  };
-+
+-  enum DefinitionKind 
+-  {
+-    dk_none, 
+-    dk_all,
+-    dk_Attribute, 
+-    dk_Constant, 
+-    dk_Exception, 
+-    dk_Interface,
+-    dk_Module, 
+-    dk_Operation, 
+-    dk_Typedef,
+-    dk_Alias, 
+-    dk_Struct, 
+-    dk_Union, 
+-    dk_Enum,
+-    dk_Primitive, 
+-    dk_String, 
+-    dk_Sequence, 
+-    dk_Array,
+-    dk_Repository,
+-    dk_Wstring, 
+-    dk_Fixed,
+-    dk_Value, 
+-    dk_ValueBox, 
+-    dk_ValueMember,
+-    dk_Native,
+-    dk_Component,
+-    dk_Home,
+-    dk_Factory,
+-    dk_Finder,
+-    dk_PrimaryKey,
+-    dk_Emits,
+-    dk_Publishes,
+-    dk_Consumes,
+-    dk_Provides,
+-    dk_Uses
+-  };
+-
    typedef string Identifier;
    typedef string ScopedName;
    typedef string RepositoryId;
-@@ -98,14 +136,14 @@
+@@ -136,14 +98,14 @@
    typedef sequence <FinderDef> FinderDefSeq;
    interface PrimaryKeyDef;
  
--  interface ComponentRepository : CORBA_Repository
-+  interface ComponentRepository : CORBA::Repository
+-  interface ComponentRepository : CORBA::Repository
++  interface ComponentRepository : CORBA_Repository
    {
      ComponentDef create_component (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
          in ComponentDef base_component,
--        in CORBA_InterfaceDefSeq supports_interfaces
-+        in CORBA::InterfaceDefSeq supports_interfaces
+-        in CORBA::InterfaceDefSeq supports_interfaces
++        in CORBA_InterfaceDefSeq supports_interfaces
        );
      HomeDef create_home (
          in RepositoryId id,
-@@ -113,14 +151,14 @@
+@@ -151,14 +113,14 @@
          in VersionSpec version,
          in HomeDef base_home,
          in ComponentDef managed_component,
--        in CORBA_ValueDef primary_key
-+        in CORBA::ValueDef primary_key
+-        in CORBA::ValueDef primary_key
++        in CORBA_ValueDef primary_key
        );
    };
  
--  interface ProvidesDef : CORBA_Contained 
-+  interface ProvidesDef : CORBA::Contained 
+-  interface ProvidesDef : CORBA::Contained 
++  interface ProvidesDef : CORBA_Contained 
    {
      // read interface
--    readonly attribute CORBA_InterfaceDef interface_type;
-+    readonly attribute CORBA::InterfaceDef interface_type;
+-    readonly attribute CORBA::InterfaceDef interface_type;
++    readonly attribute CORBA_InterfaceDef interface_type;
    };
  
    struct ProvidesDescription 
-@@ -129,13 +167,13 @@
+@@ -167,13 +129,13 @@
      RepositoryId id;
      RepositoryId defined_in;
      VersionSpec version;
--    CORBA_InterfaceDef interface_type;
-+    CORBA::InterfaceDef interface_type;
+-    CORBA::InterfaceDef interface_type;
++    CORBA_InterfaceDef interface_type;
    };
  
--  interface UsesDef : CORBA_Contained 
-+  interface UsesDef : CORBA::Contained 
+-  interface UsesDef : CORBA::Contained 
++  interface UsesDef : CORBA_Contained 
    {
      // read interface
--    readonly attribute CORBA_InterfaceDef interface_type;
-+    readonly attribute CORBA::InterfaceDef interface_type;
+-    readonly attribute CORBA::InterfaceDef interface_type;
++    readonly attribute CORBA_InterfaceDef interface_type;
      readonly attribute boolean is_multiple;
    };
  
-@@ -145,18 +183,18 @@
+@@ -183,18 +145,18 @@
      RepositoryId id;
      RepositoryId defined_in;
      VersionSpec version;
--    CORBA_InterfaceDef interface_type;
-+    CORBA::InterfaceDef interface_type;
+-    CORBA::InterfaceDef interface_type;
++    CORBA_InterfaceDef interface_type;
      boolean is_multiple;
    };
  
    typedef sequence <ProvidesDescription> ProvidesDescSeq;
    typedef sequence <UsesDescription> UsesDescSeq;
  
--  interface EventDef : CORBA_Contained 
-+  interface EventDef : CORBA::Contained 
+-  interface EventDef : CORBA::Contained 
++  interface EventDef : CORBA_Contained 
    { // abstract - never instantiated
      // read interface
      boolean is_a (in RepositoryId event_id);
--    readonly attribute CORBA_ValueDef event;
-+    readonly attribute CORBA::ValueDef event;
+-    readonly attribute CORBA::ValueDef event;
++    readonly attribute CORBA_ValueDef event;
    };
  
    struct EventDescription 
-@@ -165,7 +203,7 @@
+@@ -203,7 +165,7 @@
      RepositoryId id;
      RepositoryId defined_in;
      VersionSpec version;
--    CORBA_ValueDef value;
-+    CORBA::ValueDef value;
+-    CORBA::ValueDef value;
++    CORBA_ValueDef value;
    };
  
    interface EmitsDef : EventDef 
-@@ -180,10 +218,10 @@
+@@ -218,10 +180,10 @@
    {
    };
  
--  interface ComponentDef : CORBA_InterfaceDef 
-+  interface ComponentDef : CORBA::InterfaceDef 
+-  interface ComponentDef : CORBA::InterfaceDef 
++  interface ComponentDef : CORBA_InterfaceDef 
    {
      // read/write interface
--    attribute CORBA_InterfaceDefSeq supported_interfaces;
-+    attribute CORBA::InterfaceDefSeq supported_interfaces;
+-    attribute CORBA::InterfaceDefSeq supported_interfaces;
++    attribute CORBA_InterfaceDefSeq supported_interfaces;
      // read interface
      readonly attribute ComponentDef base_component;
      readonly attribute ProvidesDefSeq provides_interfaces;
-@@ -197,32 +235,32 @@
+@@ -235,32 +197,32 @@
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_InterfaceDef interface_type
-+        in CORBA::InterfaceDef interface_type
+-        in CORBA::InterfaceDef interface_type
++        in CORBA_InterfaceDef interface_type
        );
      UsesDef create_uses (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_InterfaceDef interface_type,
-+        in CORBA::InterfaceDef interface_type,
+-        in CORBA::InterfaceDef interface_type,
++        in CORBA_InterfaceDef interface_type,
          in boolean is_multiple
        );
      EmitsDef create_emits (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ValueDef value
-+        in CORBA::ValueDef value
+-        in CORBA::ValueDef value
++        in CORBA_ValueDef value
        );
      PublishesDef create_publishes (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ValueDef value
-+        in CORBA::ValueDef value
+-        in CORBA::ValueDef value
++        in CORBA_ValueDef value
        );
      ConsumesDef create_consumes (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ValueDef value
-+        in CORBA::ValueDef value
+-        in CORBA::ValueDef value
++        in CORBA_ValueDef value
        );
    };
  
-@@ -236,18 +274,18 @@
+@@ -274,18 +236,18 @@
      RepositoryIdSeq supports_interfaces;
      ProvidesDefSeq provides_interfaces;
      UsesDefSeq uses_interfaces;
--    CORBA_AttrDescriptionSeq attributes;
-+    CORBA::AttrDescriptionSeq attributes;
+-    CORBA::AttrDescriptionSeq attributes;
++    CORBA_AttrDescriptionSeq attributes;
      EmitsDefSeq emits_events;
      PublishesDefSeq publishes_events;
      ConsumesDefSeq consumes_events;
      boolean is_basic;
    };
  
--  interface PrimaryKeyDef : CORBA_Contained 
-+  interface PrimaryKeyDef : CORBA::Contained 
+-  interface PrimaryKeyDef : CORBA::Contained 
++  interface PrimaryKeyDef : CORBA_Contained 
    {
      // read interface
      boolean is_a (in RepositoryId primary_key_id);
--    readonly attribute CORBA_ValueDef primary_key;
-+    readonly attribute CORBA::ValueDef primary_key;
+-    readonly attribute CORBA::ValueDef primary_key;
++    readonly attribute CORBA_ValueDef primary_key;
    };
  
    struct PrimaryKeyDescription 
-@@ -256,18 +294,18 @@
+@@ -294,18 +256,18 @@
      RepositoryId id;
      RepositoryId defined_in;
      VersionSpec version;
--    CORBA_ValueDef primary_key;
-+    CORBA::ValueDef primary_key;
+-    CORBA::ValueDef primary_key;
++    CORBA_ValueDef primary_key;
    };
  
--  interface FactoryDef : CORBA_OperationDef 
-+  interface FactoryDef : CORBA::OperationDef 
+-  interface FactoryDef : CORBA::OperationDef 
++  interface FactoryDef : CORBA_OperationDef 
    { // only PARAM_IN parameters
    };
  
--  interface FinderDef : CORBA_OperationDef 
-+  interface FinderDef : CORBA::OperationDef 
+-  interface FinderDef : CORBA::OperationDef 
++  interface FinderDef : CORBA_OperationDef 
    { // only PARAM_IN parameters
    };
  
--  interface HomeDef : CORBA_InterfaceDef 
-+  interface HomeDef : CORBA::InterfaceDef 
+-  interface HomeDef : CORBA::InterfaceDef 
++  interface HomeDef : CORBA_InterfaceDef 
    {
      // read operations
      readonly attribute HomeDef base_home;
-@@ -281,21 +319,21 @@
+@@ -319,21 +281,21 @@
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ValueDef primary_key
-+        in CORBA::ValueDef primary_key
+-        in CORBA::ValueDef primary_key
++        in CORBA_ValueDef primary_key
        );
      FactoryDef create_factory (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ParDescriptionSeq params, // only PARAM_INs
--        in CORBA_ExceptionDefSeq exceptions
-+        in CORBA::ParDescriptionSeq params, // only PARAM_INs
-+        in CORBA::ExceptionDefSeq exceptions
+-        in CORBA::ParDescriptionSeq params, // only PARAM_INs
+-        in CORBA::ExceptionDefSeq exceptions
++        in CORBA_ParDescriptionSeq params, // only PARAM_INs
++        in CORBA_ExceptionDefSeq exceptions
        );
      FinderDef create_finder (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ParDescriptionSeq params, // only PARAM_INs
--        in CORBA_ExceptionDefSeq exceptions
-+        in CORBA::ParDescriptionSeq params, // only PARAM_INs
-+        in CORBA::ExceptionDefSeq exceptions
+-        in CORBA::ParDescriptionSeq params, // only PARAM_INs
+-        in CORBA::ExceptionDefSeq exceptions
++        in CORBA_ParDescriptionSeq params, // only PARAM_INs
++        in CORBA_ExceptionDefSeq exceptions
        );
    };
  
-@@ -310,8 +348,8 @@
+@@ -348,8 +310,8 @@
      PrimaryKeyDef primary_key_def;
      FactoryDefSeq factories;
      FinderDefSeq finders;
--    CORBA_OpDescriptionSeq operations;
--    CORBA_AttrDescriptionSeq attributes;
-+    CORBA::OpDescriptionSeq operations;
-+    CORBA::AttrDescriptionSeq attributes;
+-    CORBA::OpDescriptionSeq operations;
+-    CORBA::AttrDescriptionSeq attributes;
++    CORBA_OpDescriptionSeq operations;
++    CORBA_AttrDescriptionSeq attributes;
      boolean is_basic;
    };
  };
diff --git a/TAO/tao/IFR_Client/diffs/IFR_Extended.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Extended.pidl.diff
index 2da32bf4fb1..f29261ea773 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_Extended.pidl.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_Extended.pidl.diff
@@ -1,189 +1,190 @@
---- orig/IFR_Extended.pidl	Mon Apr 23 20:20:09 2001
-+++ IFR_Extended.pidl	Fri Apr 20 03:06:40 2001
-@@ -71,114 +71,122 @@
+--- IFR_Extended.pidl.old	Fri Jun  1 23:02:10 2001
++++ IFR_Extended.pidl	Fri Jun  1 22:58:48 2001
+@@ -71,123 +71,115 @@
  
  module CORBA
  {
-+  typedef short ValueModifier; // PIDL
-+  const ValueModifier VM_NONE = 0;
-+  const ValueModifier VM_CUSTOM = 1;
-+  const ValueModifier VM_ABSTRACT = 2;
-+  const ValueModifier VM_TRUNCATABLE = 3;
-+
+-  typedef short ValueModifier; // PIDL
+-  const ValueModifier VM_NONE = 0;
+-  const ValueModifier VM_CUSTOM = 1;
+-  const ValueModifier VM_ABSTRACT = 2;
+-  const ValueModifier VM_TRUNCATABLE = 3;
+-
    typedef short Visibility;
--};
-+  const Visibility PRIVATE_MEMBER = 0;
-+  const Visibility PUBLIC_MEMBER = 1;
+-  const Visibility PRIVATE_MEMBER = 0;
+-  const Visibility PUBLIC_MEMBER = 1;
++};
  
--  interface CORBA_FixedDef : CORBA_IDLType 
-+  interface FixedDef : IDLType 
+-  interface FixedDef : IDLType 
++  interface CORBA_FixedDef : CORBA_IDLType 
    {
      attribute unsigned short digits;
      attribute short scale;
    };
  
--  struct CORBA_ValueMember 
-+  struct ValueMember 
+-  struct ValueMember 
++  struct CORBA_ValueMember 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode type;
--    CORBA_IDLType type_def;
--    CORBA::Visibility access;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode type;
-+    IDLType type_def;
-+    Visibility access;
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode type;
+-    IDLType type_def;
+-    Visibility access;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode type;
++    CORBA_IDLType type_def;
++    CORBA::Visibility access;
    };
  
--  typedef sequence <CORBA_ValueMember> CORBA_ValueMemberSeq;
-+  typedef sequence <ValueMember> ValueMemberSeq;
+-  typedef sequence <ValueMember> ValueMemberSeq;
++  typedef sequence <CORBA_ValueMember> CORBA_ValueMemberSeq;
  
--  interface CORBA_ValueMemberDef : CORBA_Contained 
-+  interface ValueMemberDef : Contained 
+-  interface ValueMemberDef : Contained 
++  interface CORBA_ValueMemberDef : CORBA_Contained 
    {
--    readonly attribute CORBA::TypeCode type;
--    attribute CORBA_IDLType type_def;
--    attribute CORBA::Visibility access;
-+    readonly attribute TypeCode type;
-+    attribute IDLType type_def;
-+    attribute Visibility access;
+-    readonly attribute TypeCode type;
+-    attribute IDLType type_def;
+-    attribute Visibility access;
++    readonly attribute CORBA::TypeCode type;
++    attribute CORBA_IDLType type_def;
++    attribute CORBA::Visibility access;
    };
  
--  interface CORBA_ValueDef : CORBA_Container, CORBA_Contained, CORBA_IDLType 
-+  interface ValueDef : Container, Contained, IDLType 
+-  interface ValueDef : Container, Contained, IDLType 
++  interface CORBA_ValueDef : CORBA_Container, CORBA_Contained, CORBA_IDLType 
    {
      // read/write interface
--    attribute CORBA_InterfaceDefSeq supported_interfaces;
--    attribute CORBA_InitializerSeq initializers;
--    attribute CORBA_ValueDef base_value;
--    attribute CORBA_ValueDefSeq abstract_base_values;
-+    attribute InterfaceDefSeq supported_interfaces;
-+    attribute InitializerSeq initializers;
-+    attribute ValueDef base_value;
-+    attribute ValueDefSeq abstract_base_values;
+-    attribute InterfaceDefSeq supported_interfaces;
+-    attribute InitializerSeq initializers;
+-    attribute ValueDef base_value;
+-    attribute ValueDefSeq abstract_base_values;
++    attribute CORBA_InterfaceDefSeq supported_interfaces;
++    attribute CORBA_InitializerSeq initializers;
++    attribute CORBA_ValueDef base_value;
++    attribute CORBA_ValueDefSeq abstract_base_values;
      // read interface
      attribute boolean is_abstract;
      attribute boolean is_custom;
      attribute boolean is_truncatable;
      boolean is_a (
--        in string id
-+        in RepositoryId id
+-        in RepositoryId id
++        in string id
        );
  
      struct FullValueDescription 
      {
--      string name;
--      string id;
-+      Identifier name;
-+      RepositoryId id;
+-      Identifier name;
+-      RepositoryId id;
++      string name;
++      string id;
        boolean is_abstract;
        boolean is_custom;
--      string defined_in;
--      string version;
--      CORBA_OpDescriptionSeq operations;
--      CORBA_AttrDescriptionSeq attributes;
--      CORBA_ValueMemberSeq members;
--      CORBA_InitializerSeq initializers;
--      CORBA_RepositoryIdSeq supported_interfaces;
--      CORBA_RepositoryIdSeq abstract_base_values;
-+      RepositoryId defined_in;
-+      VersionSpec version;
-+      OpDescriptionSeq operations;
-+      AttrDescriptionSeq attributes;
-+      ValueMemberSeq members;
-+      InitializerSeq initializers;
-+      RepositoryIdSeq supported_interfaces;
-+      RepositoryIdSeq abstract_base_values;
+-      RepositoryId defined_in;
+-      VersionSpec version;
+-      OpDescriptionSeq operations;
+-      AttrDescriptionSeq attributes;
+-      ValueMemberSeq members;
+-      InitializerSeq initializers;
+-      RepositoryIdSeq supported_interfaces;
+-      RepositoryIdSeq abstract_base_values;
++      string defined_in;
++      string version;
++      CORBA_OpDescriptionSeq operations;
++      CORBA_AttrDescriptionSeq attributes;
++      CORBA_ValueMemberSeq members;
++      CORBA_InitializerSeq initializers;
++      CORBA_RepositoryIdSeq supported_interfaces;
++      CORBA_RepositoryIdSeq abstract_base_values;
        boolean is_truncatable;
--      string base_value;
--      CORBA::TypeCode type;
-+      RepositoryId base_value;
-+      TypeCode type;
+-      RepositoryId base_value;
+-      TypeCode type;
++      string base_value;
++      CORBA::TypeCode type;
      };
  
      FullValueDescription describe_value ();
        
--    CORBA_ValueMemberDef create_value_member  (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType type,
--        in CORBA::Visibility access
-+    ValueMemberDef create_value_member  (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType type,
-+        in Visibility access
+-    ValueMemberDef create_value_member  (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType type,
+-        in Visibility access
++    CORBA_ValueMemberDef create_value_member  (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType type,
++        in CORBA::Visibility access
        );
--    CORBA_AttributeDef create_attribute (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType type,
--        in CORBA::AttributeMode mode
-+    AttributeDef create_attribute (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType type,
-+        in AttributeMode mode
+-    AttributeDef create_attribute (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType type,
+-        in AttributeMode mode
++    CORBA_AttributeDef create_attribute (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType type,
++        in CORBA::AttributeMode mode
        );
--    CORBA_OperationDef create_operation (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType result,
--        in CORBA::OperationMode mode,
--        in CORBA_ParDescriptionSeq params,
--        in CORBA_ExceptionDefSeq exceptions,
--        in CORBA_ContextIdSeq contexts
-+    OperationDef create_operation (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType result,
-+        in OperationMode mode,
-+        in ParDescriptionSeq params,
-+        in ExceptionDefSeq exceptions,
-+        in ContextIdSeq contexts
+-    OperationDef create_operation (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType result,
+-        in OperationMode mode,
+-        in ParDescriptionSeq params,
+-        in ExceptionDefSeq exceptions,
+-        in ContextIdSeq contexts
++    CORBA_OperationDef create_operation (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType result,
++        in CORBA::OperationMode mode,
++        in CORBA_ParDescriptionSeq params,
++        in CORBA_ExceptionDefSeq exceptions,
++        in CORBA_ContextIdSeq contexts
        );
    };
  
--  struct CORBA_ValueDescription 
-+  struct ValueDescription 
+-  struct ValueDescription 
++  struct CORBA_ValueDescription 
    {
--    string name;
--    string id;
-+    Identifier name;
-+    RepositoryId id;
+-    Identifier name;
+-    RepositoryId id;
++    string name;
++    string id;
      boolean is_abstract;
      boolean is_custom;
--    string defined_in;
--    string version;
--    CORBA_RepositoryIdSeq supported_interfaces;
--    CORBA_RepositoryIdSeq abstract_base_values;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    RepositoryIdSeq supported_interfaces;
-+    RepositoryIdSeq abstract_base_values;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    RepositoryIdSeq supported_interfaces;
+-    RepositoryIdSeq abstract_base_values;
++    string defined_in;
++    string version;
++    CORBA_RepositoryIdSeq supported_interfaces;
++    CORBA_RepositoryIdSeq abstract_base_values;
      boolean is_truncatable;
--    string base_value;
-+    RepositoryId base_value;
+-    RepositoryId base_value;
++    string base_value;
    };
  
--  interface CORBA_ValueBoxDef : CORBA_TypedefDef 
-+  interface ValueBoxDef : TypedefDef 
+-  interface ValueBoxDef : TypedefDef 
++  interface CORBA_ValueBoxDef : CORBA_TypedefDef 
    {
--    attribute CORBA_IDLType original_type_def;
-+    attribute IDLType original_type_def;
-+  };
+-    attribute IDLType original_type_def;
++    attribute CORBA_IDLType original_type_def;
    };
+-};
  
  #pragma prefix ""
+