ChangeLogTag:Thu May 6 12:11:22 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

217 files changed, 23028 insertions, 4633 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 1f91e3defe0..be1f21df3a3 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,220 @@
+Thu May  6 12:11:22 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* Many thanks and kudos to Torsten Kuepper
+	  <kuepper2@uni-wuppertal.de> who contributes an initial
+	  implementation of Object-by-Value to TAO. His ChangeLog entry
+	  follows:
+
+	* TAO/tao/Makefile:
+	* TAO/TAO_IDL/Makefile:
+	* TAO/tao/orbconf.h:
+	* TAO/TAO_IDL/include/idl.h:
+	  Support of Valuetypes if TAO_HAS_OBV resp. IDL_HAS_OBV is
+	  defined.
+	  This is far from complete. However
+	  + you are able to pass valuetypes as arguments in operation
+	  signatures (see examples/OBV).
+	    - Valuetype as member of other types (union, sequence ...) is
+	    missing until the compiler backend is provided with visitors
+	    for that.
+	  + A valuetype could have a valuetype as state member, ...
+	    - ... but currently the sharing of valuetypes in the context
+	    of an invocation is not yet implemented. This means you got
+	    two out of one (if two references point to one object) and
+	    cyclic references are not feasible.
+	  + The marshalling code accesses the state member data directly
+	    for optimization (-Wb,obv_opt_accessor).
+	    - This will be changed for unoptimized (standard) valuetypes,
+	      where the implementer should be able to override the
+	      accessor/modifier functions even for marshalling. Currently
+	      she isn't able to do so.
+	    - The marshalling does no fragmentation (chunking) yet. But
+	      this is required for custom marshalling and truncation.
+	    - Ordinary (not hashed) repository ids are used. Some code is
+	      missing that would optimize sending repo ids away (if the
+	      formal parameter is equal the current type) or that
+	      backreferences earlier send repository ids, when marshalling
+	      a graph.
+	    - The code generated for typedefs and forwards of valuetypes
+	      is not complete and will not compile.
+	    - Support of an interface is not yet there. Perhaps the TIE to
+	      a valuetype may give comparable functionality.
+ 	    - Abstract interfaces are not implemented too.
+	    - TypeCode for valuetypes are missing, and without that,
+	      packing a valuetype into an any is not yet possible.
+	    - init () is not yet mapped to create () in the _init
+	      class. But you can declare create () on your own in your
+	      factory class.
+	    - Some helper classes (e.g. _var for ValueFactory) are
+	      missing.
+	  And I have confused a few issues on constness in modifier
+	  functions and members (in _init) which should be private and
+	  friend of another class, but it didn't want to compile right. I
+	  will correct these points, when I have the time.
+
+	* TAO/examples/OBV/Typed_Events [new]:
+	  Demonstration of Typed Events, e.g. measuring values. The idea
+	  is to have common attributes (time and origin id) and operations
+	  (do_print()) in a base class.
+	  The event (temperature, position...) that is derived from the
+	  base is created in one process and is passed (type safe) to
+	  another process which invokes member function of the base class
+	  to do something with this concrete event (e.g. show, perform a
+	  test).
+	  (Naturally, the receiving process must have an implementation of
+	  the valuetypes.)
+
+	* TAO_IDL/idl_global.h:
+	* TAO_IDL/utl_global.cpp:
+	* TAO_IDL/drv_args.cpp:
+	* TAO_IDL/be/be_args.cpp:
+	  New TAO_IDL options
+	    -Gv   enable OBV (Valuetype)
+	    -Sv   disable OBV (Valuetype) (currently default)
+ 	          read option with idl_global->obv_support()
+	    -Wb,obv_opt_accessor  Nonvirtual inline accessor/modifier
+	    functions
+	  Currently it is necessary to use compiled marshalling (-Gc) when
+	  using the valuetype feature.
+
+	* TAO_IDL/fe/idl.ll:
+	* TAO_IDL/fe/fe_init.cpp:
+	  Compiler FE recognizes the OBV token (abstract, custom, init,
+	  private, public, supports, truncatable, valuetype) (CORBA 2.3
+	  3.2.4), but only if it is compiled with IDL_HAS_OBV and -Gv is
+	  given.
+
+	* TAO_IDL/fe/idl.yy:
+	  There are some new productions in the parser. member is now a
+	  wrapper for member_i, which previously was member but now
+	  accesses $0 as visibility parameter.
+
+	* TAO_IDL/include/ast_generator.h:
+	* TAO_IDL/be/be_generator.cpp:
+	* TAO_IDL/include/ast_interface.h:
+	* TAO_IDL/ast/ast_interface.cpp:
+	* TAO_IDL/include/ast_interface_fwd.h:
+	* TAO_IDL/ast/ast_interface_fwd.cpp:
+	* TAO_IDL/include/ast_field.h:
+	* TAO_IDL/ast/ast_field.cpp:
+	* TAO_IDL/be_include/be_field.h:
+	* TAO_IDL/be/be_field.cpp:
+	* TAO_IDL/be_include/be_valuetype.h [new]:
+	* TAO_IDL/be/be_valuetype.cpp [new]:
+	* TAO_IDL/include/fe_interface_header.h:
+	* TAO_IDL/fe/fe_interface_header.cpp:
+	  AST_Interface is currently used for valuetypes too.  (This
+	  attempt was made for better staying in sync with the rushing TAO
+	  development.)
+	  Though lots of code for name lookup and inheritance rules can be
+	  reused. AST_Interface has the new methods is_valuetype(),
+	  is_abstract_valuetype() and is_abstract_interface() which allows
+	  the frontend to distinguish them. Later on a new AST_ class
+	  should  be refactored which is a base class to the IDL types
+	  that provide inheritance.
+
+	  Some shared code in idl.yy is now in AST_Interface::redefine()
+	  and AST_Interface::fwd_redefinition_helper(). Forward definition
+	  is a little changed, that the dummy full definition be_ object
+	  stored in AST_InterfaceFwd is of the right type.
+
+	  FE_InterfaceHeader::compile_inheritance () is extended with the
+	  rules to check right inheritance of valuetypes and abstract
+	  interfaces.
+	  The constructor of FE_InterfaceHeader has now a default
+	  parameter which let the derived FE_obv_header invoke
+	  compile_inheritance () at later time.
+
+	* TAO_IDL/be_include/be.h:
+	* TAO_IDL/be_include/be_codegen.h:
+	* TAO_IDL/be_include/be_visitor.h:
+	* TAO_IDL/be_include/be_visitor_module/module.h:
+	* TAO_IDL/be_include/be_visitor_root/root.h:
+	* TAO_IDL/be_include/be_visitor_argument/arglist.h:
+	* TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h:
+	* TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h:
+	* TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.h:
+	* TAO_IDL/be_include/be_visitor_argument/upcall_ss.h:
+	* TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h:
+	* TAO_IDL/be_include/be_visitor_field/field_ch.h:
+	* TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h:
+	* TAO_IDL/be_include/be_visitor_operation/rettype*.h:
+	* TAO_IDL/be_include/be_visitor_valuetype.h [new]:
+	* TAO_IDL/be_include/be_visitor_valuetype_fwd.h [new]:
+	* TAO_IDL/be_include/be_visitor_valuetype/*.h [new]:
+	* TAO_IDL/be/be_visitor.cpp:
+	* TAO_IDL/be/be_visitor_factory.cpp:
+	* TAO_IDL/be/be_visitor_module/module.cpp:
+	* TAO_IDL/be/be_visitor_root/root.cpp:
+	* TAO_IDL/be/be_visitor_argument/arglist.cpp:
+	* TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp:
+	* TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/post_docall_compiled_cs.cpp:
+	* TAO_IDL/be/be_visitor_argument/upcall_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp:
+	* TAO_IDL/be/be_visitor_field/field_ch.cpp:
+	* TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp:
+	* TAO_IDL/be/be_visitor_operation/rettype*.cpp:
+	* TAO_IDL/be/be_visitor_valuetype_fwd.cpp [new]:
+	* TAO_IDL/be/be_visitor_valuetype/*.cpp [new]:
+
+	  The visiting of valuetype is integrated into the root and module
+	  visitors. The OBV_ classes resp. namespaces are generated in an
+	  extra pass over the syntax tree.
+
+	* tao/corba.h:
+	* tao/corbafwd.h:
+	* tao/ValueBase.h [new]:
+	* tao/ValueBase.i [new]:
+	* tao/ValueBase.cpp [new]:
+	  All valuetypes inherit from the CORBA::ValueBase. It has
+	  abstract operations for the reference counting, which are
+	  implemented by multiply inherit from
+	  e.g. CORBA::DefaultValueRefCountBase.
+	  _copy_value () is not yet implemented.
+	  There is some internal stuff for doing [un]marshalling and
+	  dynamic type conversion (used by _downcast ()), whose
+	  underlaying mechanism is like in the tao_idl compiler
+	  itself:
+	    The static member _downcast () calls a virtual function, which
+	    is implemented from the IDL compiler, with an id of the wanted
+	    type. These it is compared against the actual id of the
+	    object. In case of mismatch the ancestors of the valuetype are
+	    called (in depth first order).
+	  _downcast () is used during unmarshaling too. This may result in
+	  quite undeterministic real time behaviour. The worst case would
+	  be that the _downcast walks the complete inheritance graph.
+	  The detailed marshaling is best studied from the comments in
+	  ValueBase.cpp.
+
+	* tao/ValueFactory.h [new]:
+	* tao/ValueFactory.i [new]:
+	* tao/ValueFactory.cpp [new]:
+	* tao/ValueFactory_Map.h [new]:
+	* tao/ValueFactory_Map.i [new]:
+	* tao/ValueFactory_Map.cpp [new]:
+	  The map of registered valuetype factories.
+	  TAO_OBV_REGISTER_FACTORY macro is for on the fly factory
+	  registration, but its not like in the OMG specs.
+
+	* tao/ORB.h:
+	* tao/ORB.cpp:
+	  Integration of the factory map for valuetypes with the ORB.
+	  It is accessed through CORBA_ORB::register_value_factory (),
+	  unregister_value_factory () and lookup_value_factory ().
+	  This needs some revision to make the changing of the map thread
+	  safe and changes to make it per ORB and not per process as it is
+	  currently.
+
+	* */Makefile:
+	  Many makefile dependencies updated.
+
+	* examples/Simple/chat/Makefile:
+	  The dependencies did not include Client_i.cpp or Server_i.cpp
+
+	* orbsvcs/tests/Trading/Makefile:
+	  Added dependencies to for parallel compilation.
+
 Thu May  6 09:24:30 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile
index 4bed1108947..d10e4a4228e 100644
--- a/TAO/TAO_IDL/Makefile
+++ b/TAO/TAO_IDL/Makefile
@@ -90,6 +90,8 @@ FILES = tao_idl \
 	be/be_field \
 	be/be_interface \
 	be/be_interface_fwd \
+	be/be_valuetype \
+	be/be_valuetype_fwd\
 	be/be_module \
 	be/be_native \
 	be/be_operation \
@@ -126,6 +128,8 @@ FILES = tao_idl \
 	be/be_visitor_field \
 	be/be_visitor_interface \
 	be/be_visitor_interface_fwd \
+	be/be_visitor_valuetype \
+	be/be_visitor_valuetype_fwd \
 	be/be_visitor_module \
 	be/be_visitor_operation \
 	be/be_visitor_root \
@@ -604,7 +608,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5411,7 +5416,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5514,7 +5520,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5617,7 +5624,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5720,7 +5728,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5823,7 +5832,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5926,7 +5936,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6029,7 +6040,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6132,7 +6144,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6235,7 +6248,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6356,7 +6370,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6459,7 +6474,216 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_exception.h be_include/be_expression.h \
+ be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
+ be_include/be_argument.h be_include/be_attribute.h \
+ be_include/be_union.h be_include/be_union_branch.h \
+ be_include/be_union_label.h be_include/be_constant.h \
+ be_include/be_enum_val.h be_include/be_array.h \
+ be_include/be_sequence.h be_include/be_string.h \
+ be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
+ be_include/be_helper.h be_include/be_codegen.h \
+ be_include/be_stream_factory.h be_include/be_visitor.h \
+ be_include/be_visitor_factory.h be_include/be_visitor_context.h
+.obj/be_valuetype.o .obj/be_valuetype.so .shobj/be_valuetype.o .shobj/be_valuetype.so: be/be_valuetype.cpp include/idl.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
+ include/idl_fwd.h include/idl_bool.h include/utl_string.h \
+ include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
+ include/ast_decl.h include/ast_expression.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
+ be_include/be_type.h be_include/be_predefined_type.h \
+ be_include/be_module.h be_include/be_interface.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_exception.h be_include/be_expression.h \
+ be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
+ be_include/be_argument.h be_include/be_attribute.h \
+ be_include/be_union.h be_include/be_union_branch.h \
+ be_include/be_union_label.h be_include/be_constant.h \
+ be_include/be_enum_val.h be_include/be_array.h \
+ be_include/be_sequence.h be_include/be_string.h \
+ be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
+ be_include/be_helper.h be_include/be_codegen.h \
+ be_include/be_stream_factory.h be_include/be_visitor.h \
+ be_include/be_visitor_factory.h be_include/be_visitor_context.h
+.obj/be_valuetype_fwd.o .obj/be_valuetype_fwd.so .shobj/be_valuetype_fwd.o .shobj/be_valuetype_fwd.so: be/be_valuetype_fwd.cpp include/idl.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
+ include/idl_fwd.h include/idl_bool.h include/utl_string.h \
+ include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
+ include/ast_decl.h include/ast_expression.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
+ be_include/be_type.h be_include/be_predefined_type.h \
+ be_include/be_module.h be_include/be_interface.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6562,7 +6786,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6665,7 +6890,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6768,7 +6994,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6871,7 +7098,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6974,7 +7202,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7077,7 +7306,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7191,7 +7421,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7294,7 +7525,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7397,7 +7629,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7500,7 +7733,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7603,7 +7837,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7706,7 +7941,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7809,7 +8045,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7912,7 +8149,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8015,7 +8253,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8119,7 +8358,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8222,7 +8462,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8325,7 +8566,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8428,7 +8670,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8531,7 +8774,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8635,7 +8879,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8738,7 +8983,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8841,7 +9087,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8945,7 +9192,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9030,6 +9278,26 @@ tags:
  be_include/be_visitor_interface_fwd/interface_fwd_ch.h \
  be_include/be_visitor_interface_fwd/interface_fwd_ci.h \
  be_include/be_visitor_interface_fwd/cdr_op_ci.h \
+ be_include/be_visitor_valuetype.h \
+ be_include/be_visitor_valuetype/valuetype.h \
+ be_include/be_visitor_valuetype/valuetype_ch.h \
+ be_include/be_visitor_valuetype/valuetype_obv_ch.h \
+ be_include/be_visitor_valuetype/valuetype_obv_cs.h \
+ be_include/be_visitor_valuetype/valuetype_ci.h \
+ be_include/be_visitor_valuetype/valuetype_cs.h \
+ be_include/be_visitor_valuetype/cdr_op_ch.h \
+ be_include/be_visitor_valuetype/cdr_op_cs.h \
+ be_include/be_visitor_valuetype/marshal_ch.h \
+ be_include/be_visitor_valuetype/marshal_cs.h \
+ be_include/be_visitor_valuetype/arglist.h \
+ be_include/be_visitor_valuetype/field_ch.h \
+ be_include/be_visitor_valuetype/field_cs.h \
+ be_include/be_visitor_valuetype/field_cdr_ci.h \
+ be_include/be_visitor_valuetype/obv_module.h \
+ be_include/be_visitor_valuetype_fwd.h \
+ be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h \
+ be_include/be_visitor_valuetype_fwd/valuetype_fwd_ci.h \
+ be_include/be_visitor_valuetype_fwd/cdr_op_ci.h \
  be_include/be_visitor_module.h be_include/be_visitor_module/module.h \
  be_include/be_visitor_module/module_ch.h \
  be_include/be_visitor_module/module_sh.h \
@@ -9217,7 +9485,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9317,7 +9586,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9451,7 +9721,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9567,7 +9838,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9674,7 +9946,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9783,7 +10056,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9886,7 +10160,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9990,7 +10265,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10103,7 +10379,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10233,7 +10510,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10345,7 +10623,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10484,7 +10763,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10504,6 +10784,286 @@ tags:
  be/be_visitor_interface_fwd/interface_fwd_ch.cpp \
  be/be_visitor_interface_fwd/interface_fwd_ci.cpp \
  be/be_visitor_interface_fwd/cdr_op_ci.cpp
+.obj/be_visitor_valuetype.o .obj/be_visitor_valuetype.so .shobj/be_visitor_valuetype.o .shobj/be_visitor_valuetype.so: be/be_visitor_valuetype.cpp include/idl.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
+ include/idl_fwd.h include/idl_bool.h include/utl_string.h \
+ include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
+ include/ast_decl.h include/ast_expression.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
+ be_include/be_type.h be_include/be_predefined_type.h \
+ be_include/be_module.h be_include/be_interface.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_exception.h be_include/be_expression.h \
+ be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
+ be_include/be_argument.h be_include/be_attribute.h \
+ be_include/be_union.h be_include/be_union_branch.h \
+ be_include/be_union_label.h be_include/be_constant.h \
+ be_include/be_enum_val.h be_include/be_array.h \
+ be_include/be_sequence.h be_include/be_string.h \
+ be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
+ be_include/be_helper.h be_include/be_codegen.h \
+ be_include/be_stream_factory.h be_include/be_visitor.h \
+ be_include/be_visitor_factory.h be_include/be_visitor_context.h \
+ be_include/be_visitor_valuetype.h be_include/be_visitor_scope.h \
+ be_include/be_visitor_decl.h \
+ be_include/be_visitor_valuetype/valuetype.h \
+ be_include/be_visitor_valuetype/valuetype_ch.h \
+ be_include/be_visitor_valuetype/valuetype_obv_ch.h \
+ be_include/be_visitor_valuetype/valuetype_obv_cs.h \
+ be_include/be_visitor_valuetype/valuetype_ci.h \
+ be_include/be_visitor_valuetype/valuetype_cs.h \
+ be_include/be_visitor_valuetype/cdr_op_ch.h \
+ be_include/be_visitor_valuetype/cdr_op_cs.h \
+ be_include/be_visitor_valuetype/marshal_ch.h \
+ be_include/be_visitor_valuetype/marshal_cs.h \
+ be_include/be_visitor_valuetype/arglist.h \
+ be_include/be_visitor_valuetype/field_ch.h \
+ be_include/be_visitor_valuetype/field_cs.h \
+ be_include/be_visitor_valuetype/field_cdr_ci.h \
+ be_include/be_visitor_valuetype/obv_module.h \
+ be/be_visitor_valuetype/valuetype.cpp \
+ be/be_visitor_valuetype/valuetype_ch.cpp \
+ be/be_visitor_valuetype/valuetype_obv_ch.cpp \
+ be/be_visitor_valuetype/valuetype_obv_cs.cpp \
+ be/be_visitor_valuetype/valuetype_ci.cpp \
+ be/be_visitor_valuetype/valuetype_cs.cpp \
+ be/be_visitor_valuetype/cdr_op_ch.cpp \
+ be/be_visitor_valuetype/cdr_op_cs.cpp \
+ be/be_visitor_valuetype/marshal_ch.cpp \
+ be/be_visitor_valuetype/marshal_cs.cpp \
+ be/be_visitor_valuetype/arglist.cpp be_include/be_visitor_operation.h \
+ be_include/be_visitor_operation/operation.h \
+ be_include/be_visitor_operation/operation_ch.h \
+ be_include/be_visitor_operation/operation_cs.h \
+ be_include/be_visitor_operation/operation_sh.h \
+ be_include/be_visitor_operation/operation_ih.h \
+ be_include/be_visitor_operation/operation_ss.h \
+ be_include/be_visitor_operation/operation_is.h \
+ be_include/be_visitor_operation/tie_sh.h \
+ be_include/be_visitor_operation/tie_si.h \
+ be_include/be_visitor_operation/collocated_sh.h \
+ be_include/be_visitor_operation/collocated_ss.h \
+ be_include/be_visitor_operation/arglist.h \
+ be_include/be_visitor_operation/rettype.h \
+ be_include/be_visitor_operation/rettype_is.h \
+ be_include/be_visitor_operation/rettype_vardecl_cs.h \
+ be_include/be_visitor_operation/rettype_pre_docall_cs.h \
+ be_include/be_visitor_operation/rettype_docall_cs.h \
+ be_include/be_visitor_operation/rettype_post_docall_cs.h \
+ be_include/be_visitor_operation/rettype_return_cs.h \
+ be_include/be_visitor_operation/exceptlist_cs.h \
+ be_include/be_visitor_operation/argument.h \
+ be_include/be_visitor_operation/argument_invoke.h \
+ be_include/be_visitor_operation/argument_marshal.h \
+ be_include/be_visitor_operation/rettype_vardecl_ss.h \
+ be_include/be_visitor_operation/rettype_assign_ss.h \
+ be_include/be_visitor_operation/rettype_post_upcall_ss.h \
+ be_include/be_visitor_operation/rettype_marshal_ss.h \
+ be_include/be_visitor_operation/compiled_marshal.h \
+ be_include/be_visitor_operation/rettype_pre_invoke_cs.h \
+ be/be_visitor_valuetype/field_ch.cpp \
+ be/be_visitor_valuetype/field_cs.cpp \
+ be/be_visitor_valuetype/field_cdr_ci.cpp \
+ be_include/be_visitor_field.h be_include/be_visitor_field/field_ch.h \
+ be_include/be_visitor_field/field_ci.h \
+ be_include/be_visitor_field/field_cs.h \
+ be_include/be_visitor_field/cdr_op_ch.h \
+ be_include/be_visitor_field/cdr_op_cs.h \
+ be/be_visitor_valuetype/obv_module.cpp
+.obj/be_visitor_valuetype_fwd.o .obj/be_visitor_valuetype_fwd.so .shobj/be_visitor_valuetype_fwd.o .shobj/be_visitor_valuetype_fwd.so: be/be_visitor_valuetype_fwd.cpp \
+ include/idl.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
+ include/idl_fwd.h include/idl_bool.h include/utl_string.h \
+ include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
+ include/ast_decl.h include/ast_expression.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
+ be_include/be_type.h be_include/be_predefined_type.h \
+ be_include/be_module.h be_include/be_interface.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_exception.h be_include/be_expression.h \
+ be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
+ be_include/be_argument.h be_include/be_attribute.h \
+ be_include/be_union.h be_include/be_union_branch.h \
+ be_include/be_union_label.h be_include/be_constant.h \
+ be_include/be_enum_val.h be_include/be_array.h \
+ be_include/be_sequence.h be_include/be_string.h \
+ be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
+ be_include/be_helper.h be_include/be_codegen.h \
+ be_include/be_stream_factory.h be_include/be_visitor.h \
+ be_include/be_visitor_factory.h be_include/be_visitor_context.h \
+ be_include/be_visitor_valuetype_fwd.h be_include/be_visitor_scope.h \
+ be_include/be_visitor_decl.h \
+ be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h \
+ be_include/be_visitor_valuetype_fwd/valuetype_fwd_ci.h \
+ be_include/be_visitor_valuetype_fwd/cdr_op_ci.h
 .obj/be_visitor_module.o .obj/be_visitor_module.so .shobj/be_visitor_module.o .shobj/be_visitor_module.so: be/be_visitor_module.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -10595,7 +11155,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10708,7 +11269,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10870,7 +11432,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10990,7 +11553,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11094,7 +11658,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11235,7 +11800,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11361,7 +11927,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11469,7 +12036,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11589,7 +12157,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11712,7 +12281,8 @@ tags:
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_valuetype.h \
+ be_include/be_valuetype_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp
index 1715d29680f..05cc77d5def 100644
--- a/TAO/TAO_IDL/ast/ast_field.cpp
+++ b/TAO/TAO_IDL/ast/ast_field.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -78,8 +78,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * nodes and AST_UnionBranch nodes.
  */
 
-#include	"idl.h"
-#include	"idl_extern.h"
+#include        "idl.h"
+#include        "idl_extern.h"
 
 ACE_RCSID(ast, ast_field, "$Id$")
 
@@ -91,16 +91,17 @@ ACE_RCSID(ast, ast_field, "$Id$")
  * Default constructor
  */
 AST_Field::AST_Field()
-	 : pd_field_type(NULL)
+         : pd_field_type(NULL), pd_visibility (vis_NA)
 {
 }
 
 /*
  * To be used when constructing an AST_Field node
  */
-AST_Field::AST_Field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(AST_Decl::NT_field, n, p),
-	   pd_field_type(ft)
+AST_Field::AST_Field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p,
+                                            Visibility vis)
+         : AST_Decl(AST_Decl::NT_field, n, p),
+           pd_field_type(ft), pd_visibility (vis)
 {
 }
 
@@ -108,9 +109,9 @@ AST_Field::AST_Field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
  * To be used when constructing a node of a subclass of AST_Field
  */
 AST_Field::AST_Field(AST_Decl::NodeType nt, AST_Type *ft,
-		   UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(nt, n, p),
-	   pd_field_type(ft)
+                   UTL_ScopedName *n, UTL_StrList *p, Visibility vis)
+         : AST_Decl(nt, n, p),
+           pd_field_type(ft), pd_visibility (vis)
 {
 }
 
@@ -133,6 +134,15 @@ AST_Field::AST_Field(AST_Decl::NodeType nt, AST_Type *ft,
 void
 AST_Field::dump(ostream &o)
 {
+  switch (visibility())
+    {
+      case vis_PRIVATE:
+        o << "private ";
+        break;
+      case vis_PUBLIC:
+        o << "public ";
+        break;
+    }
   pd_field_type->local_name()->dump(o);
   o << " ";
   local_name()->dump(o);
@@ -148,6 +158,12 @@ AST_Field::field_type()
   return pd_field_type;
 }
 
+AST_Field::Visibility
+AST_Field::visibility()
+{
+  return pd_visibility;
+}
+
 /*
  * Narrowing methods
  */
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index b95c5151e00..0ff6f2f592e 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -142,10 +142,45 @@ AST_Generator::create_interface(UTL_ScopedName *n,
 AST_InterfaceFwd *
 AST_Generator::create_interface_fwd(UTL_ScopedName *n, UTL_StrList *p)
 {
-  return new AST_InterfaceFwd(n, p);
+  return new AST_InterfaceFwd (this->create_interface (n, 0, -1, p), n, p);
 }
 
 /*
+ * Create a be_valuetype node
+ */
+AST_Interface *
+AST_Generator::create_valuetype(UTL_ScopedName *n,
+                               AST_Interface **ih,
+                               long nih,
+                               UTL_StrList *p)
+{
+  // Valuetypes are represented as be_valuetype derived from be_interface,
+  // which derives from AST_Interface. If you construct a backend which
+  // utilizes only the AST_... classes, you must instantiate an object that
+  // returns true from AST_Interface::is_valuetype().
+  // (currently not implemented)
+  // Also invoke
+  // (AST_Module::narrow_from_scope (this->defined_in ()))->set_has_nested_valuetype ();
+
+  ACE_ASSERT (0);
+  return 0;
+}
+
+/*
+ * Create a be_valuetype_fwd node
+ */
+AST_InterfaceFwd *
+AST_Generator::create_valuetype_fwd(UTL_ScopedName *n, UTL_StrList *p)
+{
+  // see note in create_valuetype()
+  // dummy placeholder must return true from is_valuetype()
+
+  ACE_ASSERT (0);
+  return 0;
+}
+
+
+/*
  * Construct an AST_Exception node (an exception)
  */
 AST_Exception   *
@@ -188,9 +223,10 @@ AST_Generator::create_operation(AST_Type *rt,
  * Construct an AST_Field node (a field in a struct, union or exception)
  */
 AST_Field       *
-AST_Generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
+AST_Generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p,
+                                                  AST_Field::Visibility vis)
 {
-  return new AST_Field(ft, n, p);
+  return new AST_Field(ft, n, p, vis);
 }
 
 /*
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 66268ee9796..c8e1dc69352 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -75,8 +75,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * interfaces.
  */
 
-#include	"idl.h"
-#include	"idl_extern.h"
+#include        "idl.h"
+#include        "idl_extern.h"
 
 ACE_RCSID(ast, ast_interface, "$Id$")
 
@@ -90,9 +90,9 @@ AST_Interface::AST_Interface()
 }
 
 AST_Interface::AST_Interface(UTL_ScopedName *n,
-			     AST_Interface **ih,
-			     long nih,
-			     UTL_StrList *p)
+                             AST_Interface **ih,
+                             long nih,
+                             UTL_StrList *p)
   : AST_Decl(AST_Decl::NT_interface, n, p),
     UTL_Scope(AST_Decl::NT_interface),
     pd_inherits(ih),
@@ -108,6 +108,27 @@ AST_Interface::AST_Interface(UTL_ScopedName *n,
  * Public operations
  */
 
+idl_bool AST_Interface::is_abstract_interface ()
+{
+  return 0;
+}
+
+
+idl_bool AST_Interface::is_valuetype ()
+{
+  return 0;
+}
+
+
+idl_bool AST_Interface::is_abstract_valuetype ()
+{
+  return 0;
+}
+
+void AST_Interface::set_abstract_valuetype ()
+{
+  ACE_ASSERT (0);
+}
 
 /*
  * Redefinition of inherited virtual operations
@@ -242,6 +263,50 @@ AST_Attribute *AST_Interface::fe_add_attribute(AST_Attribute *t)
   return t;
 }
 
+
+/*
+ * Add this AST_Field node (a field declaration) to this scope
+ * (only for valuetypes)
+ */
+AST_Field *AST_Interface::fe_add_field(AST_Field *t)
+{
+#ifdef IDL_HAS_VALUETYPE
+  AST_Decl *d;
+  /*
+   * Already defined and cannot be redefined? Or already used?
+   */
+  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
+    if (!can_be_redefined(d)) {
+      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
+      return NULL;
+    }
+    if (referenced(d)) {
+      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
+      return NULL;
+    }
+    if (t->has_ancestor(d)) {
+      idl_global->err()->redefinition_in_scope(t, d);
+      return NULL;
+    }
+  }
+  /*
+   * Add it to scope
+   */
+  add_to_scope(t);
+  /*
+   * Add it to set of locally referenced symbols
+   */
+  add_to_referenced(t, I_FALSE);
+
+  return t;
+
+#else /* IDL_HAS_VALUETYPE */
+  ACE_ASSERT (0);
+  return 0;
+#endif /* IDL_HAS_VALUETYPE */
+}
+
+
 /*
  * Add an AST_Operation node (an operation declaration) to this scope
  */
@@ -552,9 +617,20 @@ AST_Native *AST_Interface::fe_add_native (AST_Native *t)
 void
 AST_Interface::dump(ostream &o)
 {
-  long	i;
+  long  i;
 
-  o << "interface ";
+  if (this->is_valuetype ())
+    {
+      if (this->is_abstract_valuetype ())
+        o << "abstract ";
+      o << "valuetype ";
+    }
+  else
+    {
+      if (this->is_abstract_interface ())
+        o << "abstract ";
+      o << "interface ";
+    }
   local_name()->dump(o);
   o << " ";
   if (pd_n_inherits > 0) {
@@ -562,7 +638,7 @@ AST_Interface::dump(ostream &o)
     for (i = 0; i < pd_n_inherits; i++) {
       pd_inherits[i]->local_name()->dump(o);
       if (i < pd_n_inherits - 1)
-	o << ", ";
+        o << ", ";
     }
   }
   o << " {\n";
@@ -571,11 +647,93 @@ AST_Interface::dump(ostream &o)
   o << "}";
 }
 
+void
+AST_Interface::fwd_redefinition_helper (AST_Interface *&i, UTL_Scope *s,
+                                                           UTL_StrList *p)
+{
+  AST_Decl        *d = NULL;
+  AST_Interface   *fd = NULL;
+
+  if (i != NULL &&
+      (d = s->lookup_by_name(i->name(), I_FALSE)) != NULL) {
+    /*
+     * See if we're defining a forward declared interface.
+     */
+    if (d->node_type() == AST_Decl::NT_interface) {
+      /*
+       * Narrow to an interface
+       */
+      fd = AST_Interface::narrow_from_decl(d);
+      /*
+       * Successful?
+       */
+      if (fd == NULL) {
+        /*
+         * Should we give an error here? ... no, look in fe_add_interface
+         */
+      }
+      /*
+       * If it is a forward declared interface..
+       */
+      else if (!fd->is_defined()) {
+        /*
+         * Check if redefining in same scope
+         */
+        if (fd->defined_in() != s) {
+          idl_global->err()
+             ->error3(UTL_Error::EIDL_SCOPE_CONFLICT,
+                      i,
+                      fd,
+                      ScopeAsDecl(s));
+        }
+        /*
+         * All OK, do the redefinition
+         */
+        else {
+#         ifdef IDL_HAS_VALUETYPE
+          /* only redefinition of the same kind */
+          if ((i->is_valuetype() != fd->is_valuetype()) ||
+              (i->is_abstract_valuetype() != fd->is_abstract_valuetype()) ||
+              (i->is_abstract_interface() != fd->is_abstract_interface()))
+          {
+             idl_global->err()->error2(UTL_Error::EIDL_REDEF, i, fd);
+             return;
+          }
+#         endif /* IDL_HAS_VALUETYPE */
+
+          fd->redefine (i, p);
+          /*
+           * Use full definition node
+           */
+          delete i;
+          i = fd;
+        }
+      }
+    }
+  }
+}
+
+
 /*
  * Data accessors
  */
 
-AST_Interface	**
+void
+AST_Interface::redefine (AST_Interface *from, UTL_StrList *p)
+{
+  this->set_inherits(from->inherits());
+  this->set_n_inherits(from->n_inherits());
+  /*
+   * Update place of definition
+   */
+  this->set_imported(idl_global->imported());
+  this->set_in_main_file(idl_global->in_main_file());
+  this->set_line(idl_global->lineno());
+  this->set_file_name(idl_global->filename());
+  this->add_pragmas(p);
+}
+
+AST_Interface   **
 AST_Interface::inherits()
 {
   return pd_inherits;
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
index 48d1bd4fe88..08cd2959c2a 100644
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -73,8 +73,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * encountered.
  */
 
-#include	"idl.h"
-#include	"idl_extern.h"
+#include        "idl.h"
+#include        "idl_extern.h"
 
 ACE_RCSID(ast, ast_interface_fwd, "$Id$")
 
@@ -82,19 +82,21 @@ ACE_RCSID(ast, ast_interface_fwd, "$Id$")
  * Constructor(s) and destructor
  */
 AST_InterfaceFwd::AST_InterfaceFwd()
-		: pd_full_definition(NULL)
+                : pd_full_definition(NULL)
 {
 }
 
-AST_InterfaceFwd::AST_InterfaceFwd(UTL_ScopedName *n, UTL_StrList *p)
-		 : AST_Decl(AST_Decl::NT_interface_fwd, n, p)
+AST_InterfaceFwd::AST_InterfaceFwd( AST_Interface *dummy,
+                                    UTL_ScopedName *n, UTL_StrList *p)
+                 : AST_Decl(AST_Decl::NT_interface_fwd, n, p)
 {
   /*
    * Create a dummy placeholder for the forward declared interface. This
    * interface node is not yet defined (n_inherits < 0), so some operations
    * will fail
    */
-  pd_full_definition = idl_global->gen()->create_interface(n, NULL, -1, p);
+  pd_full_definition = dummy;
+  // pd_full_definition = idl_global->gen()->create_interface(n, NULL, -1, p);
   /*
    * Record the node in a list to be checked after the entire AST has been
    * parsed. All nodes in the list must have n_inherits >= 0, else this
@@ -108,6 +110,31 @@ AST_InterfaceFwd::AST_InterfaceFwd(UTL_ScopedName *n, UTL_StrList *p)
  * Private operations
  */
 
+idl_bool AST_InterfaceFwd::is_abstract_interface ()
+{
+  return this->full_definition()->is_abstract_interface();
+}
+
+
+idl_bool AST_InterfaceFwd::is_valuetype ()
+{
+  return this->full_definition()->is_valuetype();
+}
+
+
+idl_bool AST_InterfaceFwd::is_abstract_valuetype ()
+{
+  return this->full_definition()->is_abstract_valuetype();
+}
+
+void AST_InterfaceFwd::set_abstract_valuetype ()
+{
+  // Don't forget about dummy placeholder ! (see constructor)
+  // (only if the be class isn't used)
+  ACE_ASSERT (0);
+}
+
+
 /*
  * Public operations
  */
@@ -122,7 +149,18 @@ AST_InterfaceFwd::AST_InterfaceFwd(UTL_ScopedName *n, UTL_StrList *p)
 void
 AST_InterfaceFwd::dump(ostream &o)
 {
-  o << "interface ";
+  if (this->is_valuetype ())
+    {
+      if (this->is_abstract_valuetype ())
+        o << "abstract ";
+      o << "valuetype ";
+    }
+  else
+    {
+      if (this->is_abstract_interface ())
+        o << "abstract ";
+      o << "interface ";
+    }
   local_name()->dump(o);
 }
 
@@ -130,7 +168,7 @@ AST_InterfaceFwd::dump(ostream &o)
  * Data accessors
  */
 
-AST_Interface	*
+AST_Interface   *
 AST_InterfaceFwd::full_definition()
 {
   return pd_full_definition;
@@ -140,10 +178,10 @@ void
 AST_InterfaceFwd::set_full_definition(AST_Interface *nfd)
 {
   pd_full_definition = nfd;
-}    
+}
 
 /*
- * Narrowing methods 
+ * Narrowing methods
  */
 IMPL_NARROW_METHODS1 (AST_InterfaceFwd, AST_Type)
 IMPL_NARROW_FROM_DECL (AST_InterfaceFwd)
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index 8bab07f277e..3002f691e7a 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -72,8 +72,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * of UTL_Scope.
  */
 
-#include	"idl.h"
-#include	"idl_extern.h"
+#include        "idl.h"
+#include        "idl_extern.h"
 
 ACE_RCSID(ast, ast_module, "$Id$")
 
@@ -85,8 +85,9 @@ AST_Module::AST_Module()
 }
 
 AST_Module::AST_Module(UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(AST_Decl::NT_module, n, p),
-	   UTL_Scope(AST_Decl::NT_module)
+         : AST_Decl(AST_Decl::NT_module, n, p),
+           UTL_Scope(AST_Decl::NT_module),
+           pd_has_nested_valuetype (0)
 {
 }
 
@@ -187,8 +188,8 @@ AST_Module *AST_Module::fe_add_module(AST_Module *t)
  */
 AST_Interface *AST_Module::fe_add_interface(AST_Interface *t)
 {
-  AST_Decl		*predef;
-  AST_Interface		*fwd;
+  AST_Decl              *predef;
+  AST_Interface         *fwd;
 
   /*
    * Already defined?
@@ -203,11 +204,11 @@ AST_Interface *AST_Module::fe_add_interface(AST_Interface *t)
       if (fwd == NULL)
           return NULL;
 
-      if (!fwd->is_defined()) {	/* Forward declared and not defined yet */
-	if (fwd->defined_in() != this) {
-	  idl_global->err()
-	     ->error3(UTL_Error::EIDL_SCOPE_CONFLICT, fwd, t, this);
-	  return NULL;
+      if (!fwd->is_defined()) { /* Forward declared and not defined yet */
+        if (fwd->defined_in() != this) {
+          idl_global->err()
+             ->error3(UTL_Error::EIDL_SCOPE_CONFLICT, fwd, t, this);
+          return NULL;
         }
       }
       /*
@@ -216,7 +217,7 @@ AST_Interface *AST_Module::fe_add_interface(AST_Interface *t)
        */
       else if (referenced(predef)) {
         idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, predef);
-	return NULL;
+        return NULL;
       }
     } else if (!can_be_redefined(predef)) {
       idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, predef);
@@ -247,20 +248,21 @@ AST_Interface *AST_Module::fe_add_interface(AST_Interface *t)
  */
 AST_InterfaceFwd *AST_Module::fe_add_interface_fwd(AST_InterfaceFwd *i)
 {
-  AST_Decl	*d;
-  AST_Interface	*itf;
+  AST_Decl      *d;
+  AST_Interface *itf;
 
   /*
    * Already defined and cannot be redefined? Or already used?
    */
   if ((d = lookup_for_add(i, I_FALSE)) != NULL) {
     if (d->node_type() == AST_Decl::NT_interface &&
-	d->defined_in() == this) {
+        d->defined_in() == this) {
       itf = AST_Interface::narrow_from_decl(d);
       if (itf == NULL)
           return NULL;
 
-      i->set_full_definition(itf);
+      // %! redefinition of forward; type check not implemented
+      i->set_full_definition(itf);   //%! memory leak
       return i;
     }
     if (!can_be_redefined(d)) {
@@ -593,6 +595,29 @@ AST_Module::dump(ostream &o)
   o << "}";
 }
 
+
+// involved in OBV_ namespace generation
+void
+AST_Module::set_has_nested_valuetype ()
+{
+#ifdef IDL_HAS_VALUETYPE
+  UTL_Scope *parent;
+  if (!pd_has_nested_valuetype && (parent = this->defined_in()))
+    {
+      AST_Module *pm = AST_Module::narrow_from_scope (parent);
+      if (pm)
+        pm->set_has_nested_valuetype ();
+    }
+  pd_has_nested_valuetype = 1;
+#endif /* IDL_HAS_VALUETYPE */
+}
+
+idl_bool
+AST_Module::has_nested_valuetype ()
+{
+  return pd_has_nested_valuetype;
+}
+
 /*
  * Narrowing methods
  */
diff --git a/TAO/TAO_IDL/be/be_args.cpp b/TAO/TAO_IDL/be/be_args.cpp
index ae99845193c..bc7e9386273 100644
--- a/TAO/TAO_IDL/be/be_args.cpp
+++ b/TAO/TAO_IDL/be/be_args.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -66,9 +66,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // be_args.cc - Collect command line arguments for the BE
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 ACE_RCSID(be, be_args, "$Id$")
 
@@ -82,6 +82,9 @@ BE_prep_arg(char *s, idl_bool)
 {
   const char arg_macro[]="export_macro=";
   const char arg_include[]="export_include=";
+#ifdef IDL_HAS_VALUETYPE
+  const char obv_opt_accessor[]="obv_opt_accessor";
+#endif IDL_HAS_VALUETYPE
 
   char* last = 0;
   for (char* arg = ACE_OS::strtok_r (s, ",", &last);
@@ -89,21 +92,27 @@ BE_prep_arg(char *s, idl_bool)
        arg = ACE_OS::strtok_r (0, ",", &last))
     {
       if (ACE_OS::strstr (arg, arg_macro) == arg)
-	{
-	  char* val = arg + sizeof (arg_macro) - 1;
-	  idl_global->export_macro (val);
-	}
+        {
+          char* val = arg + sizeof (arg_macro) - 1;
+          idl_global->export_macro (val);
+        }
       else if (ACE_OS::strstr (arg, arg_include) == arg)
-	{
-	  char* val = arg + sizeof (arg_include) - 1;
-	  idl_global->export_include (val);
-	}
+        {
+          char* val = arg + sizeof (arg_include) - 1;
+          idl_global->export_include (val);
+        }
+#  ifdef IDL_HAS_VALUETYPE
+      else if (ACE_OS::strstr (arg, obv_opt_accessor) == arg)
+        {
+          idl_global->obv_opt_accessor (1);
+        }
+#  endif IDL_HAS_VALUETYPE
       else
-	{
-	  cerr << idl_global->prog_name ()
-	       << ": invalid or unknown argument <"
-	       << arg
-	       << "> to back end\n";
-	}
+        {
+          cerr << idl_global->prog_name ()
+               << ": invalid or unknown argument <"
+               << arg
+               << "> to back end\n";
+        }
     }
 }
diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp
index 60844f6898a..8ecf2c88468 100644
--- a/TAO/TAO_IDL/be/be_field.cpp
+++ b/TAO/TAO_IDL/be/be_field.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 ACE_RCSID(be, be_field, "$Id$")
 
@@ -31,8 +31,9 @@ ACE_RCSID(be, be_field, "$Id$")
 be_field::be_field (void)
 {
 }
-be_field::be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Field (ft, n, p),
+
+be_field::be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p, Visibility vis)
+  : AST_Field (ft, n, p, vis),
     AST_Decl (AST_Decl::NT_field, n, p)
 {
 }
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index 60d53081ba6..a2ca138d2ad 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -143,7 +143,40 @@ be_generator::create_interface(UTL_ScopedName *n,
 AST_InterfaceFwd *
 be_generator::create_interface_fwd(UTL_ScopedName *n, UTL_StrList *p)
 {
-  return (AST_InterfaceFwd *) new be_interface_fwd(n, p);
+  return (AST_InterfaceFwd *) new be_interface_fwd(this->create_interface (n, 0, -1, p),
+                                                                                  n, p);
+}
+
+/*
+ * Create a be_valuetype node
+ */
+AST_Interface *
+be_generator::create_valuetype(UTL_ScopedName *n,
+                               AST_Interface **ih,
+                               long nih,
+                               UTL_StrList *p)
+{
+#ifdef IDL_HAS_VALUETYPE
+  return (AST_Interface *) new be_valuetype(n, ih, nih, p);
+#else
+  ACE_ASSERT (0);
+  return 0;
+#endif /* IDL_HAS_VALUETYPE */
+}
+
+/*
+ * Create a be_valuetype_fwd node
+ */
+AST_InterfaceFwd *
+be_generator::create_valuetype_fwd(UTL_ScopedName *n, UTL_StrList *p)
+{
+#ifdef IDL_HAS_VALUETYPE
+  return (AST_InterfaceFwd *) new be_valuetype_fwd(this->create_valuetype (n, 0, -1, p),
+                                                                                  n, p);
+#else
+  ACE_ASSERT (0);
+  return 0;
+#endif /* IDL_HAS_VALUETYPE */
 }
 
 /*
@@ -189,9 +222,10 @@ be_generator::create_operation(AST_Type *rt,
  * Create a BE_Field node
  */
 AST_Field *
-be_generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
+be_generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p,
+                                                 AST_Field::Visibility vis)
 {
-  return (AST_Field *) new be_field(ft, n, p);
+  return (AST_Field *) new be_field(ft, n, p, vis);
 }
 
 /*
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 01fe8ebcc01..35a1dd9211a 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -172,7 +172,13 @@ be_interface::local_coll_name (void) const
 void
 be_interface::compute_fullskelname (void)
 {
-  if (full_skel_name_)
+  this->compute_fullskelname (this->full_skel_name_, "POA_");
+}
+
+void
+be_interface::compute_fullskelname (char *&skelname, const char *prefix)
+{
+  if (skelname)
     return;
   else
     {
@@ -182,7 +188,7 @@ be_interface::compute_fullskelname (void)
       long second = I_FALSE;
 
       // in the first loop compute the total length
-      namelen = 4;
+      namelen = ACE_OS::strlen (prefix);
       i = new UTL_IdListActiveIterator (this->name ());
       while (!(i->is_done ()))
         {
@@ -205,20 +211,20 @@ be_interface::compute_fullskelname (void)
         }
       delete i;
 
-      this->full_skel_name_ = new char [namelen+1];
-      this->full_skel_name_[0] = '\0';
+      skelname = new char [namelen+1];
+      skelname[0] = '\0';
       first = I_TRUE;
       second = I_FALSE;
-      ACE_OS::strcat (this->full_skel_name_, "POA_");
+      ACE_OS::strcat (skelname, prefix);
       i = new UTL_IdListActiveIterator (this->name ());
       while (!(i->is_done ()))
         {
           if (!first)
-            ACE_OS::strcat (this->full_skel_name_, "::");
+            ACE_OS::strcat (skelname, "::");
           else if (second)
             first = second = I_FALSE;
           // print the identifier
-          ACE_OS::strcat (this->full_skel_name_, i->item ()->get_string ());
+          ACE_OS::strcat (skelname, i->item ()->get_string ());
           if (first)
             {
               if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
@@ -1235,7 +1241,7 @@ be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen,
   // insert ourselves in the Queue
   if (queue.enqueue_tail (this) == -1)
     {
-      ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_interface::gen_operation_table - "
+      ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_interface::traverse_inheritance_graph - "
                          "error generating entries\n"), -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp
index 75bc5b02e0e..2083c4c2925 100644
--- a/TAO/TAO_IDL/be/be_interface_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 ACE_RCSID(be, be_interface_fwd, "$Id$")
 
@@ -34,13 +34,18 @@ be_interface_fwd::be_interface_fwd (void)
   this->size_type (be_decl::VARIABLE); // always the case
 }
 
-be_interface_fwd::be_interface_fwd (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_InterfaceFwd (n, p),
+be_interface_fwd::be_interface_fwd (AST_Interface *dummy,
+                                    UTL_ScopedName *n, UTL_StrList *p)
+  : AST_InterfaceFwd (dummy, n, p),
     AST_Decl (AST_Decl::NT_interface_fwd, n, p)
 {
   this->size_type (be_decl::VARIABLE); // always the case
 }
 
+be_interface_fwd::~be_interface_fwd (void)
+{
+}
+
 // generate the var definition
 int
 be_interface_fwd::gen_var_defn (void)
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
new file mode 100644
index 00000000000..fb293ed2776
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -0,0 +1,726 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_valuetype.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Interface and be_interface that provides
+//    additional means for C++ mapping of an valuetype.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_interface.cpp
+//
+// ============================================================================
+
+
+#include "idl.h"
+#include "idl_extern.h"
+// #include "be_visitor_valuetype.h"
+#include "be.h"
+
+#ifdef IDL_HAS_VALUETYPE
+
+ACE_RCSID(be, be_valuetype, "$Id$")
+
+/*
+ * BE_Valuetype
+ */
+
+// default constructor
+be_valuetype::be_valuetype (void)
+  : full_obv_skel_name_ (0),
+    abstract_ (0)
+{
+  this->size_type (be_decl::VARIABLE); // always the case
+  (AST_Module::narrow_from_scope (this->defined_in ()))->set_has_nested_valuetype ();
+}
+
+// constructor used to build the AST
+be_valuetype::be_valuetype (UTL_ScopedName *n, AST_Interface **ih, long nih,
+                            UTL_StrList *p, idl_bool set_abstract)
+  : be_interface (n, ih, nih, p),
+    AST_Interface (n, ih, nih, p),
+    AST_Decl (AST_Decl::NT_interface, n, p), // its like an interface
+    UTL_Scope (AST_Decl::NT_interface),
+    full_obv_skel_name_ (0),
+    abstract_ (set_abstract)
+{
+  // check that redefine() copy all members !
+  // ---
+  this->size_type (be_decl::VARIABLE); // always the case
+  (AST_Module::narrow_from_scope (this->defined_in ()))->set_has_nested_valuetype ();
+}
+
+be_valuetype::~be_valuetype (void)
+{
+
+}
+
+void
+be_valuetype::redefine (be_valuetype *from, UTL_StrList *p)
+{
+  this->AST_Interface::redefine (from,p);
+  abstract_ = from->is_abstract_valuetype();
+}
+
+// Is true if no-virtual accessor and modifier should be generated
+// If #pragma TAO OBV opt_accessor (todo) is used or -Wb,obv_opt_accessor
+idl_bool
+be_valuetype::opt_accessor ()
+{
+  return idl_global->obv_opt_accessor ();
+}
+
+idl_bool
+be_valuetype::is_valuetype ()
+{
+  return 1;
+}
+
+idl_bool
+be_valuetype::is_abstract_valuetype ()
+{
+  return abstract_;
+}
+
+void
+be_valuetype::set_abstract_valuetype ()
+{
+  abstract_ = 1;
+};
+
+// compute stringified fully scoped skeleton name (OBV_name)
+void
+be_valuetype::compute_fullobvskelname (void)
+{
+  this->compute_fullskelname (this->full_obv_skel_name_, "OBV_");
+}
+
+
+// retrieve the fully scoped skeleton name
+const char*
+be_valuetype::full_obv_skel_name (void)
+{
+  if (!this->full_obv_skel_name_)
+    compute_fullobvskelname ();
+
+  return this->full_obv_skel_name_;
+}
+
+
+
+// generate the var definition
+int
+be_valuetype::gen_var_defn (void)
+{
+  TAO_OutStream *ch; // output stream
+  TAO_NL  nl;        // end line
+  char namebuf [NAMEBUFSIZE];  // names
+
+  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
+
+  // retrieve a singleton instance of the code generator
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  ch = cg->client_header ();
+
+  // generate the var definition (always in the client header).
+  // Depending upon the data type, there are some differences which we account
+  // for over here.
+
+  ch->indent (); // start with whatever was our current indent level
+  *ch << "class " << idl_global->export_macro ()
+      << " " << namebuf << nl;
+  *ch << "{" << nl;
+  *ch << "public:\n";
+  ch->incr_indent ();
+
+  // default constr
+  *ch << namebuf << " (void); // default constructor" << nl;
+  *ch << namebuf << " (" << local_name () << "*);" << nl;
+  *ch << namebuf << " (const " << local_name () << "*); // (TAO extension)" << nl;
+
+  // copy constructor
+  *ch << namebuf << " (const " << namebuf <<
+    " &); // copy constructor" << nl;
+
+  // destructor
+  *ch << "~" << namebuf << " (void); // destructor" << nl;
+  *ch << nl;
+
+  // assignment operator from a pointer
+  *ch << namebuf << " &operator= (" << local_name () << "*);" << nl;
+
+  // assignment from _var
+  *ch << namebuf << " &operator= (const " << namebuf <<
+    " &);" << nl;
+
+  // arrow operator
+  *ch << local_name () << "* operator-> (void) const;" << nl;
+
+  *ch << nl;
+
+  // other extra types (cast operators, [] operator, and others)
+  *ch << "operator const " << local_name () << "* () const;" << nl;
+  *ch << "operator " << local_name () << "* ();" << nl;
+
+/* %! &() or () ?
+  *ch << "operator const " << local_name () << "* &() const;" << nl;
+  *ch << "operator " << local_name () << "* &();" << nl;
+*/
+  *ch << "// in, inout, out, _retn " << nl;
+  // the return types of in, out, inout, and _retn are based on the parameter
+  // passing rules and the base type
+  *ch << local_name () << "* in (void) const;" << nl;
+  *ch << local_name () << "* &inout (void);" << nl;
+  *ch << local_name () << "* &out (void);" << nl;
+  *ch << local_name () << "* _retn (void);" << nl;
+
+  // generate an additional member function that returns the underlying pointer
+  *ch << local_name () << "* ptr (void) const;\n";
+
+  *ch << "\n";
+  ch->decr_indent ();
+
+  // private
+  *ch << "private:\n";
+  ch->incr_indent ();
+  *ch << local_name () << "* ptr_;\n";
+
+  ch->decr_indent ();
+  *ch << "};\n\n";
+
+  return 0;
+}
+
+// implementation of the _var class. All of these get generated in the inline
+// file
+int
+be_valuetype::gen_var_impl (void)
+{
+  TAO_OutStream *ci; // output stream
+  TAO_NL  nl;        // end line
+  char fname [NAMEBUFSIZE];  // to hold the full and
+  char lname [NAMEBUFSIZE];  // local _var names
+
+  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
+
+  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
+
+  // retrieve a singleton instance of the code generator
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  ci = cg->client_inline ();
+
+  // generate the var implementation in the inline file
+  // Depending upon the data type, there are some differences which we account
+  // for over here.
+
+  ci->indent (); // start with whatever was our current indent level
+
+  *ci << "// *************************************************************"
+      << nl;
+  *ci << "// Inline operations for class " << fname << nl;
+  *ci << "// *************************************************************\n\n";
+
+  // default constr
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname <<
+    " (void) // default constructor" << nl;
+  *ci << "  " << ": ptr_ (0)" << nl;
+  *ci << "{}\n\n";
+
+  // constr from a pointer
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (" << name () << "* p)" << nl;
+  *ci << "  : ptr_ (p)" << nl;
+  *ci << "{}\n\n";
+
+  // constr from a const pointer
+  // TAO extension - it appears that there are problems with at least g++
+  // which reclaims amguity between T(T*) and T(const T_var &)
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (const " << name () << "* p)" << nl;
+  *ci << "  : ptr_ (ACE_const_cast(" << name() << "*, p))" << nl;
+  *ci << "{}\n\n";
+
+  // the additional ptr () member function. This member function must be
+  // defined before the remaining member functions including the copy
+  // constructor because this inline function is used elsewhere. Hence to make
+  // inlining of this function possible, we must define it before its use.
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "* " << nl;
+  *ci << fname << "::ptr (void) const" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // copy constructor
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (const " << fname <<
+    " &p) // copy constructor" << nl;
+  *ci << "{" << be_idt_nl
+      <<    "CORBA::add_ref (p.ptr ());" << be_nl
+      <<    "this->ptr_ = p.ptr ();" << be_uidt_nl
+      << "}\n\n";
+
+  // destructor
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "CORBA::remove_ref (this->ptr_);\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // assignment operator
+  ci->indent ();
+  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << "::operator= (" << name () <<
+    "* p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "CORBA::remove_ref (this->ptr_);" << nl;
+  *ci << "this->ptr_ = p;" << nl;
+  *ci << "return *this;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // assignment operator from _var
+  ci->indent ();
+  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << "::operator= (const " << fname <<
+    " &p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "if (this != &p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "CORBA::remove_ref (this->ptr_);" << nl
+      << local_name() << "* tmp = p.ptr ();" << be_nl
+      << "CORBA::add_ref (tmp);" << be_nl
+      << "this->ptr_ = tmp;\n";
+  ci->decr_indent ();
+  *ci << "}" << nl;
+  *ci << "return *this;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // other extra methods - cast operator ()
+  ci->indent ();
+  *ci << "ACE_INLINE " << nl;
+  *ci << fname << "::operator const " << name () <<
+    "* () const // cast" << nl;  // %! &() ?
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  ci->indent ();
+  *ci << "ACE_INLINE " << nl;
+  *ci << fname << "::operator " << name () << "* () // cast " << nl;  // %! &()?
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // operator->
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "* " << nl;
+  *ci << fname << "::operator-> (void) const" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // in, inout, out, and _retn
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "*" << nl;
+  *ci << fname << "::in (void) const" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "* &" << nl;
+  *ci << fname << "::inout (void)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "* &" << nl;
+  *ci << fname << "::out (void)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "CORBA::remove_ref (this->ptr_);" << nl;
+  *ci << "this->ptr_ = 0;" << nl;
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "* " << nl;
+  *ci << fname << "::_retn (void)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "// yield ownership of managed obj reference" << nl;
+  *ci << local_name () << "* tmp = this->ptr_;" << nl;
+  *ci << "this->ptr_ = 0;" << nl;
+  *ci << "return tmp;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  return 0;
+}
+
+// generate the _out definition
+int
+be_valuetype::gen_out_defn (void)
+{
+  TAO_OutStream *ch; // output stream
+  TAO_NL  nl;        // end line
+  char namebuf [NAMEBUFSIZE];  // to hold the _out name
+
+  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
+
+  // retrieve a singleton instance of the code generator
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  ch = cg->client_header ();
+
+  // generate the out definition (always in the client header)
+  ch->indent (); // start with whatever was our current indent level
+
+  *ch << "class " << idl_global->export_macro ()
+      << " " << namebuf << nl;
+  *ch << "{" << nl;
+  *ch << "public:\n";
+  ch->incr_indent ();
+
+  // No default constructor
+
+  // constructor from a pointer
+  *ch << namebuf << " (" << local_name () << "* &);" << nl;
+  // constructor from a _var &
+  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
+  // constructor from a _out &
+  *ch << namebuf << " (const " << namebuf << " &);" << nl;
+  // assignment operator from a _out &
+  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
+  // assignment operator from a pointer &, cast operator, ptr fn, operator
+  // -> and any other extra operators
+  // only interface allows assignment from var &
+  *ch << namebuf << " &operator= (const " << local_name () << "_var &);" << nl;
+  *ch << namebuf << " &operator= (" << local_name () << "*);" << nl;
+  // cast
+  *ch << "operator " << local_name () << "* &();" << nl;
+  // ptr fn
+  *ch << local_name () << "* &ptr (void);" << nl;
+  // operator ->
+  *ch << local_name () << "* operator-> (void);" << nl;
+
+  *ch << "\n";
+  ch->decr_indent ();
+  *ch << "private:\n";
+  ch->incr_indent ();
+  *ch << local_name () << "* &ptr_;\n";
+
+  ch->decr_indent ();
+  *ch << "};\n\n";
+  return 0;
+}
+
+int
+be_valuetype::gen_out_impl (void)
+{
+  TAO_OutStream *ci; // output stream
+  TAO_NL  nl;        // end line
+  char fname [NAMEBUFSIZE];  // to hold the full and
+  char lname [NAMEBUFSIZE];  // local _out names
+
+  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
+
+  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
+
+  // retrieve a singleton instance of the code generator
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  ci = cg->client_inline ();
+
+  // generate the var implementation in the inline file
+  // Depending upon the data type, there are some differences which we account
+  // for over here.
+
+  ci->indent (); // start with whatever was our current indent level
+
+  *ci << "// *************************************************************"
+      << nl;
+  *ci << "// Inline operations for class " << fname << nl;
+  *ci << "// *************************************************************\n\n";
+
+      // constr from a pointer
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (" << name () << "* &p)" << nl;
+  *ci << "  : ptr_ (p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "this->ptr_ = 0;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // constructor from _var &
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (" << this->name () <<
+    "_var &p) // constructor from _var" << nl;
+  *ci << "  : ptr_ (p.out ())" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "CORBA::remove_ref (this->ptr_);" << nl;
+  *ci << "this->ptr_ = 0;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // copy constructor
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (const " << fname <<
+    " &p) // copy constructor" << nl;
+  *ci << "  : ptr_ (ACE_const_cast (" << fname << "&,p).ptr_)" << nl;
+  *ci << "{}\n\n";
+
+      // assignment operator from _out &
+  ci->indent ();
+  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << "::operator= (const " << fname <<
+    " &p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "this->ptr_ = ACE_const_cast (" << fname << "&,p).ptr_;" << nl;
+  *ci << "return *this;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+      // assignment operator from _var
+  ci->indent ();
+  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << "::operator= (const " << this->name () <<
+    "_var &p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << local_name() << "* tmp = p.ptr ();" << be_nl
+      << "CORBA::add_ref (tmp);" << be_nl
+      << "this->ptr_ = tmp;" << be_nl;
+  *ci << "return *this;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+      // assignment operator from *
+  ci->indent ();
+  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << "::operator= (" << this->name () <<
+    "* p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "this->ptr_ = p;" << nl;
+  *ci << "return *this;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+      // other extra methods - cast operator ()
+  ci->indent ();
+  *ci << "ACE_INLINE " << nl;
+  *ci << fname << "::operator " << this->name () <<
+    "* &() // cast" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // ptr function
+  ci->indent ();
+  *ci << "ACE_INLINE " << this->name () << "* &" << nl;
+  *ci << fname << "::ptr (void) // ptr" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+      // operator->
+  ci->indent ();
+  *ci << "ACE_INLINE " << this->name () << "* " << nl;
+  *ci << fname << "::operator-> (void)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  return 0;
+}
+
+// generate typecode.
+// Typecode for interface comprises the enumerated value followed by the
+// encapsulation of the parameters
+
+int
+be_valuetype::gen_typecode (void)
+{
+  ACE_ASSERT(0);
+
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "CORBA::tk_objref, // typecode kind" << nl;
+  *cs << this->tc_encap_len () << ", // encapsulation length\n";
+  // now emit the encapsulation
+  return this->gen_encapsulation ();
+}
+
+// generate encapsulation
+// An encapsulation for ourselves will be necessary when we are part of some
+// other IDL type and a typecode for that other type is being generated. This
+// will comprise our typecode kind. IDL types with parameters will additionally
+// have the encapsulation length and the entire typecode description
+int
+be_valuetype::gen_encapsulation (void)
+{
+  ACE_ASSERT (0);
+
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  long i, arrlen;
+  ACE_UINT32 *arr;
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  // XXXASG - byte order must be based on what m/c we are generating code -
+  // TODO
+  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
+  // generate repoID
+  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
+  (void)this->tc_name2long (this->repoID (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // repository ID = " << this->repoID () << nl;
+  // generate name
+  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // name = " << this->local_name () << ",\n";
+
+  return 0;
+}
+
+// compute size of typecode
+long
+be_valuetype::tc_size (void)
+{
+  ACE_ASSERT (0);
+
+   return 4 + 4 + this->tc_encap_len ();
+}
+
+// compute the encapsulation length
+long
+be_valuetype::tc_encap_len (void)
+{
+  ACE_ASSERT (0);
+
+  if (this->encap_len_ == -1) // not computed yet
+    {
+      long slen;
+
+      // Macro to avoid "warning: unused parameter" type warning.
+      ACE_UNUSED_ARG (slen);
+
+      this->encap_len_ = 4;  // holds the byte order flag
+
+      this->encap_len_ += this->repoID_encap_len (); // for repoID
+
+      // do the same thing for the local name
+      this->encap_len_ += this->name_encap_len ();
+
+    }
+  return this->encap_len_;
+}
+
+// for building the pre and postfix of private data fields
+const char*
+be_valuetype::field_pd_prefix ()
+{
+  return "_pd_";
+}
+
+const char*
+be_valuetype::field_pd_postfix ()
+{
+  return "";
+}
+
+be_valuetype*
+be_valuetype::statefull_inherit ()
+{
+  be_valuetype *rval;
+  if (this->n_inherits () > 0)
+    {
+      rval = be_valuetype::narrow_from_decl (this->inherits ()[0]);
+      if (rval && (rval->is_valuetype ()) && (!rval->is_abstract_valuetype ()))
+        return rval;
+    }
+  return 0;
+}
+
+// accept a visitor
+int
+be_valuetype::accept (be_visitor *visitor)
+{
+  return visitor->visit_valuetype (this);
+}
+
+// Narrowing
+IMPL_NARROW_METHODS1 (be_valuetype, be_interface)
+IMPL_NARROW_FROM_DECL (be_valuetype)
+IMPL_NARROW_FROM_SCOPE (be_valuetype)
+
+#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
new file mode 100644
index 00000000000..843b8c24a1d
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
@@ -0,0 +1,529 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_valuetype_fwd.h
+//
+// = DESCRIPTION
+//    Extension of class be_interface_fwd that provides additional
+//    means for C++ mapping of an valuetype.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//    changed for valuetypes by Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#ifdef IDL_HAS_VALUETYPE
+
+ACE_RCSID(be, be_interface_fwd, "$Id$")
+
+/*
+ * BE_ValuetypeFwd
+ */
+
+
+be_valuetype_fwd::be_valuetype_fwd (void)
+{
+}
+
+be_valuetype_fwd::be_valuetype_fwd (AST_Interface *dummy,
+                                    UTL_ScopedName *n, UTL_StrList *p)
+  : be_interface_fwd (dummy, n, p),
+    AST_InterfaceFwd (dummy, n, p),
+    AST_Decl (AST_Decl::NT_interface_fwd, n, p)
+{
+}
+
+be_valuetype_fwd::~be_valuetype_fwd (void)
+{
+}
+
+
+void
+be_valuetype_fwd::set_abstract_valuetype ()
+{
+  this->full_definition()->set_abstract_valuetype();
+};
+
+// generate the var definition
+int
+be_valuetype_fwd::gen_var_defn (void)
+{
+  ACE_ASSERT (0);
+  TAO_OutStream *ch; // output stream
+  TAO_NL  nl;        // end line
+  char namebuf [NAMEBUFSIZE];  // names
+
+  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
+
+  // retrieve a singleton instance of the code generator
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  ch = cg->client_header ();
+
+  // generate the var definition (always in the client header).
+  // Depending upon the data type, there are some differences which we account
+  // for over here.
+
+  ch->indent (); // start with whatever was our current indent level
+  *ch << "class " << idl_global->export_macro ()
+      << " " << namebuf << nl;
+  *ch << "{" << nl;
+  *ch << "public:\n";
+  ch->incr_indent ();
+
+  // default constr
+  *ch << namebuf << " (void); // default constructor" << nl;
+  *ch << namebuf << " (" << local_name () << "_ptr);" << nl;
+
+  // copy constructor
+  *ch << namebuf << " (const " << namebuf <<
+    " &); // copy constructor" << nl;
+
+  // destructor
+  *ch << "~" << namebuf << " (void); // destructor" << nl;
+  *ch << nl;
+
+  // assignment operator from a pointer
+  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
+
+  // assignment from _var
+  *ch << namebuf << " &operator= (const " << namebuf <<
+    " &);" << nl;
+
+  // arrow operator
+  *ch << local_name () << "_ptr operator-> (void) const;" << nl;
+
+  *ch << nl;
+
+  // other extra types (cast operators, [] operator, and others)
+  *ch << "operator const " << local_name () << "_ptr &() const;" << nl;
+  *ch << "operator " << local_name () << "_ptr &();" << nl;
+
+  *ch << "// in, inout, out, _retn " << nl;
+  // the return types of in, out, inout, and _retn are based on the parameter
+  // passing rules and the base type
+  *ch << local_name () << "_ptr in (void) const;" << nl;
+  *ch << local_name () << "_ptr &inout (void);" << nl;
+  *ch << local_name () << "_ptr &out (void);" << nl;
+  *ch << local_name () << "_ptr _retn (void);" << nl;
+
+  // generate an additional member function that returns the underlying pointer
+  *ch << local_name () << "_ptr ptr (void) const;\n";
+
+  *ch << "\n";
+  ch->decr_indent ();
+
+  // private
+  *ch << "private:\n";
+  ch->incr_indent ();
+  *ch << local_name () << "_ptr ptr_;\n";
+
+  ch->decr_indent ();
+  *ch << "};\n\n";
+
+  return 0;
+}
+
+// implementation of the _var class. All of these get generated in the inline
+// file
+int
+be_valuetype_fwd::gen_var_impl (void)
+{
+  ACE_ASSERT (0);
+  TAO_OutStream *ci; // output stream
+  TAO_NL  nl;        // end line
+  char fname [NAMEBUFSIZE];  // to hold the full and
+  char lname [NAMEBUFSIZE];  // local _var names
+
+  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
+
+  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
+
+  // retrieve a singleton instance of the code generator
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  ci = cg->client_inline ();
+
+  // generate the var implementation in the inline file
+  // Depending upon the data type, there are some differences which we account
+  // for over here.
+
+  ci->indent (); // start with whatever was our current indent level
+
+  *ci << "// *************************************************************"
+      << nl;
+  *ci << "// Inline operations for class " << fname << nl;
+  *ci << "// *************************************************************\n\n";
+
+  // default constr
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname <<
+    " (void) // default constructor" << nl;
+  *ci << "  " << ": ptr_ (" << this->name () << "::_nil ())" << nl;
+  *ci << "{}\n\n";
+
+  // constr from a _ptr
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (" << name () << "_ptr p)" << nl;
+  *ci << "  : ptr_ (p)" << nl;
+  *ci << "{}\n\n";
+
+  // the additional ptr () member function. This member function must be
+  // defined before the remaining member functions including the copy
+  // constructor because this inline function is used elsewhere. Hence to make
+  // inlining of this function possible, we must define it before its use.
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
+  *ci << fname << "::ptr (void) const" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // copy constructor
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (const " << fname <<
+    " &p) // copy constructor" << nl;
+  *ci << "  : ptr_ (" << name () << "::_duplicate (p.ptr ()))" << nl;
+  *ci << "{}\n\n";
+
+  // destructor
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "CORBA::release (this->ptr_);\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // assignment operator
+  ci->indent ();
+  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << "::operator= (" << name () <<
+    "_ptr p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "CORBA::release (this->ptr_);" << nl;
+  *ci << "this->ptr_ = p;" << nl;
+  *ci << "return *this;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // assignment operator from _var
+  ci->indent ();
+  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << "::operator= (const " << fname <<
+    " &p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "if (this != &p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "CORBA::release (this->ptr_);" << nl;
+  *ci << "this->ptr_ = " << name () << "::_duplicate (p.ptr ());\n";
+  ci->decr_indent ();
+  *ci << "}" << nl;
+  *ci << "return *this;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // other extra methods - cast operator ()
+  ci->indent ();
+  *ci << "ACE_INLINE " << nl;
+  *ci << fname << "::operator const " << name () <<
+    "_ptr &() const // cast" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  ci->indent ();
+  *ci << "ACE_INLINE " << nl;
+  *ci << fname << "::operator " << name () << "_ptr &() // cast " << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // operator->
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
+  *ci << fname << "::operator-> (void) const" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // in, inout, out, and _retn
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "_ptr" << nl;
+  *ci << fname << "::in (void) const" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
+  *ci << fname << "::inout (void)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
+  *ci << fname << "::out (void)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "CORBA::release (this->ptr_);" << nl;
+  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
+  *ci << fname << "::_retn (void)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "// yield ownership of managed obj reference" << nl;
+  *ci << this->name () << "_ptr val = this->ptr_;" << nl;
+  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
+  *ci << "return val;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  return 0;
+}
+
+// generate the _out definition
+int
+be_valuetype_fwd::gen_out_defn (void)
+{
+  ACE_ASSERT (0);
+  TAO_OutStream *ch; // output stream
+  TAO_NL  nl;        // end line
+  char namebuf [NAMEBUFSIZE];  // to hold the _out name
+
+  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
+
+  // retrieve a singleton instance of the code generator
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  ch = cg->client_header ();
+
+  // generate the out definition (always in the client header)
+  ch->indent (); // start with whatever was our current indent level
+
+  *ch << "class " << idl_global->export_macro ()
+      << " " << namebuf << nl;
+  *ch << "{" << nl;
+  *ch << "public:\n";
+  ch->incr_indent ();
+
+  // No default constructor
+
+  // constructor from a pointer
+  *ch << namebuf << " (" << local_name () << "_ptr &);" << nl;
+  // constructor from a _var &
+  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
+  // constructor from a _out &
+  *ch << namebuf << " (const " << namebuf << " &);" << nl;
+  // assignment operator from a _out &
+  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
+  // assignment operator from a pointer &, cast operator, ptr fn, operator
+  // -> and any other extra operators
+  // only valuetype allows assignment from var &
+  *ch << namebuf << " &operator= (const " << local_name () << "_var &);" << nl;
+  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
+  // cast
+  *ch << "operator " << local_name () << "_ptr &();" << nl;
+  // ptr fn
+  *ch << local_name () << "_ptr &ptr (void);" << nl;
+  // operator ->
+  *ch << local_name () << "_ptr operator-> (void);" << nl;
+
+  *ch << "\n";
+  ch->decr_indent ();
+  *ch << "private:\n";
+  ch->incr_indent ();
+  *ch << local_name () << "_ptr &ptr_;\n";
+
+  ch->decr_indent ();
+  *ch << "};\n\n";
+
+  return 0;
+}
+
+int
+be_valuetype_fwd::gen_out_impl (void)
+{
+  ACE_ASSERT (0);
+  TAO_OutStream *ci; // output stream
+  TAO_NL  nl;        // end line
+  char fname [NAMEBUFSIZE];  // to hold the full and
+  char lname [NAMEBUFSIZE];  // local _out names
+
+  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
+
+  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
+
+  // retrieve a singleton instance of the code generator
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  ci = cg->client_inline ();
+
+  // generate the var implementation in the inline file
+  // Depending upon the data type, there are some differences which we account
+  // for over here.
+
+  ci->indent (); // start with whatever was our current indent level
+
+  *ci << "// *************************************************************"
+      << nl;
+  *ci << "// Inline operations for class " << fname << nl;
+  *ci << "// *************************************************************\n\n";
+
+      // constr from a _ptr
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (" << name () << "_ptr &p)" << nl;
+  *ci << "  : ptr_ (p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // constructor from _var &
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (" << this->name () <<
+    "_var &p) // constructor from _var" << nl;
+  *ci << "  : ptr_ (p.out ())" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "CORBA::release (this->ptr_);" << nl;
+  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // copy constructor
+  ci->indent ();
+  *ci << "ACE_INLINE" << nl;
+  *ci << fname << "::" << lname << " (const " << fname <<
+    " &p) // copy constructor" << nl;
+  *ci << "  : ptr_ (ACE_const_cast (" << fname
+      << "&,p).ptr_)" << nl;
+  *ci << "{}\n\n";
+
+      // assignment operator from _out &
+  ci->indent ();
+  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << "::operator= (const " << fname <<
+    " &p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "this->ptr_ = ACE_const_cast (" << fname << "&,p).ptr_;" << nl;
+  *ci << "return *this;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+      // assignment operator from _var
+  ci->indent ();
+  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << "::operator= (const " << this->name () <<
+    "_var &p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "this->ptr_ = " << this->name () << "::_duplicate (p.ptr ());" << nl;
+  *ci << "return *this;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+      // assignment operator from _ptr
+  ci->indent ();
+  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << "::operator= (" << this->name () <<
+    "_ptr p)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "this->ptr_ = p;" << nl;
+  *ci << "return *this;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+      // other extra methods - cast operator ()
+  ci->indent ();
+  *ci << "ACE_INLINE " << nl;
+  *ci << fname << "::operator " << this->name () <<
+    "_ptr &() // cast" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  // ptr function
+  ci->indent ();
+  *ci << "ACE_INLINE " << this->name () << "_ptr &" << nl;
+  *ci << fname << "::ptr (void) // ptr" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+      // operator->
+  ci->indent ();
+  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
+  *ci << fname << "::operator-> (void)" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
+  return 0;
+}
+
+int
+be_valuetype_fwd::accept (be_visitor *visitor)
+{
+  return visitor->visit_valuetype_fwd (this);
+}
+
+// Narrowing
+IMPL_NARROW_METHODS1 (be_valuetype_fwd, be_interface_fwd)
+IMPL_NARROW_FROM_DECL (be_valuetype_fwd)
+
+#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor.cpp b/TAO/TAO_IDL/be/be_visitor.cpp
index a04b1c4c33f..87a905c44ae 100644
--- a/TAO/TAO_IDL/be/be_visitor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor.cpp
@@ -72,6 +72,18 @@ int be_visitor::visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+int be_visitor::visit_valuetype (be_valuetype *)
+{
+  return 0;
+}
+
+int be_visitor::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  return 0;
+}
+#endif IDL_HAS_VALUETYPE
+
 int be_visitor::visit_structure (be_structure *)
 {
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
index dadb0375cb8..69e658134da 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -176,47 +176,47 @@ int be_visitor_args_arglist::visit_predefined_type (be_predefined_type *node)
   if (node->pt () == AST_PredefinedType::PT_any)
     {
       switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  *os << "const " << this->type_name (node) << " &";
-	  break;
-	case AST_Argument::dir_INOUT:
-	  *os << this->type_name (node) << " &";
-	  break;
-	case AST_Argument::dir_OUT:
-	  *os << this->type_name (node, "_out");
-	  break;
-	} // end switch direction
+        {
+        case AST_Argument::dir_IN:
+          *os << "const " << this->type_name (node) << " &";
+          break;
+        case AST_Argument::dir_INOUT:
+          *os << this->type_name (node) << " &";
+          break;
+        case AST_Argument::dir_OUT:
+          *os << this->type_name (node, "_out");
+          break;
+        } // end switch direction
     } // end of if
   else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
     {
       switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  *os << this->type_name (node, "_ptr");
-	  break;
-	case AST_Argument::dir_INOUT:
-	  *os << this->type_name (node, "_ptr") << " &";
-	  break;
-	case AST_Argument::dir_OUT:
-	  *os << this->type_name (node, "_out");
-	  break;
-	} // end switch direction
+        {
+        case AST_Argument::dir_IN:
+          *os << this->type_name (node, "_ptr");
+          break;
+        case AST_Argument::dir_INOUT:
+          *os << this->type_name (node, "_ptr") << " &";
+          break;
+        case AST_Argument::dir_OUT:
+          *os << this->type_name (node, "_out");
+          break;
+        } // end switch direction
     } // end else if
   else // simple predefined types
     {
       switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	  *os << this->type_name (node);
-	  break;
-	case AST_Argument::dir_INOUT:
-	  *os << this->type_name (node) << " &";
-	  break;
-	case AST_Argument::dir_OUT:
-	  *os << this->type_name (node, "_out");
-	  break;
-	} // end switch direction
+        {
+        case AST_Argument::dir_IN:
+          *os << this->type_name (node);
+          break;
+        case AST_Argument::dir_INOUT:
+          *os << this->type_name (node) << " &";
+          break;
+        case AST_Argument::dir_OUT:
+          *os << this->type_name (node, "_out");
+          break;
+        } // end switch direction
     } // end of else
 
   return 0;
@@ -312,3 +312,46 @@ int be_visitor_args_arglist::visit_typedef (be_typedef *node)
   this->ctx_->alias (0);
   return 0;
 }
+
+
+#ifdef IDL_HAS_VALUETYPE
+
+int be_visitor_args_arglist::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      *os << this->type_name (node) << " *";
+      break;
+    case AST_Argument::dir_INOUT:
+      *os << this->type_name (node) << " *&";
+      break;
+    case AST_Argument::dir_OUT:
+      *os << this->type_name (node, "_out");
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_arglist::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      *os << "const " << this->type_name (node) << " *";
+      break;
+    case AST_Argument::dir_INOUT:
+      *os << this->type_name (node) << " *&";
+      break;
+    case AST_Argument::dir_OUT:
+      *os << this->type_name (node, "_out");
+      break;
+    }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
index 824fefabbca..5a48798d678 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
@@ -151,12 +151,12 @@ int be_visitor_args_compiled_marshal_cs::visit_array (be_array *node)
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << node->name () << "_forany (" 
+          *os << node->name () << "_forany ("
               << "(" << node->name () << "_slice *)"
               << arg->local_name () << ")";
           break;
         case AST_Argument::dir_INOUT:
-          *os << node->name () << "_forany (" 
+          *os << node->name () << "_forany ("
               << arg->local_name () << ")";
           break;
         case AST_Argument::dir_OUT:
@@ -170,18 +170,18 @@ int be_visitor_args_compiled_marshal_cs::visit_array (be_array *node)
         case AST_Argument::dir_IN:
           break;
         case AST_Argument::dir_INOUT:
-          *os << node->name () << "_forany (" 
+          *os << node->name () << "_forany ("
               << arg->local_name () << ")";
           break;
         case AST_Argument::dir_OUT:
           if (node->size_type () == be_decl::VARIABLE)
             {
-              *os << node->name () << "_forany (" 
+              *os << node->name () << "_forany ("
                   << arg->local_name () << ".ptr ())";
             }
           else
             {
-              *os << node->name () << "_forany (" 
+              *os << node->name () << "_forany ("
                   << arg->local_name () << ")";
             }
           break;
@@ -325,6 +325,97 @@ int be_visitor_args_compiled_marshal_cs::visit_interface_fwd (be_interface_fwd *
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+int be_visitor_args_compiled_marshal_cs::visit_valuetype (be_valuetype *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
+          *os << arg->local_name ();
+          break;
+        case AST_Argument::dir_OUT:
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+          *os << arg->local_name ();
+          break;
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name () << ".ptr ()";
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_compiled_marshal_cs::"
+                         "visit_valuetype - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int
+be_visitor_args_compiled_marshal_cs::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
+          *os << arg->local_name ();
+          break;
+        case AST_Argument::dir_OUT:
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+          *os << arg->local_name ();
+          break;
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name () << ".ptr ()";
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_compiled_marshal_cs::"
+                         "visit_valuetype - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 int be_visitor_args_compiled_marshal_cs::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -557,12 +648,12 @@ int be_visitor_args_compiled_marshal_cs::visit_string (be_string *node)
             case AST_Argument::dir_IN:
               break;
             case AST_Argument::dir_INOUT:
-              *os << "CORBA::Any::to_string (" 
+              *os << "CORBA::Any::to_string ("
                   << arg->local_name () << ", "
                   << node->max_size ()->ev ()->u.ulval - 1 << ")";
               break;
             case AST_Argument::dir_OUT:
-              *os << "CORBA::Any::to_string (" 
+              *os << "CORBA::Any::to_string ("
                   << arg->local_name () << ".ptr (), "
                   << node->max_size ()->ev ()->u.ulval - 1 << ")";
               break;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp
index f21b3d95dca..8d5387ea8b9 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp
@@ -151,12 +151,12 @@ int be_visitor_args_compiled_marshal_ss::visit_array (be_array *node)
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << node->name () << "_forany (" 
+          *os << node->name () << "_forany ("
               << "(" << node->name () << "_slice *)"
               << arg->local_name () << ")";
           break;
         case AST_Argument::dir_INOUT:
-          *os << node->name () << "_forany (" 
+          *os << node->name () << "_forany ("
               << arg->local_name () << ")";
           break;
         case AST_Argument::dir_OUT:
@@ -170,19 +170,19 @@ int be_visitor_args_compiled_marshal_ss::visit_array (be_array *node)
         case AST_Argument::dir_IN:
           break;
         case AST_Argument::dir_INOUT:
-          *os << node->name () << "_forany (" 
+          *os << node->name () << "_forany ("
               << arg->local_name () << ")";
           break;
         case AST_Argument::dir_OUT:
           if (node->size_type () == be_decl::VARIABLE)
             {
-              *os << node->name () << "_forany (" 
+              *os << node->name () << "_forany ("
                   << "(" << node->name () << "_slice *)"
                   << arg->local_name () << ".in ())";
             }
           else
             {
-              *os << node->name () << "_forany (" 
+              *os << node->name () << "_forany ("
                   << arg->local_name () << ")";
             }
           break;
@@ -322,6 +322,92 @@ int be_visitor_args_compiled_marshal_ss::visit_interface_fwd (be_interface_fwd *
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+int be_visitor_args_compiled_marshal_ss::visit_valuetype (be_valuetype *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
+          *os << arg->local_name () << ".out ()";
+          break;
+        case AST_Argument::dir_OUT:
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name () << ".in ()";
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_compiled_marshal_ss::"
+                         "visit_valuetype - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int be_visitor_args_compiled_marshal_ss::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
+          *os << arg->local_name () << "out ()";
+          break;
+        case AST_Argument::dir_OUT:
+          break;
+        }
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+          break;
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
+          *os << arg->local_name () << ".in ()";
+          break;
+        }
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_compiled_marshal_ss::"
+                         "visit_valuetype_fwd - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 int be_visitor_args_compiled_marshal_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -570,7 +656,7 @@ int be_visitor_args_compiled_marshal_ss::visit_string (be_string *node)
               break;
             case AST_Argument::dir_INOUT:
             case AST_Argument::dir_OUT:
-              *os << "CORBA::Any::from_string ((char *)" 
+              *os << "CORBA::Any::from_string ((char *)"
                   << arg->local_name () << ".in (), "
                   << node->max_size ()->ev ()->u.ulval - 1 << ")";
               break;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/post_docall_compiled_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/post_docall_compiled_cs.cpp
index e3deb5a070e..248523c8d3d 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/post_docall_compiled_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/post_docall_compiled_cs.cpp
@@ -120,6 +120,56 @@ be_visitor_args_post_docall_compiled_cs::visit_interface_fwd (be_interface_fwd *
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+int
+be_visitor_args_post_docall_compiled_cs::visit_valuetype (be_valuetype *)
+{
+  // we must narrow the out object reference to the appropriate type
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_INOUT:
+      {
+        os->indent ();
+        *os << "CORBA::remove_ref (" << arg->local_name ()
+            << ");\n";
+      }
+      break;
+    default:
+      break;
+    }
+  return 0;
+}
+
+int
+be_visitor_args_post_docall_compiled_cs::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  // we must narrow the out object reference to the appropriate type
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_INOUT:
+      {
+        os->indent ();
+        *os << "CORBA::remove_ref (" << arg->local_name ()
+            << ");\n";
+      }
+      break;
+    default:
+      break;
+    }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 int
 be_visitor_args_post_docall_compiled_cs::visit_string (be_string *)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
index 641501cc9a2..57702ecd178 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
@@ -182,6 +182,79 @@ int be_visitor_args_upcall_ss::visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+int be_visitor_args_upcall_ss::visit_valuetype (be_valuetype *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  os->indent ();
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
+        *os << arg->local_name ();
+      else
+        *os << arg->local_name () << ".in ()";
+      break;
+    case AST_Argument::dir_INOUT:
+      if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
+        *os << arg->local_name ();
+      else
+        *os << arg->local_name () << ".inout ()";
+      break;
+    case AST_Argument::dir_OUT:
+      //      *os << arg->local_name ();
+      if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
+        *os << arg->local_name ();
+      else
+        *os << arg->local_name () << ".out ()";
+      break;
+    }
+  return 0;
+}
+
+int be_visitor_args_upcall_ss::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  os->indent ();
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+      if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
+        *os << arg->local_name ();
+      else
+        *os << arg->local_name () << ".in ()";
+      break;
+    case AST_Argument::dir_INOUT:
+      if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
+        *os << arg->local_name ();
+      else
+        *os << arg->local_name () << ".inout ()";
+      break;
+    case AST_Argument::dir_OUT:
+      //      *os << arg->local_name ();
+      if (this->ctx_->state ()
+          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
+        *os << arg->local_name ();
+      else
+        *os << arg->local_name () << ".out ()";
+      break;
+    }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
+
 int be_visitor_args_upcall_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -193,58 +266,58 @@ int be_visitor_args_upcall_ss::visit_predefined_type (be_predefined_type *node)
   if (node->pt () == AST_PredefinedType::PT_any)
     {
       switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
           *os << arg->local_name ();
           break;
-	case AST_Argument::dir_OUT:
+        case AST_Argument::dir_OUT:
           if (this->ctx_->state ()
               == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
             *os << arg->local_name ();
           else
             *os << arg->local_name () << ".out ()";
-	  break;
-	} // end switch direction
+          break;
+        } // end switch direction
     } // end of if
   else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
     {
       switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
+        {
+        case AST_Argument::dir_IN:
           if (this->ctx_->state ()
               == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
             *os << arg->local_name ();
           else
             *os << arg->local_name () << ".in ()";
-	  break;
-	case AST_Argument::dir_INOUT:
+          break;
+        case AST_Argument::dir_INOUT:
           if (this->ctx_->state ()
               == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
             *os << arg->local_name ();
           else
             *os << arg->local_name () << ".inout ()";
-	  break;
-	case AST_Argument::dir_OUT:
+          break;
+        case AST_Argument::dir_OUT:
           //          *os << arg->local_name ();
           if (this->ctx_->state ()
               == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
             *os << arg->local_name ();
           else
             *os << arg->local_name () << ".out ()";
-	  break;
-	} // end switch direction
+          break;
+        } // end switch direction
     } // end else if
   else // simple predefined types
     {
       switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
-	case AST_Argument::dir_OUT:
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
           *os << arg->local_name ();
-	  break;
-	} // end switch direction
+          break;
+        } // end switch direction
     } // end of else
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
index 91c67e64215..a1ca4250a20 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
@@ -94,14 +94,14 @@ int be_visitor_args_vardecl_ss::visit_array (be_array *node)
         {
 #if 0 /* ASG */
           *os << bt->name () << "_var _tao_var_"
-	      << arg->local_name () << ";" << be_nl;
+              << arg->local_name () << ";" << be_nl;
           *os << bt->name () << "_slice *&_tao_ptr_" << arg->local_name ()
               << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
           *os << bt->name () << "_out " << arg->local_name ()
               << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
           *os << bt->name () << "_var "
-	      << arg->local_name () << ";\n";
+              << arg->local_name () << ";\n";
         }
       else
         *os << bt->name () << " " << arg->local_name () << ";\n";
@@ -166,16 +166,16 @@ int be_visitor_args_vardecl_ss::visit_interface (be_interface *node)
       os->indent ();
 #if 0 /* ASG */
       *os << bt->name () << "_var _tao_var_"
-	  << arg->local_name () << ";" << be_nl;
+          << arg->local_name () << ";" << be_nl;
       *os << "CORBA::Object_ptr _tao_base_ptr_"
-	  << arg->local_name () << ";" << be_nl;
+          << arg->local_name () << ";" << be_nl;
       *os << bt->name () << "_out " << arg->local_name ()
           << " (_tao_var_" << arg->local_name () << ".out ());\n";
 #endif
       *os << bt->name () << "_var "
-	  << arg->local_name () << ";" << be_nl;
+          << arg->local_name () << ";" << be_nl;
       *os << "CORBA::Object_var _tao_base_var_"
-	  << arg->local_name () << ";\n";
+          << arg->local_name () << ";\n";
       break;
     }
   return 0;
@@ -213,21 +213,36 @@ int be_visitor_args_vardecl_ss::visit_interface_fwd (be_interface_fwd *node)
       os->indent ();
 #if 0 /* ASG */
       *os << bt->name () << "_var _tao_var_"
-	  << arg->local_name () << ";" << be_nl;
+          << arg->local_name () << ";" << be_nl;
       *os << "CORBA::Object_ptr _tao_base_ptr_"
-	  << arg->local_name () << ";" << be_nl;
+          << arg->local_name () << ";" << be_nl;
       *os << bt->name () << "_out " << arg->local_name ()
           << " (_tao_var_" << arg->local_name () << ".out ());\n";
 #endif
       *os << bt->name () << "_var "
-	  << arg->local_name () << ";" << be_nl;
+          << arg->local_name () << ";" << be_nl;
       *os << "CORBA::Object_var _tao_base_var_"
-	  << arg->local_name () << ";\n";
+          << arg->local_name () << ";\n";
       break;
     }
   return 0;
 }
 
+
+#ifdef IDL_HAS_VALUETYPE
+
+int be_visitor_args_vardecl_ss::visit_valuetype (be_valuetype *node)
+{
+  return -1;
+}
+
+int be_visitor_args_vardecl_ss::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  return -1;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -244,31 +259,31 @@ int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node)
   if (node->pt () == AST_PredefinedType::PT_any)
     {
       switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
           os->indent ();
           *os << bt->name () << " " << arg->local_name () << ";\n";
-	  break;
-	case AST_Argument::dir_OUT:
+          break;
+        case AST_Argument::dir_OUT:
           os->indent ();
 #if 0 /* ASG */
           *os << bt->name () << "_var _tao_var_"
-	      << arg->local_name () << ";" << be_nl;
+              << arg->local_name () << ";" << be_nl;
           *os << bt->name () << "_ptr &_tao_ptr_" << arg->local_name ()
               << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
           *os << bt->name () << "_out " << arg->local_name ()
               << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
           *os << bt->name () << "_var "
-	      << arg->local_name () << ";\n";
-	  break;
-	} // end switch direction
+              << arg->local_name () << ";\n";
+          break;
+        } // end switch direction
     } // end of if
   else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
     {
       switch (this->direction ())
-	{
+        {
         case AST_Argument::dir_IN:
         case AST_Argument::dir_INOUT:
           os->indent ();
@@ -285,28 +300,28 @@ int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node)
           os->indent ();
 #if 0 /* ASG */
           *os << bt->name () << "_var _tao_var_"
-	      << arg->local_name () << ";" << be_nl;
+              << arg->local_name () << ";" << be_nl;
           *os << bt->name () << "_ptr &_tao_ptr_" << arg->local_name ()
               << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
           *os << bt->name () << "_out " << arg->local_name ()
               << " (_tao_ptr_" << arg->local_name () << ");" << be_nl;
 #endif
           *os << bt->name () << "_var "
-	      << arg->local_name () << ";\n";
+              << arg->local_name () << ";\n";
           break;
-	} // end switch direction
+        } // end switch direction
     } // end else if
   else // simple predefined types
     {
       switch (this->direction ())
-	{
-	case AST_Argument::dir_IN:
-	case AST_Argument::dir_INOUT:
-	case AST_Argument::dir_OUT:
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
+        case AST_Argument::dir_OUT:
           os->indent ();
           *os << bt->name () << " " << arg->local_name () << ";\n";
-	  break;
-	} // end switch direction
+          break;
+        } // end switch direction
     } // end of else
 
   return 0;
@@ -335,14 +350,14 @@ int be_visitor_args_vardecl_ss::visit_sequence (be_sequence *node)
       os->indent ();
 #if 0 /* ASG */
       *os << bt->name () << "_var _tao_var_"
-	  << arg->local_name () << ";" << be_nl;
+          << arg->local_name () << ";" << be_nl;
       *os << bt->name () << " *&_tao_ptr_" << arg->local_name ()
           << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
       *os << bt->name () << "_out " << arg->local_name ()
           << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
       *os << bt->name () << "_var "
-	  << arg->local_name () << ";" << be_nl;
+          << arg->local_name () << ";" << be_nl;
       break;
     }
   return 0;
@@ -361,25 +376,25 @@ int be_visitor_args_vardecl_ss::visit_string (be_string *)
       os->indent ();
 #if 0 /* ASG */
       *os << "CORBA::String_var _tao_var_"
-	  << arg->local_name () << ";" << be_nl;
+          << arg->local_name () << ";" << be_nl;
       *os << "char *&" << arg->local_name () << " = _tao_var_"
           << arg->local_name () << ".out ();" << be_nl;
 #endif
       *os << "CORBA::String_var "
-	  << arg->local_name () << ";\n";
+          << arg->local_name () << ";\n";
       break;
     case AST_Argument::dir_OUT:
       os->indent ();
 #if 0 /* ASG */
       *os << "CORBA::String_var _tao_var_"
-	  << arg->local_name () << ";" << be_nl;
+          << arg->local_name () << ";" << be_nl;
       *os << "char *&_tao_ptr_" << arg->local_name () << " = _tao_var_"
           << arg->local_name () << ".out ();" << be_nl;
       *os << "CORBA::String_out " << arg->local_name ()
           << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
       *os << "CORBA::String_var "
-	  << arg->local_name () << ";\n";
+          << arg->local_name () << ";\n";
       break;
     }
   return 0;
@@ -411,14 +426,14 @@ int be_visitor_args_vardecl_ss::visit_structure (be_structure *node)
         {
 #if 0 /* ASG */
           *os << bt->name () << "_var _tao_var_"
-	      << arg->local_name () << ";" << be_nl;
+              << arg->local_name () << ";" << be_nl;
           *os << bt->name () << " *&_tao_ptr_" << arg->local_name ()
               << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
           *os << bt->name () << "_out " << arg->local_name ()
               << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
           *os << bt->name () << "_var "
-	      << arg->local_name () << ";\n";
+              << arg->local_name () << ";\n";
         }
       else
         *os << bt->name () << " " << arg->local_name () << ";\n";
@@ -453,14 +468,14 @@ int be_visitor_args_vardecl_ss::visit_union (be_union *node)
         {
 #if 0 /* ASG */
           *os << bt->name () << "_var _tao_var_"
-	      << arg->local_name () << ";" << be_nl;
+              << arg->local_name () << ";" << be_nl;
           *os << bt->name () << " *&_tao_ptr_" << arg->local_name ()
               << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
           *os << bt->name () << "_out " << arg->local_name ()
               << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
           *os << bt->name () << "_var "
-	      << arg->local_name () << ";\n";
+              << arg->local_name () << ";\n";
 
         }
       else
@@ -524,7 +539,7 @@ int be_compiled_visitor_args_vardecl_ss::visit_interface (be_interface *node)
     case AST_Argument::dir_OUT:
       os->indent ();
       *os << bt->name () << "_var "
-	  << arg->local_name () << ";\n";
+          << arg->local_name () << ";\n";
       break;
     }
   return 0;
@@ -552,9 +567,70 @@ int be_compiled_visitor_args_vardecl_ss::visit_interface_fwd (be_interface_fwd *
     case AST_Argument::dir_OUT:
       os->indent ();
       *os << bt->name () << "_var "
-	  << arg->local_name () << ";\n";
+          << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+
+#ifdef IDL_HAS_VALUETYPE
+
+int be_compiled_visitor_args_vardecl_ss::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      os->indent ();
+      *os << bt->name () << "_var " << arg->local_name () << ";\n";
+      break;
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << "_var "
+          << arg->local_name () << ";\n";
+      break;
+    }
+  return 0;
+}
+
+int
+be_compiled_visitor_args_vardecl_ss::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
+                                                         // node
+  // if the current type is an alias, use that
+  be_type *bt;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      os->indent ();
+      *os << bt->name () << "_var " << arg->local_name () << ";\n";
+      break;
+    case AST_Argument::dir_OUT:
+      os->indent ();
+      *os << bt->name () << "_var "
+          << arg->local_name () << ";\n";
       break;
     }
   return 0;
 }
 
+#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp
index 81805cdd084..ad2de24a08e 100644
--- a/TAO/TAO_IDL/be/be_visitor_factory.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 // individual visitors included only here
 #include "be_visitor_factory.h"
@@ -35,6 +35,8 @@
 #include "be_visitor_field.h"
 #include "be_visitor_interface.h"
 #include "be_visitor_interface_fwd.h"
+#include "be_visitor_valuetype.h"
+#include "be_visitor_valuetype_fwd.h"
 #include "be_visitor_module.h"
 #include "be_visitor_operation.h"
 #include "be_visitor_root.h"
@@ -82,7 +84,6 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
   // created context is a copy of what was sent by the caller. The newly
   // created visitor will own this new copy.
   be_visitor_context *new_ctx = new be_visitor_context (*ctx);
-
   switch (st)
     {
     case TAO_CodeGen::TAO_ROOT_CH:
@@ -182,6 +183,48 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_INTERFACE_FWD_CDR_OP_CI:
       return new be_visitor_interface_fwd_cdr_op_ci (new_ctx);
 
+#   ifdef IDL_HAS_VALUETYPE
+
+    case TAO_CodeGen::TAO_VALUETYPE_CH:
+      return new be_visitor_valuetype_ch (new_ctx);
+    case TAO_CodeGen::TAO_VALUETYPE_CS:
+      return new be_visitor_valuetype_cs (new_ctx);
+    case TAO_CodeGen::TAO_VALUETYPE_CI:
+      return new be_visitor_valuetype_ci (new_ctx);
+
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
+      return new be_visitor_valuetype_obv_ch (new_ctx);
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
+      return new be_visitor_decl (new_ctx);  //  currently NO-OP
+      //return new be_visitor_valuetype_obv_ci (new_ctx);
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
+      return new be_visitor_valuetype_obv_cs (new_ctx);
+
+    case TAO_CodeGen::TAO_FIELD_OBV_CH:
+      return new be_visitor_valuetype_field_ch (new_ctx);
+    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
+    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OBV_CH:
+    //case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IH:
+    //case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IS:
+    //case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OTHERS:
+      return new be_visitor_obv_operation_arglist (new_ctx);
+
+    case TAO_CodeGen::TAO_MODULE_OBV_CH:
+    case TAO_CodeGen::TAO_MODULE_OBV_CI:
+    case TAO_CodeGen::TAO_MODULE_OBV_CS:
+      return new be_visitor_obv_module (new_ctx);
+
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
+      return new be_visitor_valuetype_cdr_op_ch (new_ctx);
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
+      return new be_visitor_valuetype_cdr_op_cs (new_ctx);
+
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
+      return new be_visitor_decl (new_ctx);  // is TODO
+
+#   endif /* IDL_HAS_VALUETYPE */
+
     case TAO_CodeGen::TAO_STRUCT_CH:
       return new be_visitor_structure_ch (new_ctx);
     case TAO_CodeGen::TAO_STRUCT_CS:
@@ -533,9 +576,9 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_operation_sh (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_SS:
       return new be_compiled_visitor_operation_ss (new_ctx);
-	case TAO_CodeGen::TAO_OPERATION_IS:
+        case TAO_CodeGen::TAO_OPERATION_IS:
       return new be_visitor_operation_is (new_ctx);
-	 case TAO_CodeGen::TAO_OPERATION_IH:
+         case TAO_CodeGen::TAO_OPERATION_IH:
       return new be_visitor_operation_ih (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH:
       return new be_visitor_operation_collocated_sh (new_ctx);
@@ -571,8 +614,8 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_decl (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
-	case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
-	case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
+        case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
+        case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS:
       return new be_visitor_operation_arglist (new_ctx);
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
index a07999bcb6b..7cb35be54ea 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_field.h"
 
@@ -99,7 +99,7 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node)
       // for anonymous arrays ...
       // we have to generate a name for us that has an underscore
       // prepended to our local name. This needs to be inserted after
-      // the parents's name 
+      // the parents's name
 
       if (node->is_nested ())
         {
@@ -367,19 +367,19 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
       // is a psuedo obj
       if (node->pt () == AST_PredefinedType::PT_pseudo)
         *os << "(strm >> _tao_aggregate." << f->local_name ()
-	    << ".out ())";
+            << ".out ())";
       else if (node->pt () == AST_PredefinedType::PT_char)
         *os << "(strm >> CORBA::Any::to_char (_tao_aggregate."
-	    << f->local_name () << "))";
+            << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_wchar)
         *os << "(strm >> CORBA::Any::to_wchar (_tao_aggregate."
-	    << f->local_name () << "))";
+            << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_octet)
         *os << "(strm >> CORBA::Any::to_octet (_tao_aggregate."
-	    << f->local_name () << "))";
+            << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_boolean)
         *os << "(strm >> CORBA::Any::to_boolean (_tao_aggregate."
-	    << f->local_name () << "))";
+            << f->local_name () << "))";
       else
         *os << "(strm >> _tao_aggregate." << f->local_name () << ")";
       break;
@@ -389,16 +389,16 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
         *os << "(strm << _tao_aggregate." << f->local_name () << ".in ())";
       else if (node->pt () == AST_PredefinedType::PT_char)
         *os << "(strm << CORBA::Any::from_char (_tao_aggregate."
-	    << f->local_name () << "))";
+            << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_wchar)
         *os << "(strm << CORBA::Any::from_wchar (_tao_aggregate."
-	    << f->local_name () << "))";
+            << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_octet)
         *os << "(strm << CORBA::Any::from_octet (_tao_aggregate."
-	    << f->local_name () << "))";
+            << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_boolean)
         *os << "(strm << CORBA::Any::from_boolean (_tao_aggregate."
-	    << f->local_name () << "))";
+            << f->local_name () << "))";
       else
         *os << "(strm << _tao_aggregate." << f->local_name () << ")";
       break;
@@ -821,6 +821,7 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node)
   ACE_NOTREACHED (return 0);
 }
 
+
 // visit typedef type
 int
 be_visitor_cdr_op_field_decl::visit_typedef (be_typedef *node)
@@ -842,4 +843,3 @@ be_visitor_cdr_op_field_decl::visit_typedef (be_typedef *node)
   this->ctx_->alias (0);
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index 0548da82f16..abd9059367f 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_field.h"
 
@@ -70,7 +70,7 @@ be_visitor_field_ch::visit_field (be_field *node)
                          "codegen for field type failed\n"
                          ), -1);
     }
-  // now output the field name. 
+  // now output the field name.
   *os << " " << node->local_name () << ";\n";
   return 0;
 }
@@ -237,6 +237,52 @@ be_visitor_field_ch::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+// visit valuetype type
+int
+be_visitor_field_ch::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os; // output stream
+  be_type *bt;
+
+  os = this->ctx_->stream ();
+  // set the right type;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  // if not a typedef and we are defined in the use scope, we must be defined
+  os->indent ();
+  *os <<  bt->nested_type_name (this->ctx_->scope (), "")
+      << "_var";
+  return 0;
+}
+
+// visit valuetype forward type
+int
+be_visitor_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os; // output stream
+  be_type *bt;
+
+  os = this->ctx_->stream ();
+  // set the right type;
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  // if not a typedef and we are defined in the use scope, we must be defined
+  os->indent ();
+  *os << bt->nested_type_name (this->ctx_->scope (), "")
+      << "_var";
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 // visit predefined type
 int
 be_visitor_field_ch::visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
index 6021ed1c978..060405fa0df 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_module.h"
 
@@ -420,6 +420,149 @@ be_visitor_module::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+// visit an valuetype
+int
+be_visitor_module::visit_valuetype (be_valuetype *node)
+{
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  // this switch is acceptable rather than having derived visitors overriding
+  // this method and differing only in what state they set
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_MODULE_CH:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CH);
+      break;
+    case TAO_CodeGen::TAO_MODULE_CI:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CI);
+      break;
+    case TAO_CodeGen::TAO_MODULE_CS:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CS);
+      break;
+    case TAO_CodeGen::TAO_MODULE_CDR_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_MODULE_CDR_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS);
+      break;
+    case TAO_CodeGen::TAO_MODULE_SH:
+    case TAO_CodeGen::TAO_MODULE_IH:
+    case TAO_CodeGen::TAO_MODULE_SI:
+    case TAO_CodeGen::TAO_MODULE_SS:
+    case TAO_CodeGen::TAO_MODULE_IS:
+    case TAO_CodeGen::TAO_MODULE_ANY_OP_CH:
+    case TAO_CodeGen::TAO_MODULE_ANY_OP_CS:
+      return 0;    // nothing to do, resp. not yet impl.
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_module::"
+                           "visit_valuetype - "
+                           "Bad context state\n"
+                           ), -1);
+      }
+    }
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_module::"
+                         "visit_valuetype - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_module::"
+                         "visit_valuetype - "
+                         "failed to accept visitor\n"
+                         ),  -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+// visit an valuetype_fwd
+int
+be_visitor_module::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  // this switch is acceptable rather than having derived visitors overriding
+  // this method and differing only in what state they set
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_MODULE_CH:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CH);
+      break;
+    case TAO_CodeGen::TAO_MODULE_CI:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CI);
+      break;
+    case TAO_CodeGen::TAO_MODULE_CDR_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CDR_OP_CI);
+      break;
+    case TAO_CodeGen::TAO_MODULE_ANY_OP_CH:
+    case TAO_CodeGen::TAO_MODULE_ANY_OP_CS:
+    case TAO_CodeGen::TAO_MODULE_CDR_OP_CH:
+    // case TAO_CodeGen::TAO_MODULE_CDR_OP_CI:
+    case TAO_CodeGen::TAO_MODULE_CS:
+    case TAO_CodeGen::TAO_MODULE_SH:
+    case TAO_CodeGen::TAO_MODULE_SI:
+    case TAO_CodeGen::TAO_MODULE_SS:
+        case TAO_CodeGen::TAO_MODULE_IS:
+        case TAO_CodeGen::TAO_MODULE_IH:
+                return 0; // nothing to be done
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_module::"
+                           "visit_valuetype_fwd - "
+                           "Bad context state\n"
+                           ), -1);
+      }
+    }
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_module::"
+                         "visit_valuetype_fwd - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_module::"
+                         "visit_valuetype_fwd - "
+                         "failed to accept visitor\n"
+                         ),  -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 // visit an structure
 int
 be_visitor_module::visit_structure (be_structure *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
index 76fc1c10c7e..4ae2012f87d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
@@ -129,7 +129,7 @@ int be_visitor_operation_rettype_compiled_marshal::visit_array (be_array *node)
     }
   else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
     {
-      *os << node->name () << "_forany (" 
+      *os << node->name () << "_forany ("
           << "_tao_retval" << ")";
     }
   else
@@ -212,6 +212,56 @@ int be_visitor_operation_rettype_compiled_marshal::visit_interface_fwd (be_inter
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+int be_visitor_operation_rettype_compiled_marshal::visit_valuetype (be_valuetype *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      *os << "_tao_retval.in ()";
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      *os << "_tao_retval";
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_operation_rettype_compiled_marshal::"
+                         "visit_valuetype - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+int be_visitor_operation_rettype_compiled_marshal::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+
+  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
+    {
+      *os << "_tao_retval.in ()";
+    }
+  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
+    {
+      *os << "_tao_retval";
+    }
+  else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_operation_rettype_compiled_marshal::"
+                         "visit_valuetype - "
+                         "Bad substate\n"),
+                        -1);
+    }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 int be_visitor_operation_rettype_compiled_marshal::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
index b527420c335..277021a3a0f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -46,7 +46,7 @@ int
 be_visitor_operation_rettype::visit_array (be_array *node)
 {
 
-  
+
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -65,7 +65,7 @@ be_visitor_operation_rettype::visit_array (be_array *node)
 int
 be_visitor_operation_rettype::visit_enum (be_enum *node)
 {
- 
+
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -84,7 +84,7 @@ be_visitor_operation_rettype::visit_enum (be_enum *node)
 int
 be_visitor_operation_rettype::visit_interface (be_interface *node)
 {
- 
+
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -103,7 +103,7 @@ be_visitor_operation_rettype::visit_interface (be_interface *node)
 int
 be_visitor_operation_rettype::visit_interface_fwd (be_interface_fwd *node)
 {
- 
+
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -122,7 +122,7 @@ be_visitor_operation_rettype::visit_interface_fwd (be_interface_fwd *node)
 int
 be_visitor_operation_rettype::visit_native (be_native *node)
 {
- 
+
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -141,7 +141,7 @@ be_visitor_operation_rettype::visit_native (be_native *node)
 int
 be_visitor_operation_rettype::visit_predefined_type (be_predefined_type *node)
 {
- 
+
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -271,3 +271,47 @@ be_visitor_operation_rettype::visit_union (be_union *node)
     *os << " *";
   return 0;
 }
+
+#ifdef IDL_HAS_VALUETYPE
+
+int
+be_visitor_operation_rettype::visit_valuetype (be_valuetype *node)
+{
+
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+  be_type *bt; // return type
+
+  if (this->ctx_->alias ()) // a typedefed return type
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
+    *os << bt->nested_type_name (this->ctx_->scope (), " *");
+  else {
+    *os << bt->name () << " *";
+  }
+  return 0;
+}
+
+int
+be_visitor_operation_rettype::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+  be_type *bt; // return type
+
+  if (this->ctx_->alias ()) // a typedefed return type
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
+    *os << bt->nested_type_name (this->ctx_->scope (), "*");
+  else {
+    *os << bt->name () << " *";
+  }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp
index 18da2e48a94..fae87d2e2e5 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -87,6 +87,33 @@ visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+int
+be_visitor_operation_rettype_assign_ss::visit_valuetype (be_valuetype *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+  os->indent ();
+  *os << "_tao_retval = ";
+
+  return 0;
+}
+
+int
+be_visitor_operation_rettype_assign_ss::
+visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+  os->indent ();
+  *os << "_tao_retval = ";
+
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 int
 be_visitor_operation_rettype_assign_ss::
 visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp
index aa75c4b0fc3..b1aadb26abe 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -89,6 +89,35 @@ visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+int
+be_visitor_operation_rettype_marshal_ss::visit_valuetype (be_valuetype *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+  os->indent ();
+  //  *os << "&_tao_ptr_retval";
+  *os << "&_tao_retval.inout ()";
+
+  return 0;
+}
+
+int
+be_visitor_operation_rettype_marshal_ss::
+visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+  os->indent ();
+  //  *os << "&_tao_ptr_retval";
+  *os << "&_tao_retval.inout ()";
+
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 int
 be_visitor_operation_rettype_marshal_ss::
 visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
index 59885aa6786..760209f4738 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -87,6 +87,32 @@ be_visitor_operation_rettype_return_cs::visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+int
+be_visitor_operation_rettype_return_cs::visit_valuetype (be_valuetype *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+  //os->indent ();
+  //*os << "return _tao_retval;\n";
+  *os << "_tao_retval";
+  return 0;
+}
+
+int
+be_visitor_operation_rettype_return_cs::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+  //os->indent ();
+  //*os << "return _tao_retval;\n";
+  *os << "_tao_retval";
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 int
 be_visitor_operation_rettype_return_cs::visit_predefined_type (be_predefined_type *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
index 5613cffe2db..c713feb4258 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -108,6 +108,42 @@ be_visitor_operation_rettype_vardecl_cs::visit_interface_fwd (be_interface_fwd *
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+int
+be_visitor_operation_rettype_vardecl_cs::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+  be_type *bt; // return type
+
+  if (this->ctx_->alias ()) // a typedefed return type
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  os->indent ();
+  *os << bt->name () << "* _tao_retval = 0;\n";
+  return 0;
+}
+
+int
+be_visitor_operation_rettype_vardecl_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+  be_type *bt; // return type
+
+  if (this->ctx_->alias ()) // a typedefed return type
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  os->indent ();
+  *os << bt->name () << "* _tao_retval = 0;\n";
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 int
 be_visitor_operation_rettype_vardecl_cs::visit_predefined_type (be_predefined_type *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
index 3bd34ae366f..c10d22532bd 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -118,6 +118,31 @@ visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+// like be_compiled_visitor_operation_rettype_vardecl_ss
+int
+be_visitor_operation_rettype_vardecl_ss::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+  os->indent ();
+  *os << node->name () << "_var _tao_retval;\n";
+  return 0;
+}
+
+int
+be_visitor_operation_rettype_vardecl_ss::
+visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+  os->indent ();
+  *os << node->name () << "_var _tao_retval;\n";
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 int
 be_visitor_operation_rettype_vardecl_ss::
 visit_predefined_type (be_predefined_type *node)
@@ -303,4 +328,3 @@ visit_interface_fwd (be_interface_fwd *node)
   *os << node->name () << "_var _tao_retval;\n";
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 2e54cd3505c..e02566fca6d 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_root.h"
 
@@ -64,15 +64,63 @@ int be_visitor_root::visit_root (be_root *node)
                          "codegen for scope failed\n"), -1);
     }
 
+
+  be_visitor *visitor;
+  be_visitor_context ctx (*this->ctx_);
+
+#ifdef IDL_HAS_VALUETYPE
+  // make one more pass over the entire tree and generate the OBV_ namespaces
+  // and OBV_ classes
+
+  idl_bool obv = 0;
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_ROOT_CH:
+      obv = 1;
+      ctx.state (TAO_CodeGen::TAO_MODULE_OBV_CH);
+      break;
+    case TAO_CodeGen::TAO_ROOT_CI:
+      obv = 1;
+      ctx.state (TAO_CodeGen::TAO_MODULE_OBV_CI);
+      break;
+    case TAO_CodeGen::TAO_ROOT_CS:
+      obv = 1;
+      ctx.state (TAO_CodeGen::TAO_MODULE_OBV_CS);
+      break;
+    }
+  if (obv)
+    {
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_root::"
+                             "visit_root - "
+                             "NUL visitor\n"
+                             ),  -1);
+        }
+
+      if (visitor->visit_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_root::"
+                             "visit_root - "
+                             "failed to generate OBV_ things\n"
+                             ),  -1);
+        }
+      delete visitor;
+    }
+#endif /* IDL_HAS_VALUETYPE */
+
+
   // The next thing we need to do is make one more pass thru the entire tree
   // and generate code for all the <<= and >>= operators for all the
   // user-defined types.
   //
   // XXXASG - this part of the code may be conditionally generated because at
   // times it is not necessary to have these operators at all. TO-DO.
-  be_visitor *visitor;
-  be_visitor_context ctx (*this->ctx_);
 
+  ctx = *this->ctx_;
   switch (this->ctx_->state ())
     {
     case TAO_CodeGen::TAO_ROOT_CH:
@@ -82,7 +130,7 @@ int be_visitor_root::visit_root (be_root *node)
       ctx.state (TAO_CodeGen::TAO_ROOT_ANY_OP_CS);
       break;
 
-    case TAO_CodeGen::TAO_ROOT_IH:  
+    case TAO_CodeGen::TAO_ROOT_IH:
       (void) tao_cg->end_implementation_header (idl_global->be_get_implementation_hdr_fname (0));
       break;
     case TAO_CodeGen::TAO_ROOT_SH:
@@ -122,7 +170,7 @@ int be_visitor_root::visit_root (be_root *node)
                              "NUL visitor\n"
                              ),  -1);
         }
-      
+
       // generate the << and >> operators for all the user-defined
       // data types in the outermost scope
       if (node->accept (visitor) == -1)
@@ -135,7 +183,7 @@ int be_visitor_root::visit_root (be_root *node)
         }
       delete visitor;
     }
-  
+
   // make one more pass over the entire tree and generate the CDR << and >>
   // operators for compiled marshaling. Again, this code can be conditionally
   // generated if compiled marshaling is desired.
@@ -302,8 +350,8 @@ be_visitor_root::visit_enum (be_enum *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-	case TAO_CodeGen::TAO_ROOT_IS:
-	case TAO_CodeGen::TAO_ROOT_IH:
+        case TAO_CodeGen::TAO_ROOT_IS:
+        case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -377,8 +425,8 @@ be_visitor_root::visit_exception (be_exception *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-	case TAO_CodeGen::TAO_ROOT_IS:
-	case TAO_CodeGen::TAO_ROOT_IH:
+        case TAO_CodeGen::TAO_ROOT_IS:
+        case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -529,9 +577,9 @@ be_visitor_root::visit_interface_fwd (be_interface_fwd *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-	case TAO_CodeGen::TAO_ROOT_IS:
-	case TAO_CodeGen::TAO_ROOT_IH:
-		return 0; // nothing to be done
+        case TAO_CodeGen::TAO_ROOT_IS:
+        case TAO_CodeGen::TAO_ROOT_IH:
+                return 0; // nothing to be done
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -565,6 +613,149 @@ be_visitor_root::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+// visit an valuetype
+int
+be_visitor_root::visit_valuetype (be_valuetype *node)
+{
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  // this switch is acceptable rather than having derived visitors overriding
+  // this method and differing only in what state they set
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_ROOT_CH:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CH);
+      break;
+    case TAO_CodeGen::TAO_ROOT_CI:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CI);
+      break;
+    case TAO_CodeGen::TAO_ROOT_CS:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CS);
+      break;
+    case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_ROOT_CDR_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS);
+      break;
+    case TAO_CodeGen::TAO_ROOT_SH:
+    case TAO_CodeGen::TAO_ROOT_IH:
+    case TAO_CodeGen::TAO_ROOT_SI:
+    case TAO_CodeGen::TAO_ROOT_SS:
+    case TAO_CodeGen::TAO_ROOT_IS:
+    case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
+    case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
+      return 0;    // nothing to do, resp. not yet impl.
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_root::"
+                           "visit_valuetype - "
+                           "Bad context state\n"
+                           ), -1);
+      }
+    }
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_root::"
+                         "visit_valuetype - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_root::"
+                         "visit_valuetype - "
+                         "failed to accept visitor\n"
+                         ),  -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+// visit an valuetype_fwd
+int
+be_visitor_root::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  // this switch is acceptable rather than having derived visitors overriding
+  // this method and differing only in what state they set
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_ROOT_CH:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CH);
+      break;
+    case TAO_CodeGen::TAO_ROOT_CI:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CI);
+      break;
+    case TAO_CodeGen::TAO_ROOT_CDR_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CDR_OP_CI);
+      break;
+    case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
+    case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
+    case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
+    case TAO_CodeGen::TAO_ROOT_CDR_OP_CI:
+    case TAO_CodeGen::TAO_ROOT_CS:
+    case TAO_CodeGen::TAO_ROOT_SH:
+    case TAO_CodeGen::TAO_ROOT_SI:
+    case TAO_CodeGen::TAO_ROOT_SS:
+        case TAO_CodeGen::TAO_ROOT_IS:
+        case TAO_CodeGen::TAO_ROOT_IH:
+                return 0; // nothing to be done
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_root::"
+                           "visit_valuetype_fwd - "
+                           "Bad context state\n"
+                           ), -1);
+      }
+    }
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_root::"
+                         "visit_valuetype_fwd - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_root::"
+                         "visit_valuetype_fwd - "
+                         "failed to accept visitor\n"
+                         ),  -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 // visit an module
 int
 be_visitor_root::visit_module (be_module *node)
@@ -688,8 +879,8 @@ be_visitor_root::visit_structure (be_structure *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-	case TAO_CodeGen::TAO_ROOT_IS:
-	case TAO_CodeGen::TAO_ROOT_IH:
+        case TAO_CodeGen::TAO_ROOT_IS:
+        case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -763,8 +954,8 @@ be_visitor_root::visit_union (be_union *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-	case TAO_CodeGen::TAO_ROOT_IS:
-	case TAO_CodeGen::TAO_ROOT_IH:
+        case TAO_CodeGen::TAO_ROOT_IS:
+        case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -838,8 +1029,8 @@ be_visitor_root::visit_typedef (be_typedef *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-	case TAO_CodeGen::TAO_ROOT_IS:
-	case TAO_CodeGen::TAO_ROOT_IH:
+        case TAO_CodeGen::TAO_ROOT_IS:
+        case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
index 847eede719c..7ef8ae84983 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_union_branch.h"
 
@@ -297,6 +297,84 @@ be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+
+// visit valuetype type
+int
+be_visitor_union_branch_public_ch::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get union branch
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_ch::"
+                         "visit_valuetype - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  os->indent (); // start from current indentation
+  // set method
+  *os << "void " << ub->local_name () << " ("
+      << bt->nested_type_name (bu, "*")
+      << ");// set" << be_nl;
+  // get method
+  *os << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
+      << " (void) const; // get method\n\n";
+  return 0;
+}
+
+// visit valuetype forward type
+int
+be_visitor_union_branch_public_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get union branch
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_ch::"
+                         "visit_valuetype_fwd - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  os->indent (); // start from current indentation
+  // set method
+  *os << "void " << ub->local_name () << " ("
+      << bt->nested_type_name (bu, "*")
+      << ");// set" << be_nl;
+  // get method
+  *os << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
+      << " (void) const; // get method\n\n";
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
+
 // visit predefined type
 int
 be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
new file mode 100644
index 00000000000..d735991df3f
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
@@ -0,0 +1,51 @@
+
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_valuetype.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype class
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+
+#include "idl.h"
+#include "idl_extern.h"
+#include "be.h"
+
+#ifdef IDL_HAS_VALUETYPE
+
+#include "be_visitor_valuetype.h"
+
+#include "be_visitor_valuetype/valuetype.cpp"
+#include "be_visitor_valuetype/valuetype_ch.cpp"
+#include "be_visitor_valuetype/valuetype_obv_ch.cpp"
+#include "be_visitor_valuetype/valuetype_obv_cs.cpp"
+#include "be_visitor_valuetype/valuetype_ci.cpp"
+#include "be_visitor_valuetype/valuetype_cs.cpp"
+//#include "be_visitor_valuetype/valuetype_ih.cpp"
+//#include "be_visitor_valuetype/valuetype_is.cpp"
+//#include "be_visitor_valuetype/any_op_ch.cpp"
+//#include "be_visitor_valuetype/any_op_cs.cpp"
+#include "be_visitor_valuetype/cdr_op_ch.cpp"
+#include "be_visitor_valuetype/cdr_op_cs.cpp"
+#include "be_visitor_valuetype/marshal_ch.cpp"
+#include "be_visitor_valuetype/marshal_cs.cpp"
+#include "be_visitor_valuetype/arglist.cpp"
+#include "be_visitor_valuetype/field_ch.cpp"
+#include "be_visitor_valuetype/field_cs.cpp"
+#include "be_visitor_valuetype/field_cdr_ci.cpp"
+#include "be_visitor_valuetype/obv_module.cpp"
+
+#endif /* IDL_HAS_VALUETYPE */
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
new file mode 100644
index 00000000000..c5538060056
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
@@ -0,0 +1,220 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist.cpp
+//
+// = DESCRIPTION
+//    Visitor generating the parameter list of operations
+//    in the Valuetype class.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_operation.h"
+
+ACE_RCSID(be_visitor_operation, arglist, "$Id$")
+
+
+// ************************************************************
+//   operation visitor  to generate the argument list.
+//   We have separated code generation for this from the 4 main
+//   visitors to avoid code duplication and tight coupling
+// ************************************************************
+
+be_visitor_obv_operation_arglist::be_visitor_obv_operation_arglist (be_visitor_context
+                                                            *ctx)
+  : be_visitor_scope (ctx)
+{
+}
+
+be_visitor_obv_operation_arglist::~be_visitor_obv_operation_arglist (void)
+{
+}
+
+int
+be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  *os << " (";
+  // *os << " (" << be_idt << be_idt << "\n";
+
+  // all we do is hand over code generation to our scope
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_obv_operation_arglist::"
+                         "visit_operation - "
+                         "codegen for scope failed\n"),
+                        -1);
+    }
+
+
+  // *os << be_uidt;
+  // os->indent ();
+  *os << ")";// << be_uidt;
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
+      // each method is pure virtual in the Valuetype class
+      *os << " = 0;\n";
+      break;
+    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IH:
+      break;
+    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IS:
+      break;
+    default:
+       *os << "\n";
+    }
+  if (!this->ctx_->attribute ())    // hack to get a nice newline
+    *os << "\n";
+  return 0;
+}
+
+int
+be_visitor_obv_operation_arglist::visit_argument (be_argument *node)
+{
+  // TAO_OutStream *os = this->ctx_->stream ();
+
+  // get the visitor that will dump the argument's mapping in the operation
+  // signature.
+  be_visitor_context ctx (*this->ctx_);
+
+  // first grab the interface definition inside which this operation is
+  // defined. We need this since argument types may very well be declared
+  // inside the scope of the interface node. In such cases, we would like to
+  // generate the appropriate relative scoped names.
+  be_operation *op = this->ctx_->be_scope_as_operation ();
+  if (!op)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_arglist::"
+                         "visit_argument - "
+                         "Bad operation\n"),
+                        -1);
+    }
+
+  // We need the interface node in which this operation was defined. However,
+  // if this operation node was an attribute node in disguise, we get this
+  // information from the context
+  // %! use AST_Interface
+  be_valuetype *intf;
+  intf = this->ctx_->attribute ()
+    ? be_valuetype::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
+    : be_valuetype::narrow_from_scope (op->defined_in ());
+
+  if (!intf)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_arglist::"
+                         "visit_argument - "
+                         "Bad interface\n"),
+                        -1);
+    }
+  ctx.scope (intf); // set new scope
+
+  //  snipped from
+  //  be_visitor_args_arglist::visit_argument (be_argument *node)
+  ctx.node (node); // save the argument node
+
+  // retrieve the type
+  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_arglist::"
+                         "visit_argument - "
+                         "Bad argument type\n"),
+                        -1);
+    }
+
+  // os->indent (); // start with current indentation level
+
+  // Different types have different mappings when used as in/out or
+  // inout parameters. Let this visitor deal with the type
+
+  // end of be_visitor_args_arglist::visit_argument ()
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
+      ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH);
+      break;
+    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OTHERS:
+    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_SH:
+    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IH:
+    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IS:
+      ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_OTHERS);
+      break;
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_arglist::"
+                           "visit_argument - "
+                           "Bad context\n"),
+                          -1);
+      }
+    }
+
+  // grab a visitor
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_arglist::"
+                         "visit_argument - "
+                         "Bad visitor\n"),
+                        -1);
+    }
+  if (bt->accept (visitor) == -1)
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_arglist::"
+                         "visit_argument - "
+                         "codegen for argument failed\n"),
+                        -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+int
+be_visitor_obv_operation_arglist::post_process (be_decl *bd)
+// derived from be_visitor_operation_argument::post_process (be_decl *bd)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+      switch (this->ctx_->state ())
+        {
+        case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
+        case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OTHERS:
+        case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_SH:
+        case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IH:
+        case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IS:
+          if (!this->last_node (bd))
+            *os << ", "; // "\n";
+          else
+            *os << "";  // "\n";
+          break;
+        default:
+          break;
+        }
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
new file mode 100644
index 00000000000..eb01d5ff6c4
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
@@ -0,0 +1,74 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype, cdr_op_ch, "$Id$")
+
+be_visitor_valuetype_cdr_op_ch::be_visitor_valuetype_cdr_op_ch
+(be_visitor_context *ctx)
+  : be_visitor_valuetype (ctx)
+{
+}
+
+be_visitor_valuetype_cdr_op_ch::~be_visitor_valuetype_cdr_op_ch (void)
+{
+}
+
+int
+be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
+{
+  if (node->cli_hdr_cdr_op_gen () || node->imported ())
+    return 0;
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // generate the CDR << and >> operator declarations (prototypes)
+
+  os->indent ();
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
+      << " operator<< (TAO_OutputCDR &, const " << node->name ()
+      << " *); // " << be_nl;
+  *os << "CORBA::Boolean " << idl_global->export_macro ()
+      << " operator>> (TAO_InputCDR &, "
+      << node->name () << " *&);\n";
+
+  // set the substate as generating code for the types defined in our scope
+  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
+  // all we have to do is to visit the scope and generate code
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_cdr_op_ch::"
+                         "visit_valuetype - "
+                         "codegen for scope failed\n"), -1);
+    }
+
+
+  node->cli_hdr_cdr_op_gen (1);
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
new file mode 100644
index 00000000000..1740bf75f4f
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -0,0 +1,113 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+// #include "be_visitor_field.h"
+
+ACE_RCSID(be_visitor_valuetype, cdr_op_cs, "$Id$")
+
+be_visitor_valuetype_cdr_op_cs::be_visitor_valuetype_cdr_op_cs
+(be_visitor_context *ctx)
+  : be_visitor_valuetype (ctx)
+{
+}
+
+be_visitor_valuetype_cdr_op_cs::~be_visitor_valuetype_cdr_op_cs (void)
+{
+}
+
+int
+be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
+{
+  // already generated and/or we are imported. Don't do anything.
+  if (node->cli_stub_cdr_op_gen () || node->imported ())
+    return 0;
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // First generate code for our children. The reason we do this first is
+  // because the inlined code for our children must be available before we use
+  // it in our parent
+
+  // set the substate as generating code for the types defined in our scope
+  //this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
+  // all we have to do is to visit the scope and generate code
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_cdr_op_cs"
+                         "::visit_valuetype - "
+                         "codegen for scope failed\n"), -1);
+    }
+
+  //  set the sub state as generating code for the output operator
+  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
+  os->indent ();
+  *os << "ACE_INLINE CORBA::Boolean" << be_nl
+      << "operator<< (TAO_OutputCDR &strm, const "
+      << node->name ()
+      << " *_tao_valuetype)" << be_nl
+      << "{" << be_idt_nl;
+  *os << "return CORBA_ValueBase::_tao_marshal (strm,"  << be_idt_nl
+      << "ACE_const_cast (" << node->name () << "*, _tao_valuetype)," << be_nl
+      << "(ptr_arith_t) &" << node->name() <<"::_downcast);"
+      << be_uidt<< be_uidt_nl
+      << "}\n\n";
+
+  // set the substate as generating code for the input operator
+  //this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
+  *os << "ACE_INLINE CORBA::Boolean" << be_nl
+      << "operator>> (TAO_InputCDR &strm, "
+      << node->name ()
+      << " *&_tao_valuetype)" << be_nl
+      << "{" << be_idt_nl;
+  *os << "return " << node->name() << "::_tao_unmarshal (strm, _tao_valuetype);"
+#ifdef obv_marshal_old_version
+  *os << "CORBA::ValueBase *ptr;" << be_nl
+      << "int retval = CORBA_ValueBase::_tao_unmarshal (strm,"
+      << be_idt_nl << "ptr, (ptr_arith_t) &" << node->name() <<"::_downcast);"
+      << be_uidt_nl
+      << "if (retval) {" << be_idt_nl
+      << "_tao_valuetype = " << node->name() << "::_downcast (ptr);"
+      << be_nl << "if (_tao_valuetype) retval = 1;"
+      << be_uidt_nl << "}" << be_idt_nl
+      << "return retval;"
+#endif /* obv_marshal_old_version */
+      << be_uidt_nl
+      << "}\n\n";
+
+  if (!node->is_abstract_valuetype ())
+    { // functions that marshal state
+      be_visitor_context* new_ctx  =
+        new be_visitor_context (*this->ctx_);
+      be_visitor_valuetype_marshal_cs visitor (new_ctx);
+      visitor.visit_valuetype (node);
+    }
+
+  node->cli_stub_cdr_op_gen (1);
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ci.cpp
new file mode 100644
index 00000000000..b54d83166b8
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ci.cpp
@@ -0,0 +1,947 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cdr_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Field in the client stubs file.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_field/cdr_op_cs.cpp
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_field.h"
+
+ACE_RCSID(be_visitor_valuetype, field_cdr_op_cs, "$Id$")
+
+
+// **********************************************
+//  visitor for field in the client stubs file
+// **********************************************
+
+// constructor
+be_visitor_valuetype_field_cdr_ci::be_visitor_valuetype_field_cdr_ci (be_visitor_context *ctx)
+  : be_visitor_decl (ctx),
+    pre_ (""), post_ ("")
+{
+}
+
+// destructor
+be_visitor_valuetype_field_cdr_ci::~be_visitor_valuetype_field_cdr_ci (void)
+{
+}
+
+// visit the field node
+int
+be_visitor_valuetype_field_cdr_ci::visit_field (be_field *node)
+{
+  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_field - "
+                         "Bad field type\n"
+                         ), -1);
+    }
+
+  this->ctx_->node (node); // save the node
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_field - "
+                         "codegen for field type failed\n"
+                         ), -1);
+    }
+  return 0;
+}
+
+// visit array
+int
+be_visitor_valuetype_field_cdr_ci::visit_array (be_array *node)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_array - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // for anonymous arrays, the type name has a _ prepended. We compute
+  // the fullname with or without the underscore and use it later on.
+  char fname [NAMEBUFSIZE];  // to hold the full and
+
+  // save the node's local name and full name in a buffer for quick
+  // use later on
+  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
+  if (!this->ctx_->alias () // not a typedef
+      && node->is_child (this->ctx_->scope ()))
+    {
+      // for anonymous arrays ...
+      // we have to generate a name for us that has an underscore
+      // prepended to our local name. This needs to be inserted after
+      // the parents's name
+
+      if (node->is_nested ())
+        {
+          be_decl *parent =
+            be_scope::narrow_from_scope (node->defined_in ())->decl ();
+          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+                           node->local_name ()->get_string ());
+        }
+      else
+        {
+          ACE_OS::sprintf (fname, "_%s", node->fullname ());
+        }
+    }
+  else
+    {
+      // typedefed node
+      ACE_OS::sprintf (fname, "%s", node->fullname ());
+    }
+
+  // check what is the code generation substate. Are we generating
+  // code for the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> "
+          << "_tao_" << pre_ << f->local_name () << post_ << ")";
+      return 0;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << "
+          << "_tao_" << pre_ << f->local_name () << post_ << ")";
+      return 0;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // proceed further
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_array - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+
+  // if not a typedef and we are defined in the use scope, we must be defined
+
+  if (!this->ctx_->alias () // not a typedef
+      && node->is_child (this->ctx_->scope ()))
+    {
+      // this is the case for anonymous arrays. Generate the <<, >> operators
+      // for the type defined by the anonymous array
+
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // first generate the  declaration
+      ctx.state (TAO_CodeGen::TAO_ARRAY_CDR_OP_CS);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                             "visit_array - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                             "visit_array - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+  return 0;
+}
+
+// visit enum type
+int
+be_visitor_valuetype_field_cdr_ci::visit_enum (be_enum *node)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_array - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
+      return 0;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
+      return 0;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // proceed further
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_enum - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+
+  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
+      && node->is_child (this->ctx_->scope ())) // node is defined inside the
+    // structure
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // generate the typcode for enums
+      ctx.state (TAO_CodeGen::TAO_ENUM_CDR_OP_CS);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                             "visit_enum - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                             "visit_enum - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+  return 0;
+}
+
+// visit interface type
+int
+be_visitor_valuetype_field_cdr_ci::visit_interface (be_interface *)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_interface - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> " << pre_ << f->local_name () << post_ << ".out ())";
+      break;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << " << pre_ << f->local_name () << post_ << ".in ())";
+      break;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // nothing to be done because an interface cannit be declared inside a
+      // structure
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_interface - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+  return 0;
+}
+
+// visit interface forward type
+int
+be_visitor_valuetype_field_cdr_ci::visit_interface_fwd (be_interface_fwd *)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_interface_fwd - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> " << pre_ << f->local_name () << post_ << ").out ()";
+      break;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << " << pre_ << f->local_name () << post_ << ").in ()";
+      break;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // nothing to be done because an interface cannit be declared inside a
+      // structure
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_interface_fwd - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+  return 0;
+}
+
+// visit valuetype type
+int
+be_visitor_valuetype_field_cdr_ci::visit_valuetype (be_valuetype *)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_valuetype - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> " << pre_ << f->local_name () << post_ << ".out ())";
+      break;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << " << pre_ << f->local_name () << post_ << ".in ())";
+      break;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // nothing to be done because an valuetype cannit be declared inside a
+      // structure
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_valuetype - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+  return 0;
+}
+
+// visit valuetype forward type
+int
+be_visitor_valuetype_field_cdr_ci::visit_valuetype_fwd (be_valuetype_fwd *)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_valuetype_fwd - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> " << pre_ << f->local_name () << post_ << ").out ()";
+      break;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << " << pre_ << f->local_name () << post_ << ").in ()";
+      break;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // nothing to be done because an valuetype cannit be declared inside a
+      // structure
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_valuetype_fwd - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+  return 0;
+}
+
+// visit predefined type
+int
+be_visitor_valuetype_field_cdr_ci::visit_predefined_type (be_predefined_type *node)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_predefined_type - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      // is a psuedo obj
+      if (node->pt () == AST_PredefinedType::PT_pseudo)
+        *os << "(strm >> " << pre_ << f->local_name () << post_
+            << ".out ())";
+      else if (node->pt () == AST_PredefinedType::PT_char)
+        *os << "(strm >> CORBA::Any::to_char (" << pre_
+            << f->local_name () << post_ << "))";
+      else if (node->pt () == AST_PredefinedType::PT_wchar)
+        *os << "(strm >> CORBA::Any::to_wchar (" << pre_
+            << f->local_name () << post_ << "))";
+      else if (node->pt () == AST_PredefinedType::PT_octet)
+        *os << "(strm >> CORBA::Any::to_octet (" << pre_
+            << f->local_name () << post_ << "))";
+      else if (node->pt () == AST_PredefinedType::PT_boolean)
+        *os << "(strm >> CORBA::Any::to_boolean (" << pre_
+            << f->local_name () << post_ << "))";
+      else
+        *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
+      break;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      // is a psuedo obj
+      if (node->pt () == AST_PredefinedType::PT_pseudo)
+        *os << "(strm << " << pre_ << f->local_name () << post_ << ".in ())";
+      else if (node->pt () == AST_PredefinedType::PT_char)
+        *os << "(strm << CORBA::Any::from_char (" << pre_
+            << f->local_name () << post_ << "))";
+      else if (node->pt () == AST_PredefinedType::PT_wchar)
+        *os << "(strm << CORBA::Any::from_wchar (" << pre_
+            << f->local_name () << post_ << "))";
+      else if (node->pt () == AST_PredefinedType::PT_octet)
+        *os << "(strm << CORBA::Any::from_octet (" << pre_
+            << f->local_name () << post_ << "))";
+      else if (node->pt () == AST_PredefinedType::PT_boolean)
+        *os << "(strm << CORBA::Any::from_boolean (" << pre_
+            << f->local_name () << post_ << "))";
+      else
+        *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
+      break;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // nothing to be done
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_array - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cdr_ci::visit_sequence (be_sequence *node)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_sequence - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
+      return 0;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
+      return 0;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // proceed further
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_sequence - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+
+  if (node->node_type () != AST_Decl::NT_typedef
+      && node->is_child (this->ctx_->scope ()))
+    // not a typedef AND
+    // node is defined inside the structure
+    {
+      // Anonymous sequence
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited.
+      // The scope is still the same
+
+      // generate the inline code for structs
+      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CDR_OP_CS);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                             "visit_sequence - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                             "visit_sequence - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+  return 0;
+}
+
+// visit string type
+int
+be_visitor_valuetype_field_cdr_ci::visit_string (be_string *)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_string - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> " << pre_ << f->local_name () << post_ << ".out ())";
+      break;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << " << pre_ << f->local_name () << post_ << ".in ())";
+      break;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // nothing to be done
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_array - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+
+  return 0;
+}
+
+// visit structure type
+int
+be_visitor_valuetype_field_cdr_ci::visit_structure (be_structure *node)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_structure - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
+      return 0;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
+      return 0;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // proceed further
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_structure - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+
+  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
+      && node->is_child (this->ctx_->scope ())) // node is defined inside the
+    // structure
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope is
+      // still the same
+
+      // generate the inline code for structs
+      ctx.state (TAO_CodeGen::TAO_STRUCT_CDR_OP_CS);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                             "visit_struct - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                             "visit_struct - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+  return 0;
+}
+
+// visit typedef type
+int
+be_visitor_valuetype_field_cdr_ci::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node); // save the typedef node for use in code generation
+                           // as we visit the base type
+
+  // the node to be visited in the base primitve type that gets typedefed
+  be_type *bt = node->primitive_base_type ();
+  if (!bt || (bt->accept (this) == -1))
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_branch_public_ci::"
+                         "visit_typedef - "
+                         "Bad primitive type\n"
+                         ), -1);
+    }
+
+  this->ctx_->alias (0);
+  return 0;
+}
+
+// visit union type
+int
+be_visitor_valuetype_field_cdr_ci::visit_union (be_union *node)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_union - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // check what is the code generations substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
+      return 0;
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
+      return 0;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+      // proceed further
+      break;
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                         "visit_union - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+
+  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
+      && node->is_child (this->ctx_->scope ())) // node is defined inside the
+    // structure
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope is
+      // still the same
+
+      // generate the inline code for union
+      ctx.state (TAO_CodeGen::TAO_UNION_CDR_OP_CS);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                             "visit_union - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
+                             "visit_union - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+  return 0;
+}
+
+
+// ****************************************************************
+
+be_visitor_valuetype_field_cdr_decl::
+    be_visitor_valuetype_field_cdr_decl (be_visitor_context *ctx)
+  : be_visitor_scope (ctx)
+{
+}
+
+// This is a field, but the action depends on the type of the field,
+// use this visitor to detect the type of the field.
+// Notice that this is why the parent visitor (who create us) cannot
+// do the job, because it may have another purpose for some or all of
+// the visit_* methods; in other words, while running a visitor to
+// generate CDR operators for structures we cannot use that one to
+// generate the code of each field, because visit_struct already has a
+// meaning in that visitor.
+int
+be_visitor_valuetype_field_cdr_decl::visit_field (be_field *node)
+{
+  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
+                         "visit_field - "
+                         "Bad field type\n"
+                         ), -1);
+    }
+
+  // @@ Shouldn't this be saved in the visitor and not the context?!
+  this->ctx_->node (node); // save the node
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
+                         "visit_field - "
+                         "codegen for field type failed\n"
+                         ), -1);
+    }
+  return 0;
+}
+
+// visit array
+int
+be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  // retrieve the field node
+  be_field *f = this->ctx_->be_node_as_field ();
+  if (!f)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
+                         "visit_array - "
+                         "cannot retrieve field node\n"
+                         ), -1);
+    }
+
+  // retrieve the valuetype scope in which the code is generated
+  be_decl *sc = this->ctx_->scope ();
+  be_valuetype *vt = be_valuetype::narrow_from_decl (sc);
+  if (!vt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
+                         "visit_array - "
+                         "cannot retrieve valuetype node\n"
+                         ), -1);
+    }
+
+  // for anonymous arrays, the type name has a _ prepended. We compute
+  // the fullname with or without the underscore and use it later on.
+  char fname [NAMEBUFSIZE];  // to hold the full and
+
+  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
+  if (!this->ctx_->alias () // not a typedef
+      && node->is_child (this->ctx_->scope ()))
+    {
+      // for anonymous arrays ...
+      // we have to generate a name for us that has an underscope
+      // prepended to our local name. This needs to be inserted after
+      // the parents's name
+
+      if (node->is_nested ())
+        {
+          be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
+          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+                           node->local_name ()->get_string ());
+        }
+      else
+        {
+          ACE_OS::sprintf (fname, "_%s", node->fullname ());
+        }
+    }
+  else
+    {
+      // typedefed node
+      ACE_OS::sprintf (fname, "%s", node->fullname ());
+    }
+
+  // check what is the code generation substate. Are we generating code for
+  // the in/out operators for our parent or for us?
+  switch (this->ctx_->sub_state ())
+    {
+    case TAO_CodeGen::TAO_CDR_INPUT:
+    case TAO_CodeGen::TAO_CDR_OUTPUT:
+      *os << fname << "_forany "
+          << "_tao_" << vt->field_pd_prefix () << f->local_name ()
+          << vt->field_pd_postfix () << be_idt << be_idt_nl
+          << "(ACE_const_cast (" << be_idt << be_idt_nl
+          << fname << "_slice*," << be_nl
+          << vt->field_pd_prefix () << f->local_name ()
+          << vt->field_pd_postfix () << be_uidt_nl
+          << ")" << be_uidt << be_uidt_nl
+          << ");" << be_uidt_nl;
+      return 0;
+    case TAO_CodeGen::TAO_CDR_SCOPE:
+    default:
+      // error
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
+                         "visit_array - "
+                         "bad sub state\n"
+                         ), -1);
+    }
+  ACE_NOTREACHED (return 0);
+}
+
+// visit typedef type
+int
+be_visitor_valuetype_field_cdr_decl::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node); // save the typedef node for use in code generation
+                           // as we visit the base type
+
+  // the node to be visited in the base primitve type that gets typedefed
+  be_type *bt = node->primitive_base_type ();
+  if (!bt || (bt->accept (this) == -1))
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_cdr_op_field_decl::"
+                         "visit_typedef - "
+                         "Bad primitive type\n"
+                         ), -1);
+    }
+
+  this->ctx_->alias (0);
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
new file mode 100644
index 00000000000..61002b251b1
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -0,0 +1,747 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating the accessor and modifier declarations
+//    for valuetype fields in the valuetype class (header).
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_union_branch/public_ch.cpp
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+ACE_RCSID(be_visitor_valuetype, field_ch, "$Id$")
+
+
+// constructor
+be_visitor_valuetype_field_ch::be_visitor_valuetype_field_ch
+    (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+  setenclosings ("",";");
+}
+
+// destructor
+be_visitor_valuetype_field_ch::~be_visitor_valuetype_field_ch (void)
+{
+}
+
+// visit the field node
+int
+be_visitor_valuetype_field_ch::visit_field (be_field *node)
+{
+  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_union_branch - "
+                         "Bad type\n"
+                         ), -1);
+    }
+
+  this->ctx_->node (node); // save the node
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_union_branch - "
+                         "codegen failed\n"
+                         ), -1);
+    }
+  return 0;
+}
+
+// =visit operations on all possible data types (valuetype state member)
+
+// visit array type
+int
+be_visitor_valuetype_field_ch::visit_array (be_array *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union node
+  be_type *bt;
+
+  // check if we are visiting this via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_array - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // this is the case of an anonymous array inside a union
+
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // first generate the array declaration
+      ctx.state (TAO_CodeGen::TAO_ARRAY_CH);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_ch::"
+                             "visit_array - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_ch::"
+                             "visit_array - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+      // now use this array as a "type" for the subsequent declarator
+      os->indent (); // start from current indentation
+      // the set method
+      *os << pre_op() << "void " << ub->local_name () << " ("
+          << "_" << bt->local_name () << ")"
+          << post_op() << "    // set" << be_nl;
+      // the get method
+      *os << pre_op() << "_" << bt->local_name ()
+          << "_slice * " << ub->local_name ()
+          << " (void) const" << post_op() << "     // get method\n\n";
+    }
+  else
+    {
+      // now use this array as a "type" for the subsequent declarator
+      os->indent (); // start from current indentation
+      // the set method
+      *os << pre_op() << "void " << ub->local_name () << " ("
+          << bt->nested_type_name (bu) << ")" << post_op() << "    // set"
+          << be_nl;
+      // the get method
+ /* %! is const return really in the specs ?
+      *os << pre_op() << "const "
+          << bt->nested_type_name (bu, "_slice *") << " " << ub->local_name ()
+          << " (void) const" << post_op() << "     // get (read only) method\n\n";
+ */
+      // the get (read/write) method
+      *os << pre_op()
+          << bt->nested_type_name (bu, "_slice *") << " " << ub->local_name ()
+          << " (void) const" << post_op() << "     // get method\n\n";
+    }
+
+  return 0;
+}
+
+// visit enum type
+int
+be_visitor_valuetype_field_ch::visit_enum (be_enum *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union node
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_enum - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // first generate the enum declaration
+      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_ch::"
+                             "visit_enum - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_ch::"
+                             "visit_enum - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+
+  // now use this enum as a "type" for the subsequent declarator
+  os->indent (); // start from current indentation
+  // the set method
+  *os << pre_op() << "void " << ub->local_name () << " ("
+      << bt->nested_type_name (bu) << ")" << post_op() << "    // set"
+      << be_nl;
+  // the get method
+  *os << pre_op() << bt->nested_type_name (bu) << " " << ub->local_name ()
+      << " (void) const" << post_op() << "     // get method\n\n";
+
+  return 0;
+}
+
+// visit interface type
+int
+be_visitor_valuetype_field_ch::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_interface - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  os->indent (); // start from current indentation
+  // set method
+  *os << pre_op() << "void " << ub->local_name () << " ("
+      << bt->nested_type_name (bu, "_ptr")
+      << ")" << post_op() << "    // set" << be_nl;
+  // get method
+  *os << pre_op()
+      << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
+      << " (void) const" << post_op() << "     // get method\n\n";
+  return 0;
+}
+
+// visit interface forward type
+int
+be_visitor_valuetype_field_ch::visit_interface_fwd (be_interface_fwd *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_interface_fwd - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  os->indent (); // start from current indentation
+  // set method
+  *os << pre_op() << "void " << ub->local_name () << " ("
+      << bt->nested_type_name (bu, "_ptr")
+      << ")" << post_op() << "    // set" << be_nl;
+  // get method
+  *os << pre_op()
+      << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
+      << " (void) const" << post_op() << "     // get method\n\n";
+  return 0;
+}
+
+// visit valuetype type
+int
+be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_valuetype - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  os->indent (); // start from current indentation
+  // set method
+  *os << pre_op() << "void " << ub->local_name () << " ("
+      << bt->nested_type_name (bu, "*")
+      << ")" << post_op() << "    // set" << be_nl;
+  // get method
+  *os << pre_op()
+      << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
+      << " (void) const" << post_op() << "     // get method\n\n";
+  return 0;
+}
+
+// visit valuetype forward type
+int
+be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_valuetype_fwd - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  os->indent (); // start from current indentation
+  // set method
+  *os << pre_op() << "void " << ub->local_name () << " ("
+      << bt->nested_type_name (bu, "*")
+      << ")" << post_op() << "    // set" << be_nl;
+  // get method
+  *os << pre_op()
+      << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
+      << " (void) const" << post_op() << "     // get method\n\n";
+  return 0;
+}
+
+// visit predefined type
+int
+be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_predefined_type - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+  os->indent (); // start from current indentation
+  switch (node->pt ())
+    {
+    case AST_PredefinedType::PT_pseudo:
+      // set method
+      *os << pre_op() << "void " << ub->local_name () << " ("
+          << bt->nested_type_name (bu, "_ptr") << ")"
+          << post_op() << "    // set" << be_nl;
+        // get method
+      *os << pre_op()
+          << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
+          << " (void) const" << post_op() << "     // get method\n\n";
+      break;
+    case AST_PredefinedType::PT_any:
+      // set method
+      *os << pre_op() << "void " << ub->local_name () << " ("
+          << bt->nested_type_name (bu) << ")"
+          << post_op() << "    // set" << be_nl;
+      // get method (read-only)
+      *os << pre_op() << "const " << bt->nested_type_name (bu) << " "
+          << ub->local_name () << " (void) const"
+          << post_op() << "     // get method\n\n";
+      // get method (read/write)
+      *os << pre_op() << bt->nested_type_name (bu) << " "
+          << ub->local_name () << " (void)"
+          << post_op() << "     // get method\n\n";
+      break;
+    case AST_PredefinedType::PT_void:
+      break;
+    default:
+      // set method
+      *os << pre_op() << "void " << ub->local_name () << " ("
+          << bt->nested_type_name (bu) << ")"
+          << post_op() << "    // set" << be_nl;
+      // get method
+      *os << pre_op() << bt->nested_type_name (bu) << " " << ub->local_name ()
+          << " (void) const" << post_op() << "     // get method\n\n";
+    }
+  return 0;
+}
+
+// visit sequence type
+int
+be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_sequence - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // first generate the sequence declaration
+      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CH);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_ch::"
+                             "visit_sequence - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_ch::"
+                             "visit_sequence - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+  os->indent ();
+  // set method
+  *os << pre_op() << "void " << ub->local_name () << " (const "
+      << bt->nested_type_name (bu) << " &)"
+      << post_op() << "    // set" << be_nl;
+  // read-only
+  *os << pre_op() << "const " << bt->nested_type_name (bu) << " &"
+      << ub->local_name  () << " (void) const"
+      << post_op() << "     // get method (read only)" << be_nl;
+  // read/write
+  *os << pre_op() << bt->nested_type_name (bu) << " &" << ub->local_name ()
+      << " (void)"
+      << post_op() << "     // get method (read/write only)\n\n";
+
+  return 0;
+}
+
+// visit string type
+int
+be_visitor_valuetype_field_ch::visit_string (be_string *)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_string - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  os->indent ();
+  // three methods to set the string value
+  *os << pre_op()
+      << "void " << ub->local_name () << " (char *)"
+      << post_op() << "     // set" << be_nl;
+  *os << pre_op()
+      << "void " << ub->local_name () << " (const char *)"
+      << post_op() << "     // set" << be_nl;
+  *os << pre_op()
+      << "void " << ub->local_name () << " (const CORBA::String_var&)"
+      << post_op() << "     // set" << be_nl;
+  //get method
+  *os << pre_op() << "const char *" << ub->local_name ()
+      << " (void) const" << post_op() << "     // get method\n\n";
+  return 0;
+}
+
+// visit structure type
+int
+be_visitor_valuetype_field_ch::visit_structure (be_structure *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_structure - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // first generate the sequence declaration
+      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_ch::"
+                             "visit_structure - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_ch::"
+                             "visit_structure - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+  os->indent ();
+  // set method
+  *os << pre_op() << "void " << ub->local_name () << " (const "
+      << bt->nested_type_name (bu) << " &)"
+      << post_op() << "    // set" << be_nl
+    // read-only
+      << pre_op() << "const " << bt->nested_type_name (bu) << " &"
+      << ub->local_name  () << " (void) const"
+      << post_op() << "     // get method (read only)" << be_nl
+    // read/write
+      << pre_op() << bt->nested_type_name (bu) << " &" << ub->local_name ()
+      << " (void)" << post_op() << "     // get method (read/write only)\n\n";
+
+  return 0;
+}
+
+// visit typedefed type
+int
+be_visitor_valuetype_field_ch::visit_typedef (be_typedef *node)
+{
+  TAO_OutStream *os; // output stream
+
+  os = this->ctx_->stream ();
+  os->indent (); // start from current indentation level
+  this->ctx_->alias (node);     // save the node for use in code generation and
+                               // indicate that the union_branch of the union_branch node
+                               // is a typedefed quantity
+
+  // make a decision based on the primitive base type
+  be_type *bt = node->primitive_base_type ();
+  if (!bt || (bt->accept (this) == -1))
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_spec_ch::"
+                         "visit_typedef - "
+                         "Bad primitive type\n"
+                         ), -1);
+    }
+  this->ctx_->alias (0);
+  return 0;
+}
+
+// visit union type
+int
+be_visitor_valuetype_field_ch::visit_union (be_union *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub = this->ctx_->node (); // get state member
+  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_ch::"
+                         "visit_union - "
+                         "bad context information\n"
+                         ), -1);
+    }
+
+  os = this->ctx_->stream ();
+
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // first generate the sequence declaration
+      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_ch::"
+                             "visit_union - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_ch::"
+                             "visit_union - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+  os->indent ();
+  // set method
+  *os << pre_op() << "void " << ub->local_name () << " (const "
+      << bt->nested_type_name (bu) << " &)"
+      << post_op() << "    // set" << be_nl
+    // read-only
+      << pre_op() << "const " << bt->nested_type_name (bu) << " &"
+      << ub->local_name  () << " (void) const"
+      << post_op() << "     // get method (read only)"
+      << be_nl
+    // read/write
+      << pre_op() << bt->nested_type_name (bu) << " &" << ub->local_name ()
+      << " (void)" << post_op() << "     // get method (read/write only)\n\n";
+
+  return 0;
+}
+
+void
+be_visitor_valuetype_field_ch::setenclosings (char *pre, char *post)
+{
+  pre_op_ = pre;
+  post_op_ = post;
+}
+
+const char*
+be_visitor_valuetype_field_ch::pre_op ()
+{
+  return pre_op_;
+}
+
+const char*
+be_visitor_valuetype_field_ch::post_op ()
+{
+  return post_op_;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
new file mode 100644
index 00000000000..e0073f7add3
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -0,0 +1,1039 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cs.cpp
+//
+// = DESCRIPTION
+//     Visitor for the Valuetype class.
+//     This one generates code for accessor and modifier functions of
+//     valuetype state members (in the stub or inline file).
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_union_branch/public_ci.cpp
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype, field_cs, "$Id$")
+
+
+// constructor
+be_visitor_valuetype_field_cs::
+be_visitor_valuetype_field_cs (be_visitor_context *ctx)
+  : be_visitor_decl (ctx),
+    in_obv_space_ (0)
+{
+  setenclosings ("");
+}
+
+// destructor
+be_visitor_valuetype_field_cs::
+~be_visitor_valuetype_field_cs (void)
+{
+}
+
+// visit the field node
+int
+be_visitor_valuetype_field_cs::
+visit_field (be_field *node)
+{
+  be_type *bt = be_type::narrow_from_decl (node->field_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_field_cs::"
+                         "visit_field - "
+                         "Bad field type\n"
+                         ), -1);
+    }
+
+  this->ctx_->node (node); // save the node
+  if (bt->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_field_cs::"
+                         "visit_field - "
+                         "codegen for field type failed\n"
+                         ), -1);
+    }
+  return 0;
+}
+
+// =visit operations on all possible data types  that a union_branch can be
+
+int
+be_visitor_valuetype_field_cs::visit_array (be_array *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_array - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  os = this->ctx_->stream ();
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // first generate the inline operations for this anonymous array type
+      ctx.state (TAO_CodeGen::TAO_ARRAY_CI);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cs::"
+                             "visit_array - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cs::"
+                             "visit_array - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+
+  // for anonymous arrays, the type name has a _ prepended. We compute the
+  // fullname with or without the underscore and use it later on.
+  char fname [NAMEBUFSIZE];  // to hold the full and
+
+  // save the node's local name and full name in a buffer for quick use later
+  // on
+  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // for anonymous arrays ...
+      // we have to generate a name for us that has an underscope prepended to
+      // our local name. This needs to be inserted after the parents's name
+
+      if (bt->is_nested ())
+        {
+          be_decl *parent =
+                 be_scope::narrow_from_scope (bt->defined_in ())->decl ();
+          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+                           bt->local_name ()->get_string ());
+        }
+      else
+        {
+          ACE_OS::sprintf (fname, "_%s", bt->fullname ());
+        }
+    }
+  else
+    {
+      // typedefed node
+      ACE_OS::sprintf (fname, "%s", bt->fullname ());
+    }
+
+  // set method
+  os->indent (); // start from current indentation
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+  this->op_name(bu,os); *os << "::" << ub->local_name () << " (" << fname
+      << " val)// set" << be_nl
+      << "{" << be_idt_nl;
+
+  *os << fname << "_copy ("
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ", val);" << be_uidt_nl;
+
+  *os << "}" << be_nl;
+
+  // get method
+  *os << "// retrieve the member" << be_nl
+      << this->pre_op() << fname << "_slice *" << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " (void) const" << be_nl
+      << "{" << be_idt_nl;
+      *os << "return this->"
+          << bu->field_pd_prefix() << ub->local_name ()
+          << bu->field_pd_postfix() << ";" << be_uidt_nl;
+  *os << "}\n\n";
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_enum (be_enum *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_enum - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  os = this->ctx_->stream ();
+
+  // set method
+  os->indent (); // start from current indentation
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " (" << bt->name ()
+      << " val)// set" << be_nl
+      << "{\n";
+  os->incr_indent ();
+  *os << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << " = val;\n";
+  os->decr_indent ();
+  *os << "}" << be_nl;
+
+  // get method
+  *os << "// retrieve the member" << be_nl
+      << this->pre_op() << bt->name () << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " () const"
+      << be_nl
+      << "{\n";
+  os->incr_indent ();
+  *os << "return this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ";\n";
+  os->decr_indent ();
+  *os << "}\n\n";
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_interface - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  os = this->ctx_->stream ();
+
+  // set method
+  os->indent (); // start from current indentation
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " (" << bt->name ()
+      << "_ptr val)// set" << be_nl
+      << "{\n";
+  os->incr_indent ();
+  *os << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << " = val->duplicate ();" << be_uidt_nl;
+  *os << "}" << be_nl;
+
+  // get method
+  *os << "// retrieve the member" << be_nl
+      << this->pre_op() << bt->name () << "_ptr " << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " () const"
+      << be_nl
+      << "{\n";
+  os->incr_indent ();
+  *os << "return this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ".ptr ();\n";
+  os->decr_indent ();
+  *os << "}\n\n";
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_interface_fwd (be_interface_fwd *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_interface - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  os = this->ctx_->stream ();
+
+  // set method
+  os->indent (); // start from current indentation
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " (" << bt->name ()
+      << "_ptr val)// set" << be_nl
+      << "{\n";
+  os->incr_indent ();
+  *os << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << " = val->duplicate ();" << be_uidt_nl;
+  *os << "}" << be_nl;
+
+  // get method
+  *os << "// retrieve the member" << be_nl
+      << this->pre_op() << bt->name () << "_ptr " << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " () const"
+      << be_nl
+      << "{\n";
+  os->incr_indent ();
+  *os << "return this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ".ptr ();\n";
+  os->decr_indent ();
+  *os << "}\n\n";
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_interface - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  os = this->ctx_->stream ();
+
+  // set method
+  os->indent (); // start from current indentation
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " (" << bt->name ()
+      << "* val)// set" << be_nl
+      << "{\n";
+  os->incr_indent ();
+  *os << "if (val) val->_add_ref ();" << be_nl
+      << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << " = val;" << be_uidt_nl;
+  *os << "}" << be_nl;
+
+  // get method
+  *os << "// retrieve the member" << be_nl
+      << this->pre_op() << bt->name () << "* " << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " () const"
+      << be_nl
+      << "{\n";
+  os->incr_indent ();
+  *os << "return this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ".ptr ();\n";
+  os->decr_indent ();
+  *os << "}\n\n";
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_interface - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  os = this->ctx_->stream ();
+
+  // set method
+  os->indent (); // start from current indentation
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " (" << bt->name ()
+      << "* val)// set" << be_nl
+      << "{\n";
+  os->incr_indent ();
+  *os << "if (val) val->_add_ref ();" << be_nl
+      << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << " = val;" << be_uidt_nl;
+  *os << "}" << be_nl;
+
+  // get method
+  *os << "// retrieve the member" << be_nl
+      << this->pre_op() << bt->name () << "* " << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name () << " () const"
+      << be_nl
+      << "{\n";
+  os->incr_indent ();
+  *os << "return this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ".ptr ();\n";
+  os->decr_indent ();
+  *os << "}\n\n";
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
+{
+  TAO_OutStream *os; // output stream
+
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+  be_type *bt;
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_predef... - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  os = this->ctx_->stream ();
+
+  // set method
+  os->indent (); // start from current indentation
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name ()
+      << " (" << bt->name ();
+  if (node->pt () == AST_PredefinedType::PT_pseudo)
+    *os << "_ptr";
+  *os << " val) // set" << be_nl
+      << "{" << be_idt_nl;
+
+      switch (node->pt ())
+        {
+        case AST_PredefinedType::PT_pseudo:
+          *os << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+              << " = "
+              << bt->name () << "::_duplicate (val);" << be_uidt_nl;
+          break;
+
+        case AST_PredefinedType::PT_any:
+          *os << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+              << " = new "
+              << bt->name () << " (val);" << be_uidt_nl;
+          break;
+
+        case AST_PredefinedType::PT_void:
+          break;
+
+        default:
+          *os << "// set the value" << be_nl
+              << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+              << " = val;" << be_uidt_nl;
+        }
+  *os << "}" << be_nl;
+
+  switch (node->pt ())
+    {
+    case AST_PredefinedType::PT_pseudo:
+      // get method
+      *os << "// retrieve the member" << be_nl
+          << this->pre_op() << bt->name () << "_ptr" << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name ()
+          << " (void) const" << be_nl
+          << "{" << be_idt_nl
+          << "return this->u"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << ";" << be_uidt_nl
+          << "}\n\n";
+      break;
+    case AST_PredefinedType::PT_any:
+      // get method with read-only access
+      *os << "// retrieve the member" << be_nl
+          << this->pre_op() << "const " << bt->name () << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name ()
+          << " (void) const" << be_nl
+          << "{" << be_idt_nl
+          << "return *this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << ";" << be_uidt_nl
+          << "}" << be_nl;
+
+      // get method with read/write access
+      *os << "// retrieve the member" << be_nl
+          << this->pre_op() << bt->name () << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name ()
+          << " (void)" << be_nl
+          << "{" << be_idt_nl
+          << "return *this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << ";" << be_uidt_nl
+          << "}\n\n";
+      break;
+    case AST_PredefinedType::PT_void:
+      break;
+    default:
+      // get method
+      *os << "// retrieve the member" << be_nl
+          << this->pre_op() << bt->name () << be_nl;
+      this->op_name(bu,os);
+      *os << "::" << ub->local_name ()
+          << " (void) const" << be_nl
+          << "{" << be_idt_nl
+          << "return this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << ";" << be_uidt_nl
+          << "}\n\n";
+    }
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_sequence - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  os = this->ctx_->stream ();
+
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // first generate the inline operations for this anonymous sequence type
+      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CI);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cs::"
+                             "visit_sequence - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cs::"
+                             "visit_sequence - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+
+  // (1) set from a const
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name ()
+      << " (const " << bt->name () << " &val)" << be_nl
+      << "{" << be_idt_nl;
+
+      *os << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << " = new "
+          << bt->name () << " (val);" << be_uidt_nl;
+
+  *os << "}" << be_nl;
+
+  // readonly get method
+  *os << "// readonly get method " << be_nl
+      << this->pre_op() << "const " << bt->name () << " &" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name ()
+      << " (void) const" << be_nl
+      << "{" << be_idt_nl
+      << "return this->"   // %! *this (seq_var, not seq member)
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ";" << be_uidt_nl
+      << "}" << be_nl;
+
+  // read/write get method
+  *os << "// read/write get method " << be_nl
+      << this->pre_op() << bt->name () << " &" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name () << " (void)" << be_nl
+      << "{" << be_idt_nl
+      << "return this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ";" << be_uidt_nl
+      << "}\n\n";
+
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_string (be_string *)
+{
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_string - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // three methods to set the string value
+
+  // (1) set method from char*
+  os->indent (); // start from current indentation
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name () << " (char *val)"
+      << be_nl
+      << "{" << be_idt_nl;
+
+      *os << "// set the value" << be_nl
+          << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << " = val;" << be_uidt_nl
+      << "}" << be_nl;
+
+  // (2) set method from const char *
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name ()
+      << " (const char *val)" << be_nl
+      << "{\n";
+  os->incr_indent ();
+
+      *os << "// set the value" << be_nl
+          << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << " = "
+          << "CORBA::string_dup (val);" << be_uidt_nl;
+
+  *os << "}" << be_nl;
+
+  // (3) set from const String_var&
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name ()
+      << " (const CORBA::String_var &val)" << be_nl
+      << "{" << be_idt_nl;
+      *os << ";" << be_nl;
+
+      *os << "// set the value" << be_nl
+          << "CORBA::String_var " << ub->local_name ()
+          << "_var = val;" << be_nl
+          << "this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << " = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
+
+  *os << "}" << be_nl;
+
+  // get method
+  *os << this->pre_op() << "const char *" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name ()
+      << " (void) const // get method" << be_nl
+      << "{" << be_idt_nl
+      << "return this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ";" << be_uidt_nl
+      << "}\n\n";
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
+{
+  TAO_OutStream *os; // output stream
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_structure - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  os = this->ctx_->stream ();
+
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // first generate the enum declaration
+      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cs::"
+                             "visit_structure - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cs::"
+                             "visit_structure - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+
+  // (1) set from a const
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name ()
+      << " (const " << bt->name () << " &val)" << be_nl
+      << "{" << be_idt_nl;
+
+  if (0) // %! (bt->size_type () == be_type::VARIABLE)
+    { cerr <<"!t VARIABLE struct in field_cs\n";
+      *os << "delete this->"
+     << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << ";" << be_nl;
+      *os << "this->"
+     << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << " = new "
+          << bt->name () << " (val);" << be_uidt_nl;
+    }
+  else
+    {
+      *os << "this->"
+     << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << " = val;" << be_uidt_nl;
+    }
+
+  *os << "}" << be_nl;
+
+  // readonly get method
+  *os << "// readonly get method " << be_nl
+      << this->pre_op() << "const " << bt->name () << " &" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name () << " (void) const" << be_nl
+      << "{" << be_idt_nl;
+  if (0) // %! (bt->size_type () == be_type::VARIABLE)
+    *os << "return *this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+        << ";" << be_uidt_nl;
+  else
+    *os << "return this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+        << ";" << be_uidt_nl;
+  *os << "}" << be_nl;
+
+  // read/write get method
+  *os << "// read/write get method " << be_nl
+      << this->pre_op() << bt->name () << " &" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name () << " (void)" << be_nl
+      << "{" << be_idt_nl;
+  if (0) // %! (bt->size_type () == be_type::VARIABLE)
+    *os << "return *this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+        << ";" << be_uidt_nl;
+  else
+    *os << "return this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+        << ";" << be_uidt_nl;
+  *os << "}\n\n";
+
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node); // save the typedef node for use in code generation
+                           // as we visit the base type
+
+  // the node to be visited in the base primitve type that gets typedefed
+  be_type *bt = node->primitive_base_type ();
+  if (!bt || (bt->accept (this) == -1))
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_typedef - "
+                         "Bad primitive type\n"
+                         ), -1);
+    }
+
+  this->ctx_->alias (0);
+  return 0;
+}
+
+int
+be_visitor_valuetype_field_cs::visit_union (be_union *node)
+{
+  cerr << "!u be_visitor_valuetype_field_cs::visit_union unimp.\n";
+  TAO_OutStream *os; // output stream
+  be_decl *ub =
+    this->ctx_->node (); // get field node
+  be_valuetype *bu =
+    be_valuetype::narrow_from_decl (this->ctx_->scope ());
+  be_type *bt;
+
+  // check if we are visiting this node via a visit to a typedef node
+  if (this->ctx_->alias ())
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  if (!ub || !bu)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_field_cs::"
+                         "visit_union - "
+                         "bad context information\n"
+                         ), -1);
+    }
+  os = this->ctx_->stream ();
+
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
+    {
+      // instantiate a visitor context with a copy of our context. This info
+      // will be modified based on what type of node we are visiting
+      be_visitor_context ctx (*this->ctx_);
+      ctx.node (node); // set the node to be the node being visited. The scope
+                       // is still the same
+
+      // first generate the enum declaration
+      ctx.state (TAO_CodeGen::TAO_UNION_CI);
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cs::"
+                             "visit_union - "
+                             "Bad visitor\n"
+                             ), -1);
+        }
+      if (node->accept (visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_field_cs::"
+                             "visit_union - "
+                             "codegen failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+
+  // (1) set from a const
+  *os << "// accessor to set the member" << be_nl
+      << this->pre_op() << "void" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name ()
+      << " (const " << bt->name () << " &val)" << be_nl
+      << "{" << be_idt_nl;
+
+      *os << "this->"
+     << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+          << "_var = new " << bt->name ()
+          << " (val);" << be_nl;
+
+  *os << "}" << be_nl;
+
+  // readonly get method
+  *os << "// readonly get method " << be_nl
+      << this->pre_op() << "const " << bt->name () << " &" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name () << " (void) const" << be_nl
+      << "{" << be_idt_nl
+      << "return *this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ";" << be_uidt_nl
+      << "}" << be_nl;
+
+  // read/write get method
+  *os << "// read/write get method " << be_nl
+      << this->pre_op() << bt->name () << " &" << be_nl;
+  this->op_name(bu,os);
+  *os << "::" << ub->local_name () << " (void)" << be_nl
+      << "{" << be_idt_nl
+      << "return *this->"
+      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
+      << ";" << be_uidt_nl
+      << "}\n\n";
+
+  return 0;
+}
+
+void
+be_visitor_valuetype_field_cs::setenclosings (char *pre)
+{
+  pre_op_ = pre;
+}
+
+const char*
+be_visitor_valuetype_field_cs::pre_op ()
+{
+  return pre_op_;
+}
+
+// retrieve the fully scoped skeleton name
+void
+be_visitor_valuetype_field_cs::op_name (be_valuetype *node,
+                                        TAO_OutStream *os)
+{
+  if (this->in_obv_space_)
+    *os << node->full_obv_skel_name ();
+  else
+    *os << node->name ();
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
new file mode 100644
index 00000000000..7c960555450
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
@@ -0,0 +1,50 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    marshal_ch.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for marshalling.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype, marshal_ch, "$Id$")
+
+// ***************************************************************************
+// Structure visitor for generating  declarations
+// ***************************************************************************
+
+be_visitor_valuetype_marshal_ch::be_visitor_valuetype_marshal_ch
+(be_visitor_context *ctx)
+  : be_visitor_scope (ctx)
+{
+}
+
+be_visitor_valuetype_marshal_ch::~be_visitor_valuetype_marshal_ch (void)
+{
+}
+
+int
+be_visitor_valuetype_marshal_ch::visit_valuetype (be_valuetype *node)
+{
+   return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
new file mode 100644
index 00000000000..1f7e5405a67
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -0,0 +1,200 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    marshal_cs.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for marshalling.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype, marshal_cs, "$Id$")
+
+
+be_visitor_valuetype_marshal_cs::be_visitor_valuetype_marshal_cs
+(be_visitor_context *ctx)
+  : be_visitor_scope (ctx)
+{
+}
+
+be_visitor_valuetype_marshal_cs::~be_visitor_valuetype_marshal_cs (void)
+{
+}
+
+int
+be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
+  os->indent ();
+  *os << "ACE_INLINE CORBA::Boolean" << be_nl;
+  this->class_name (node, os);
+  *os << "::_tao_marshal_state (TAO_OutputCDR &strm)" << be_nl
+      << "{" << be_idt_nl;
+  be_valuetype *inh = node->statefull_inherit ();
+  if (inh)
+    {
+      if (inh->opt_accessor ())
+        {
+          *os << "if (!";
+          this->class_name (inh, os);
+          *os << "::_tao_marshal_state (strm)) return 0;" << be_nl;
+        }
+      else // only can access base class via virtual function
+        {
+          *os << "if (!this->_tao_marshal__"
+              <<       inh->flatname ()
+              << " (strm)) return 0;" << be_nl;
+        }
+    }
+
+  { // array _forany
+    be_visitor_context* new_ctx =
+      new be_visitor_context (*this->ctx_);
+    be_visitor_valuetype_field_cdr_decl field_decl (new_ctx);
+    field_decl.visit_scope (node);
+  }
+
+  *os << "if (" << be_idt_nl;
+  // all we have to do is to visit the scope and generate code
+  this->gen_fields (node, *this->ctx_);
+
+  *os << be_uidt_nl << ")"
+      << be_idt_nl
+      << "return 1;" << be_uidt_nl
+      << "else" << be_idt_nl
+      << "return 0;" << be_uidt_nl << be_uidt_nl
+      << "}\n\n";
+
+  // set the substate as generating code for the input operator
+  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
+  os->indent ();
+  *os << "ACE_INLINE CORBA::Boolean" << be_nl;
+  this->class_name (node, os);
+  *os << "::_tao_unmarshal_state (TAO_InputCDR &strm)" << be_nl
+      << "{" << be_idt_nl;
+  inh = node->statefull_inherit ();
+  if (inh)
+    {
+      if (inh->opt_accessor ())
+        {
+          *os << "if (!";
+          this->class_name (inh, os);
+          *os << "::_tao_unmarshal_state (strm)) return 0;" << be_nl;
+        }
+      else // only can access base class via virtual function
+        {
+          *os << "if (!this->_tao_unmarshal__"
+              <<       inh->flatname ()
+              << " (strm)) return 0;" << be_nl;
+        }
+    }
+
+  { // array _forany
+    be_visitor_context* new_ctx =
+      new be_visitor_context (*this->ctx_);
+    be_visitor_valuetype_field_cdr_decl field_decl (new_ctx);
+    field_decl.visit_scope (node);
+  }
+
+  *os << "if (" << be_idt_nl;
+  // all we have to do is to visit the scope and generate code
+  this->gen_fields (node, *this->ctx_);
+
+  *os << be_uidt_nl << ")"
+      << be_idt_nl
+      << "return 1;" << be_uidt_nl
+      << "else" << be_idt_nl
+      << "return 0;" << be_uidt_nl << be_uidt_nl
+      << "}\n\n";
+
+  return 0;
+}
+
+// retrieve the fully scoped skeleton name
+void
+be_visitor_valuetype_marshal_cs::class_name (be_valuetype *node,
+                                          TAO_OutStream *os)
+{
+  if (node->opt_accessor ())
+    *os << node->name ();
+  else
+    *os << node->full_obv_skel_name ();
+}
+
+// ops for field marshal
+int
+be_visitor_valuetype_marshal_cs::gen_fields (be_valuetype *node,
+                                             be_visitor_context &ctx)
+{
+  int n_processed = 0;
+
+  TAO_OutStream *os = ctx.stream ();
+  // proceed if the number of members in our scope is greater than 0
+  if (node->nmembers () > 0)
+    {
+      // initialize an iterator to iterate thru our scope
+      UTL_ScopeActiveIterator *si;
+      ACE_NEW_RETURN (si,
+                      UTL_ScopeActiveIterator (node,
+                                               UTL_Scope::IK_decls),
+                      -1);
+      this->elem_number_ = 0;
+      // continue until each field is visited
+      for (;!si->is_done ();si->next())
+        {
+          AST_Decl *d = si->item ();
+          if (!d)
+            {
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "bad node in this scope\n"), -1);
+
+            }
+          be_field *field = be_field::narrow_from_decl (d);
+          if (field)
+            {
+              if (n_processed > 0)
+                *os << " &&" << be_nl;
+              ++n_processed;
+              be_visitor_context* new_ctx =
+                     new be_visitor_context (ctx);
+              be_visitor_valuetype_field_cdr_ci visitor (new_ctx);
+              visitor.pre_ = node->field_pd_prefix ();
+              visitor.post_ = node->field_pd_postfix ();
+              if (visitor.visit_field (field) == -1)
+                {
+                  ACE_ERROR_RETURN ((LM_ERROR,
+                               "(%N:%l) be_visitor_valuetype_marshal_cs::"
+                                     "visit_valuetype - "
+                                     "codegen for scope failed\n"), -1);
+                }
+
+             }
+           } // end of for loop
+      delete si;
+    }
+  if (n_processed == 0)
+    *os << "1";
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
new file mode 100644
index 00000000000..70806d09556
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
@@ -0,0 +1,145 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    obv_module.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This provides code generation for the module in the header
+//    for the OBV_ namespace (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+ACE_RCSID(be_visitor_obv_module, obv_module, "$Id$")
+
+
+// ************************************************************
+// Module visitor for server header
+// ************************************************************
+
+be_visitor_obv_module::be_visitor_obv_module (be_visitor_context *ctx)
+  : be_visitor_scope (ctx)
+{
+}
+
+be_visitor_obv_module::~be_visitor_obv_module (void)
+{
+}
+
+
+
+// This states are processed:
+//    TAO_MODULE_OBV_CH
+//    TAO_MODULE_OBV_CI
+//    TAO_MODULE_OBV_CH
+
+
+int
+be_visitor_obv_module::visit_module (be_module *node)
+{
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
+
+  if (node->has_nested_valuetype ())
+    {
+      if (this->ctx_->state () == TAO_CodeGen::TAO_MODULE_OBV_CH)
+        {
+          os->indent ();
+
+          *os << "TAO_NAMESPACE "; // << idl_global->export_macro ()
+
+          if (!node->is_nested ())
+              // we are outermost module, so prepend
+              *os << " OBV_" << node->local_name () << be_nl;
+          else
+              // we are inside another module
+              *os << " " << node->local_name () << be_nl;
+
+          *os << "{" << be_nl
+              << be_idt;
+        } // client header
+
+      if (this->visit_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_obv_module::"
+                             "visit_module - "
+                             "codegen for scope failed\n"), -1);
+        }
+
+      if (this->ctx_->state () == TAO_CodeGen::TAO_MODULE_OBV_CH)
+        {
+          os->decr_indent ();
+          *os << "};\n\n";
+        }
+    }
+  return 0;
+}
+
+
+int
+be_visitor_obv_module::visit_valuetype (be_valuetype *node)
+{
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_MODULE_OBV_CH:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CH);
+      break;
+    case TAO_CodeGen::TAO_MODULE_OBV_CI:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CI);
+      break;
+    case TAO_CodeGen::TAO_MODULE_OBV_CS:
+      ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CS);
+      break;
+  default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_obv_module::"
+                           "visit_valuetype - "
+                           "Bad context state\n"
+                           ), -1);
+      }
+    }
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_obv_module::"
+                         "visit_valuetype - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_obv_module::"
+                         "visit_valuetype - "
+                         "failed to accept visitor\n"
+                         ),  -1);
+    }
+  delete visitor;
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
new file mode 100644
index 00000000000..32a732cb82e
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -0,0 +1,827 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes. This is a generic visitor.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on interface.cpp from Aniruddha Gokhale
+//
+// ============================================================================
+
+//#include      "idl.h"
+//#include      "idl_extern.h"
+//#include      "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype, valuetype, "$Id$")
+
+
+be_visitor_valuetype::be_visitor_valuetype (be_visitor_context *ctx)
+  : be_visitor_scope (ctx)
+{
+}
+
+be_visitor_valuetype::~be_visitor_valuetype (void)
+{
+}
+
+// this method must be overridden by the derived valuetype visitors
+int
+be_visitor_valuetype::visit_valuetype (be_valuetype *)
+{
+//!  ACE_ASSERT (0);
+  return -1;
+}
+
+
+// visit the scope of the valuetype node
+// (in public/private field order)
+int
+be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node)
+{
+  // proceed if the number of members in our scope is greater than 0
+  if (node->nmembers () > 0)
+    {
+      // initialize an iterator to iterate thru our scope
+      UTL_ScopeActiveIterator *si;
+      int n_processed = 0;
+      ACE_NEW_RETURN (si,
+                      UTL_ScopeActiveIterator (node,
+                                               UTL_Scope::IK_decls),
+                      -1);
+      this->elem_number_ = 0;
+      // continue until each element is visited
+      for (;!si->is_done ();si->next())
+        {
+          AST_Decl *d = si->item ();
+          if (!d)
+            {
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "bad node in this scope\n"), -1);
+
+            }
+          AST_Field *field = AST_Field::narrow_from_decl (d);
+          if (field && field->visibility() == AST_Field::vis_PRIVATE)
+            {
+              continue;      // ignore private fields in this run
+              // AST_Attribute derives from AST_Field, so test for
+              // vis_PRIVATE is ok (the attribute has it set to vis_NA)
+            }
+          ++ n_processed;
+          if (n_processed == 1)
+            this->begin_public ();
+          be_decl *bd = be_decl::narrow_from_decl (d);
+          // set the scope node as "node" in which the code is being
+          // generated so that elements in the node's scope can use it
+          // for code generation
+
+          this->ctx_->scope (node->decl ());
+
+          // set the node to be visited
+          this->ctx_->node (bd);
+          this->elem_number_++;
+
+          if (bd == 0 || bd->accept (this) == -1)
+            {
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "codegen for scope failed\n"), -1);
+
+            }
+        } // end of for loop
+      delete si;
+     // next run with private fields only
+      n_processed = 0;
+      ACE_NEW_RETURN (si,
+                      UTL_ScopeActiveIterator (node,
+                                               UTL_Scope::IK_decls),
+                      -1);
+      this->elem_number_ = 0;
+      // continue until each element is visited
+      for (;!si->is_done ();si->next())
+        {
+          AST_Decl *d = si->item ();
+          if (!d)
+            {
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "bad node in this scope\n"), -1);
+
+            }
+          AST_Field *field = AST_Field::narrow_from_decl (d);
+          if (!field ||
+              (field && field->visibility() != AST_Field::vis_PRIVATE))
+            {
+              continue;      // only private fields in this run
+            }
+          ++ n_processed;
+          if (n_processed == 1)
+            this->begin_private ();
+          be_decl *bd = be_decl::narrow_from_decl (d);
+          // set the scope node as "node" in which the code is being
+          // generated so that elements in the node's scope can use it
+          // for code generation
+
+          this->ctx_->scope (node->decl ());
+
+          // set the node to be visited
+          this->ctx_->node (bd);
+          this->elem_number_++;
+
+          if (bd == 0 || bd->accept (this) == -1)
+            {
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "codegen for scope failed\n"), -1);
+
+            }
+        } // end of for loop
+      delete si;
+    } // end of if
+  return 0;
+}
+
+// this two are called from visit_valuetype_scope()
+void
+be_visitor_valuetype::begin_public ()
+{
+  // in derived visitors print "public:" in class definition
+}
+
+void
+be_visitor_valuetype::begin_private ()
+{
+  // in derived visitors print "protected:" in class definition
+}
+
+// =all common visit methods for valuetype visitor
+
+// visit an attribute
+int
+be_visitor_valuetype::visit_attribute (be_attribute *node)
+// was be_visitor_attribute::visit_attribute (be_attribute *node)
+{
+  this->ctx_->node (node); // save the node
+  this->ctx_->attribute (node); // save this attribute node
+
+  be_operation *op;
+
+  // first the "get" operation
+  op = new be_operation (node->field_type (), AST_Operation::OP_noflags,
+                         node->name (), 0);
+  op->set_name (node->name ());
+  if (!op || this->visit_operation (op) == -1)
+    {
+      delete op;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_attribute::"
+                         "visit_attribute - "
+                         "codegen for get_attribute failed\n"),
+                        -1);
+    }
+  delete op;
+  if (node->readonly ())
+    return 0;  // nothing else to do
+
+  // the set method.
+  // the return type  is "void"
+  be_predefined_type *rt = new be_predefined_type (AST_PredefinedType::PT_void,
+                                                   new UTL_ScopedName
+                                                   (new Identifier
+                                                    ("void", 1, 0, I_FALSE), 0),
+                                                   0);
+  // argument type is the same as the attribute type
+  be_argument *arg = new be_argument (AST_Argument::dir_IN,
+                                      node->field_type (),
+                                      node->name (),
+                                      0);
+  arg->set_name (node->name ());
+  // create the operation
+  op = new be_operation (rt, AST_Operation::OP_noflags,
+                         node->name (), 0);
+  op->set_name (node->name ());
+  op->add_argument_to_scope (arg);
+
+ if (!op || this->visit_operation (op) == -1)
+    {
+      delete op;
+      delete arg;
+      delete rt;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_attribute::"
+                         "visit_attribute - "
+                         "codegen for set_attribute failed\n"),
+                        -1);
+    }
+  delete op;
+  delete rt;
+  delete arg;
+  return 0;
+}
+
+
+// visit a constant
+int
+be_visitor_valuetype::visit_constant (be_constant *node)
+{
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  // this switch is acceptable rather than having derived visitors overriding
+  // this method and differing only in what state they set
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_VALUETYPE_CH:
+      ctx.state (TAO_CodeGen::TAO_CONSTANT_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CS:
+      ctx.state (TAO_CodeGen::TAO_CONSTANT_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
+    case TAO_CodeGen::TAO_VALUETYPE_CI:
+    case TAO_CodeGen::TAO_VALUETYPE_SH:
+    case TAO_CodeGen::TAO_VALUETYPE_IH:
+    case TAO_CodeGen::TAO_VALUETYPE_IS:
+    case TAO_CodeGen::TAO_VALUETYPE_SI:
+    case TAO_CodeGen::TAO_VALUETYPE_SS:
+      return 0; // nothing to be done
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_valuetype::"
+                           "visit_constant - "
+                           "Bad context state\n"
+                           ), -1);
+      }
+    }
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype::"
+                         "visit_constant - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype::"
+                         "visit_constant - "
+                         "failed to accept visitor\n"
+                         ),  -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+//visit an enum
+int
+be_visitor_valuetype::visit_enum (be_enum *node)
+{
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  // this switch is acceptable rather than having derived visitors overriding
+  // this method and differing only in what state they set
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_VALUETYPE_CH:
+      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CS:
+      ctx.state (TAO_CodeGen::TAO_ENUM_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_ENUM_ANY_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_ENUM_ANY_OP_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_ENUM_CDR_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_ENUM_CDR_OP_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
+    case TAO_CodeGen::TAO_VALUETYPE_CI:
+    case TAO_CodeGen::TAO_VALUETYPE_SH:
+    case TAO_CodeGen::TAO_VALUETYPE_IH:
+    case TAO_CodeGen::TAO_VALUETYPE_IS:
+    case TAO_CodeGen::TAO_VALUETYPE_SI:
+    case TAO_CodeGen::TAO_VALUETYPE_SS:
+      return 0; // nothing to be done
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_valuetype::"
+                           "visit_enum - "
+                           "Bad context state\n"
+                           ), -1);
+      }
+    }
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype::"
+                         "visit_enum - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype::"
+                         "visit_enum - "
+                         "failed to accept visitor\n"
+                         ),  -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+
+// visit an operation
+int
+be_visitor_valuetype::visit_operation (be_operation *node)
+{
+  // is overridden in derived visitors
+  return 0;
+}
+
+// visit an exception (not used)
+int
+be_visitor_valuetype::visit_exception (be_exception *node)
+{
+  cerr << "! be_visitor_valuetype::visit_exception() --- not allowed\n";
+ ACE_ASSERT (0);
+ return 0;
+}
+
+// visit an structure
+int
+be_visitor_valuetype::visit_structure (be_structure *node)
+{
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  // this switch is acceptable rather than having derived visitors overriding
+  // this method and differing only in what state they set
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_VALUETYPE_CH:
+      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CI:
+      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CS:
+      ctx.state (TAO_CodeGen::TAO_STRUCT_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_STRUCT_ANY_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_STRUCT_ANY_OP_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_STRUCT_CDR_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_STRUCT_CDR_OP_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
+    case TAO_CodeGen::TAO_VALUETYPE_SH:
+    case TAO_CodeGen::TAO_VALUETYPE_IH:
+    case TAO_CodeGen::TAO_VALUETYPE_IS:
+    case TAO_CodeGen::TAO_VALUETYPE_SI:
+    case TAO_CodeGen::TAO_VALUETYPE_SS:
+      return 0; // nothing to be done
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_valuetype::"
+                           "visit_structure - "
+                           "Bad context state\n"
+                           ), -1);
+      }
+    }
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype::"
+                         "visit_structure - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype::"
+                         "visit_structure - "
+                         "failed to accept visitor\n"
+                         ),  -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+// visit a union
+int
+be_visitor_valuetype::visit_union (be_union *node)
+{
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  // this switch is acceptable rather than having derived visitors overriding
+  // this method and differing only in what state they set
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_VALUETYPE_CH:
+      ctx.state (TAO_CodeGen::TAO_UNION_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CI:
+      ctx.state (TAO_CodeGen::TAO_UNION_CI);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CS:
+      ctx.state (TAO_CodeGen::TAO_UNION_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_UNION_ANY_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_UNION_ANY_OP_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_UNION_CDR_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_UNION_CDR_OP_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
+    case TAO_CodeGen::TAO_VALUETYPE_SH:
+    case TAO_CodeGen::TAO_VALUETYPE_IH:
+    case TAO_CodeGen::TAO_VALUETYPE_IS:
+    case TAO_CodeGen::TAO_VALUETYPE_SI:
+    case TAO_CodeGen::TAO_VALUETYPE_SS:
+      return 0; // nothing to be done
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_valuetype::"
+                           "visit_union - "
+                           "Bad context state\n"
+                           ), -1);
+      }
+    }
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype::"
+                         "visit_union - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype::"
+                         "visit_union - "
+                         "failed to accept visitor\n"
+                         ),  -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+// visit a typedef
+int
+be_visitor_valuetype::visit_typedef (be_typedef *node)
+{
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  // this switch is acceptable rather than having derived visitors overriding
+  // this method and differing only in what state they set
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_VALUETYPE_CH:
+      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CI:
+      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CI);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CS:
+      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_TYPEDEF_ANY_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_TYPEDEF_ANY_OP_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CDR_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CDR_OP_CS);
+      break;
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
+    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
+    case TAO_CodeGen::TAO_VALUETYPE_SH:
+    case TAO_CodeGen::TAO_VALUETYPE_IH:
+    case TAO_CodeGen::TAO_VALUETYPE_IS:
+    case TAO_CodeGen::TAO_VALUETYPE_SI:
+    case TAO_CodeGen::TAO_VALUETYPE_SS:
+      return 0; // nothing to be done
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_valuetype::"
+                           "visit_typedef - "
+                           "Bad context state\n"
+                           ), -1);
+      }
+    }
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype::"
+                         "visit_typedef - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype::"
+                         "visit_typedef - "
+                         "failed to accept visitor\n"
+                         ),  -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+int
+be_visitor_valuetype::visit_field (be_field *node)
+{
+  // is overridden in derived visitors
+  return 0;
+}
+
+
+// private data fields for scope
+int
+be_visitor_valuetype::gen_pd (be_valuetype *node)
+{
+  // proceed if the number of members in our scope is greater than 0
+  if (node->nmembers () > 0)
+    {
+      // initialize an iterator to iterate thru our scope
+      UTL_ScopeActiveIterator *si;
+      int n_processed = 0;
+      ACE_NEW_RETURN (si,
+                      UTL_ScopeActiveIterator (node,
+                                               UTL_Scope::IK_decls),
+                      -1);
+      this->elem_number_ = 0;
+      // continue until each field is visited
+      for (;!si->is_done ();si->next())
+        {
+          AST_Decl *d = si->item ();
+          if (!d)
+            {
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "bad node in this scope\n"), -1);
+
+            }
+          be_field *field = be_field::narrow_from_decl (d);
+          if (!field)
+            {
+              continue;
+            }
+          ++ n_processed;
+          // set the scope node as "node" in which the code is being
+          // generated so that elements in the node's scope can use it
+          // for code generation
+
+          this->ctx_->scope (node->decl ());
+
+          // set the node to be visited
+          this->ctx_->node (field);
+          this->elem_number_++;
+
+          if (this->gen_field_pd (field) == -1)
+            {
+              delete si;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_scope::visit_scope - "
+                                 "codegen for scope failed\n"), -1);
+
+            }
+        } // end of for loop
+      delete si;
+    }
+  return 0;
+}
+
+// private data for field
+int
+be_visitor_valuetype::gen_field_pd (be_field *node)
+// derived from be_visitor_field_ch
+{
+  TAO_OutStream *os; // output stream
+  be_type *bt; // field's type
+  be_valuetype *vt;  // field declared in this scope
+
+  os = this->ctx_->stream ();
+  // first generate the type information
+  bt = be_type::narrow_from_decl (node->field_type ());
+  vt = be_valuetype::narrow_from_scope (node->defined_in ());
+  if (!bt || !vt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_field_ch::"
+                         "visit_field - "
+                         "Bad field type\n"
+                         ), -1);
+    }
+
+  // instantiate a visitor context with a copy of our context. This info
+  // will be modified based on what type of node we are visiting
+  be_visitor_context ctx (*this->ctx_);
+  ctx.node (node); // set the node to be the node being visited. The scope is
+                   // still the same
+
+  ctx.state (TAO_CodeGen::TAO_FIELD_CH);
+
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_structure::"
+                         "visit_field - "
+                         "NUL visitor\n"
+                         ),  -1);
+    }
+
+  // let the node accept this visitor
+  if (bt->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_field_ch::"
+                         "visit_field - "
+                         "codegen for field type failed\n"
+                         ), -1);
+    }
+  delete visitor;
+
+  // now output the field name.
+  *os << " " << vt->field_pd_prefix ()
+             << node->local_name ()
+             << vt->field_pd_postfix() << ";\n";
+  return 0;
+
+}
+
+
+// generate the _init definition
+int
+be_visitor_valuetype::gen_init_defn (be_valuetype *node)
+{
+  if (node->is_abstract_valuetype ())
+    return 0;   // no instance of it can created
+
+  TAO_OutStream *os; // output stream
+
+  os = this->ctx_->stream ();
+  os->indent (); // start with whatever indentation level we are at
+
+  *os << "class " << idl_global->export_macro ()
+      << " " << node->local_name ()
+      << "_init : public ACE_CORBA_1 (ValueFactoryBase)" << be_nl;
+
+  // generate the body
+
+  *os << "{" << be_nl
+      << "public:" << be_idt_nl
+      << "virtual ~" << node->local_name () << "_init ();" << be_nl;
+
+      /* %!     << "static " << node->local_name () << "* "
+              << "_downcast (CORBA::ValueFactoryBase* );" << be_nl */
+
+  *os << "virtual const char* tao_repository_id ();\n" << be_nl;
+  *os << "// create () goes here" << be_nl;  // %!
+
+  *os << be_uidt_nl << "};\n";
+
+  return 0;
+}
+
+int
+be_visitor_valuetype::gen_init_impl (be_valuetype *node)
+{
+  if (node->is_abstract_valuetype ())
+    return 0;   // no instance of it can created
+
+  TAO_OutStream *os; // output stream
+
+  os = this->ctx_->stream ();
+  os->indent (); // start with whatever indentation level we are at
+
+  char fname [NAMEBUFSIZE];  // to hold the full and
+  char lname [NAMEBUFSIZE];  // local _out names
+
+  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (fname, "%s_init", node->fullname ());
+
+  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (lname, "%s_init", node->local_name ()->get_string ());
+
+  // destructor
+  *os << fname << "::~" << lname << " ()" << be_nl
+      << "{" << be_nl << "}\n\n";
+
+  *os << "const char* " << be_nl
+      << fname << "::tao_repository_id ()" << be_nl
+      << "{" << be_idt_nl
+      <<   "return " << node->name()
+      <<                "::_tao_obv_static_repository_id ();"
+      << be_uidt_nl << "}\n\n";
+
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
new file mode 100644
index 00000000000..e15b3aedea9
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -0,0 +1,419 @@
+
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes in the client header
+//    (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on interface_ch.cpp from Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype, valuetype_ch, "$Id$")
+
+
+// ******************************************************
+// Valuetype visitor for client header
+// ******************************************************
+
+be_visitor_valuetype_ch::be_visitor_valuetype_ch (be_visitor_context *ctx)
+  : be_visitor_valuetype (ctx)
+{
+}
+
+be_visitor_valuetype_ch::~be_visitor_valuetype_ch (void)
+{
+}
+
+int
+be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os; // output stream
+
+  if (!node->cli_hdr_gen () && !node->imported ()) // not already generated and
+                                                   // not imported
+    {
+
+      os = this->ctx_->stream ();
+      *os << "// valuetype class\n";
+
+      // == STEP 1:  generate the class name and class names we inherit ==
+
+      os->indent (); // start with whatever indentation level we are at
+      // forward declaration
+      *os << "class " << node->local_name () << ";" << be_nl;
+
+      // generate the ifdefined macro for the _var type
+      os->gen_ifdef_macro (node->flatname (), "_var");
+
+      // generate the _var declaration
+      if (node->gen_var_defn () == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_ch::"
+                             "visit_valuetype - "
+                             "codegen for _var failed\n"), -1);
+        }
+      os->gen_endif ();
+
+      // generate the ifdef macro for the _out class
+      os->gen_ifdef_macro (node->flatname (), "_out");
+
+      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
+      if (node->gen_out_defn () == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_ch::"
+                             "visit_valuetype - "
+                             "codegen for _out failed\n"), -1);
+        }
+      // generate the endif macro
+      os->gen_endif ();
+
+      // generate the ifdef macro for the _init class
+      os->gen_ifdef_macro (node->flatname (), "_init");
+
+      // generate the _init declaration - ptc/98-09-03 20.17.10 p.20-93
+      if (this->gen_init_defn (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_ch::"
+                             "visit_valuetype - "
+                             "codegen for _init failed\n"), -1);
+        }
+      // generate the endif macro
+      os->gen_endif ();
+
+      // now the valuetype definition itself
+      os->gen_ifdef_macro (node->flatname ());
+
+      // now generate the class definition
+      os->indent ();
+      *os << "class " << idl_global->export_macro ()
+                << " " << node->local_name ();
+
+      // node valuetype inherits from other valuetypes (OMG 20.17.9)
+      // (ordinary (not abstract) interfaces ignored)
+
+      *os << " : ";
+      int i;  // loop index
+      int n_inherits_valuetypes = 0;
+      idl_bool valuebase_inherited = 0;
+      if (node->n_inherits () > 0)
+        {
+          for (i = 0; i < node->n_inherits (); i++)
+            {
+              // %! move is_nested() and nested_type_name() to
+              // AST_Interface, then type AST_Interface can be used
+              be_interface *inherited =
+                be_interface::narrow_from_decl (node->inherits ()[i]);
+              if (!inherited->is_valuetype() &&
+                  !inherited->is_abstract_interface())
+                continue;
+
+              ++ n_inherits_valuetypes;
+              if (inherited->is_valuetype())
+                valuebase_inherited = 1;
+              if (n_inherits_valuetypes > 1)  // node is the case of multiple
+                                              // inheritance, so put a comma
+                {
+                  *os << ", ";
+                }
+              be_decl *scope = 0;
+              if (inherited->is_nested ())
+                {
+                  // inherited node is used in the scope of "node" node
+                  scope = be_scope::narrow_from_scope (node->defined_in ())
+                    ->decl ();
+                }
+
+              // dump the scoped name
+              *os << "public virtual ";
+              *os << inherited->nested_type_name (scope);
+            }  // end of for loop
+          if (n_inherits_valuetypes > 0)
+            *os << be_nl;
+        }
+      if (!valuebase_inherited)
+        {
+          // we do not inherit from any valuetype, hence we do so from the base
+          // CORBA::ValueBase class
+          // Generate code that uses the macro. This is required to deal with
+          // the MSVC++ insanity
+          if (n_inherits_valuetypes > 1)  // node is the case of multiple
+                                          // inheritance, so put a comma
+            {
+              *os << ", ";
+            }
+          *os << "public virtual ACE_CORBA_1 (ValueBase)" << be_nl;
+        }
+
+      // generate the body
+
+      *os << "{" << be_nl
+          << "public:" << be_nl
+
+          // generate the _ptr_type and _var_type typedef
+          // but we must protect against certain versions of g++
+          << "#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8"
+          << be_idt_nl
+          << "typedef " << node->local_name () << "* _ptr_type;" << be_nl
+          << "typedef " << node->local_name () << "_var _var_type;"
+          << be_uidt_nl
+          << "#endif /* __GNUC__ */\n" << be_idt_nl
+
+          // generate the static _downcast operation
+          // (see OMG 20.17.{4,5})
+          << "static " << node->local_name () << "* "
+                << "_downcast (CORBA::ValueBase* );" << be_nl
+          << "// The address of static _downcast is implicit used as type id\n"
+          << be_nl
+
+          << "// (TAO extensions or internals)" << be_nl
+          << "static CORBA::Boolean _tao_unmarshal (TAO_InputCDR &, "
+          <<    node->local_name () << " *&);" << be_nl
+          << "virtual const char* "
+          << "_tao_obv_repository_id () const;"
+          << be_nl
+          << "static const char* "
+          << "_tao_obv_static_repository_id ();\n";
+
+      // generate code for the valuetype definition
+      if (this->visit_valuetype_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_ch::"
+                             "visit_valuetype - "
+                             "codegen for scope failed\n"), -1);
+        }
+
+      // protected member:
+
+      // generate the "protected" constructor so that users cannot instantiate
+      // us
+      *os << be_uidt_nl << "protected:" << be_idt_nl
+                << node->local_name ()
+                << " ();           // default constructor" << be_nl
+          << "virtual ~" << node->local_name () << " ();\n" << be_nl;
+
+      *os << "// TAO internals" << be_nl
+          << "virtual void *_tao_obv_narrow (ptr_arith_t);" << be_nl;
+      // support for marshalling
+      if (!node->is_abstract_valuetype ())
+        {
+          *os << "virtual CORBA::Boolean "
+              << "_tao_marshal_v (TAO_OutputCDR &);" << be_nl;
+          *os << "virtual CORBA::Boolean "
+              << "_tao_unmarshal_v (TAO_InputCDR &);" << be_nl;
+          // %! optimize _downcast away: extra parameter with type info
+          // set (void *) in CDR Stream with the right derived pointer
+        }
+
+
+      // private member:
+
+      // private copy constructor and assignment operator. These are not
+      // allowed, hence they are private.
+      *os << be_uidt_nl << "private:" << be_idt_nl;
+      *os << node->local_name () << " (const " << node->local_name () << " &);"
+          << be_nl
+          << "void operator= (const " << node->local_name () << " &);"
+          << be_nl;
+
+      // map fields to private data (if optimizing)
+      if (node->opt_accessor ())
+        {
+          *os << be_uidt_nl << "protected:" << be_idt_nl;
+          *os << "CORBA::Boolean "
+              << "_tao_marshal_state (TAO_OutputCDR &);" << be_nl
+              << "CORBA::Boolean "
+              << "_tao_unmarshal_state (TAO_InputCDR &);\n\n";
+          *os << be_uidt_nl << "private:\n" << be_idt;
+          this->gen_pd (node);
+        }
+      else // need a way to access the state of derived OBV_ classes
+        {
+          if (!node->is_abstract_valuetype ())
+            {
+              *os << be_uidt_nl << "protected:" << be_idt_nl;
+              *os << "virtual CORBA::Boolean _tao_marshal__"
+                  <<    node->flatname () << " (TAO_OutputCDR &) = 0;"
+                  << be_nl;
+              *os << "virtual CORBA::Boolean _tao_unmarshal__"
+                  <<    node->flatname () << " (TAO_InputCDR &) = 0;"
+                  << be_nl;
+            }
+        }
+
+      *os << be_uidt_nl << "};\n";
+      os->gen_endif ();
+
+      // by using a visitor to declare and define the TypeCode, we have the
+      // added advantage to conditionally not generate any code. This will be
+      // based on the command line options. This is still TO-DO
+          // (see interface code how to do this. not yet impl.)
+
+      node->cli_hdr_gen (I_TRUE);
+    } // if !cli_hdr_gen
+  return 0;
+}
+
+
+int
+be_visitor_valuetype_ch::visit_operation (be_operation *node)
+// derived from be_visitor_operation_ch::visit_operation
+{
+  TAO_OutStream *os; // output stream
+  be_type *bt;       // type node
+
+  os = this->ctx_->stream ();
+  this->ctx_->node (node); // save the node
+
+  os->indent (); // start with the current indentation level
+
+  // every operation is declared virtual in the client code
+  *os << "virtual ";
+
+  // STEP I: generate the return type
+  bt = be_type::narrow_from_decl (node->return_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_ch::"
+                         "visit_operation - "
+                         "Bad return type\n"),
+                        -1);
+    }
+
+  // grab the right visitor to generate the return type
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_CH);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_valuetype_ch::"
+                         "visit_operation - "
+                         "Bad visitor to return type\n"),
+                        -1);
+    }
+
+  if (bt->accept (visitor) == -1)
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_ch::"
+                         "visit_operation - "
+                         "codegen for return type failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+  // STEP 2: generate the operation name
+  *os << " " << node->local_name ();
+
+  // STEP 3: generate the argument list with the appropriate mapping. For these
+  // we grab a visitor that generates the parameter listing
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH);
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_valuetype_ch::"
+                         "visit_operation - "
+                         "Bad visitor to argument list\n"),
+                        -1);
+    }
+
+  if (node->accept (visitor) == -1)
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_ch::"
+                         "visit_operation - "
+                         "codegen for argument list failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+  return 0;
+}
+
+int
+be_visitor_valuetype_ch::visit_field (be_field *node)
+{
+  be_valuetype *vt = be_valuetype::narrow_from_scope (node->defined_in ());
+  if (!vt)
+    return -1;
+  be_visitor_context* ctx = new be_visitor_context (*this->ctx_);
+  ctx->state (TAO_CodeGen::TAO_FIELD_OBV_CH);
+  be_visitor_valuetype_field_ch *visitor =
+             new be_visitor_valuetype_field_ch (ctx);
+
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_valuetype_obv_ch::"
+                         "visit_field - bad visitor\n"),
+                        -1);
+    }
+
+  if (vt->opt_accessor ())
+    visitor->setenclosings ("",";");
+  else
+    visitor->setenclosings ("virtual "," = 0;");
+
+  if (node->accept (visitor) == -1)
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_obv_ch::"
+                        "visit_field - codegen failed\n"),
+                        -1);
+    }
+  delete visitor;
+  return 0;
+}
+
+
+void
+be_visitor_valuetype_ch::begin_public ()
+{
+  TAO_OutStream *os; // output stream
+
+  os = this->ctx_->stream ();
+  *os << be_uidt;
+  os->indent ();
+  *os << "public:\n" << be_idt;
+}
+
+void
+be_visitor_valuetype_ch::begin_private ()
+{
+  TAO_OutStream *os; // output stream
+
+  os = this->ctx_->stream ();
+  *os << be_uidt;
+  os->indent ();
+  *os << "protected:\n" << be_idt;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
new file mode 100644
index 00000000000..368a53e1e71
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
@@ -0,0 +1,133 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes in the client inline file
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype, valuetype_ci, "$Id$")
+
+
+// **************************************************
+// Valuetype visitor for client inline
+// **************************************************
+be_visitor_valuetype_ci::be_visitor_valuetype_ci (be_visitor_context *ctx)
+  : be_visitor_valuetype (ctx),
+    opt_accessor_ (0)
+{
+}
+
+be_visitor_valuetype_ci::~be_visitor_valuetype_ci (void)
+{
+}
+
+int
+be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os; // output stream
+
+  if (node->cli_inline_gen () || node->imported ())
+    return 0;
+
+  // need to access it in visit_field ()
+  if (node->opt_accessor ())
+    this->opt_accessor_ = 1;
+
+  os = this->ctx_->stream ();
+
+  os->indent (); // start from the current indentation level
+
+  // generate the constructors and destructor
+  *os << "ACE_INLINE" << be_nl;
+  *os << node->name () << "::" << node->local_name () <<
+    " () // default constructor" << be_nl;
+  *os << "{}" << be_nl << be_nl;
+
+  *os << "ACE_INLINE" << be_nl;
+  *os << node->name () << "::~" << node->local_name () <<
+    " () // destructor" << be_nl;
+  *os << "{}\n" << be_nl;
+
+  *os << "ACE_INLINE const char* " << be_nl
+      << node->name() << "::_tao_obv_static_repository_id ()" << be_nl
+      <<  "{" << be_idt_nl
+      <<     "return \"" << node->repoID () << "\";" << be_uidt_nl
+      <<  "}\n\n";
+
+  // generate the ifdefined macro for  the _var type
+  os->gen_ifdef_macro (node->flatname (), "_var");
+  if (node->gen_var_impl () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_ci::"
+                         "visit_valuetype - "
+                         "codegen for _var failed\n"), -1);
+    }
+  os->gen_endif ();
+
+  // generate the ifdefined macro for  the _out type
+  os->gen_ifdef_macro (node->flatname (), "_out");
+  if (node->gen_out_impl () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_ci::"
+                         "visit_valuetype - "
+                         "codegen for _out failed\n"), -1);
+    }
+  os->gen_endif ();
+
+  // generate inline methods for elements of our scope
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_ci::"
+                         "visit_valuetype - "
+                         "codegen for scope failed\n"), -1);
+    }
+
+  return 0;
+}
+
+
+int
+be_visitor_valuetype_ci::visit_field (be_field *node)
+{
+  if (opt_accessor_)
+    {
+      be_visitor_context *ctx = new be_visitor_context (*this->ctx_);
+      be_visitor_valuetype_field_cs *visitor =
+        new be_visitor_valuetype_field_cs (ctx);
+      visitor->in_obv_space_ = 0;
+      visitor->setenclosings ("ACE_INLINE ");
+      if (visitor->visit_field (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_ci::"
+                             "visit_field - "
+                             "visit_field failed\n"
+                             ), -1);
+        }
+      delete visitor;
+    }
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
new file mode 100644
index 00000000000..40b655a80b1
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -0,0 +1,210 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes in the client stubs file.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype, valuetype_cs, "$Id$")
+
+
+// ************************************************************
+// Valuetype visitor for client stubs
+// ************************************************************
+
+be_visitor_valuetype_cs::be_visitor_valuetype_cs (be_visitor_context *ctx)
+  : be_visitor_valuetype (ctx)
+{
+}
+
+be_visitor_valuetype_cs::~be_visitor_valuetype_cs (void)
+{
+}
+
+int
+be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os; // output stream
+
+  if (node->cli_stub_gen () || node->imported ())
+    return 0;
+
+  os = this->ctx_->stream ();
+
+  os->indent (); // start with whatever indentation level we are at
+
+  // The _downcast method    // %! use ACE_xxx_cast here ?
+  *os << node->name() << "* " << node->name()
+      <<                 "::_downcast (CORBA::ValueBase* v)" << be_nl
+      <<  "{" << be_idt_nl
+      <<     "if (v == 0) return 0;" << be_nl
+      <<     "return (" << node->local_name() << "* ) "
+      <<          "v->_tao_obv_narrow ((ptr_arith_t) &_downcast);" << be_uidt_nl
+      <<  "}\n" << be_nl
+
+  // The _tao_obv_repository_id method
+      << "const char* " << node->name()
+      <<                   "::_tao_obv_repository_id () const" << be_nl
+      <<  "{" << be_idt_nl
+      <<     "return this->_tao_obv_static_repository_id ();" << be_uidt_nl
+      <<  "}\n" << be_nl
+
+  // The _tao_obv_narrow method
+      << "void* " << node->name()
+      << "::_tao_obv_narrow (ptr_arith_t type_id)" << be_nl
+      <<  "{" << be_idt_nl
+      <<    "if (type_id == (ptr_arith_t) &_downcast)" << be_idt_nl
+      <<       "return this;" << be_uidt_nl
+      <<    "void *rval = 0;" << be_nl;
+
+  // Find the possible base classes.
+
+  int n_inherits_downcastable = 0;
+  for (int i = 0; i < node->n_inherits (); i++)
+    {
+      AST_Interface *inherited =
+          AST_Interface::narrow_from_decl (node->inherits ()[i]);
+      if (inherited->is_valuetype())
+        {
+          ++n_inherits_downcastable;
+          *os << "if (rval == 0)" << be_idt_nl
+              <<   "rval = " << inherited->name()
+              <<                "::_tao_obv_narrow (type_id);" << be_uidt_nl;
+        }
+    }
+
+  *os <<    "return rval;" << be_uidt_nl
+      <<  "}\n\n";
+
+  // Nothing to marshal if abstract valuetype.
+  if (!node->is_abstract_valuetype ())
+    {
+      // The virtual _tao_marshal_v method
+      *os << "CORBA::Boolean " << node->name()
+          <<                   "::_tao_marshal_v (TAO_OutputCDR & strm)"
+          << be_nl
+          <<  "{" << be_idt_nl
+          <<   "return ";
+      if (node->opt_accessor ())
+        {
+          *os << node->name ()
+              <<"::_tao_marshal_state (strm);" << be_uidt_nl;
+        }
+      else
+        {
+          *os << "this->_tao_marshal__" << node->flatname ()
+              << " (strm);" << be_uidt_nl;
+        }
+      *os << "}\n" << be_nl;
+
+      // The virtual _tao_unmarshal_v method
+      *os << "CORBA::Boolean " << node->name()
+          <<                   "::_tao_unmarshal_v (TAO_InputCDR & strm)"
+          << be_nl
+          <<  "{" << be_idt_nl
+          <<   "return ";
+      if (node->opt_accessor ())
+        {
+          *os << node->name ()
+              <<"::_tao_unmarshal_state (strm);" << be_uidt_nl;
+        }
+      else
+        {
+          *os << "this->_tao_unmarshal__" << node->flatname ()
+              << " (strm);" << be_uidt_nl;
+        }
+      *os << "}\n" << be_nl;
+    }  // !node->is_abstract_valuetype ()
+
+  // The static T::_tao_unmarshal method  ----------------------------
+
+  *os << "CORBA::Boolean " << node->name()
+      <<                   "::_tao_unmarshal (TAO_InputCDR &strm, "
+      <<                   node->name() <<" *&new_object)" << be_nl
+      <<  "{" << be_idt_nl
+      <<    "CORBA::Boolean retval = 1;" << be_nl
+      <<    "CORBA::ValueBase *base;   // %! should be a _var"
+      <<       be_nl
+      <<    "CORBA::ValueFactory_ptr factory;   // %! should be a _var"
+      <<       be_nl
+
+      <<    "if (!CORBA::ValueBase::_tao_unmarshal_pre (strm, factory, base," << be_idt_nl
+      <<       "      " << node->name ()
+      << "::_tao_obv_static_repository_id ()) )" << be_nl
+      <<       "{" << be_idt_nl
+      <<          "return 0;" << be_uidt_nl
+      <<       "}" << be_uidt_nl
+      <<    "if (factory != 0)" << be_idt_nl
+      <<      "{" << be_idt_nl
+
+      <<        "base = factory->create_for_unmarshal ();" << be_nl
+      <<        "factory->_remove_ref ();" << be_nl
+      <<        "if (base == 0)  return 0;  // %! except.?" << be_nl
+      <<        "//%! ACE_DEBUG ((LM_DEBUG, \"" << node->name()
+      <<            "::_tao_unmarshal %s\\n\", "
+      <<            "base->_tao_obv_repository_id () ));" << be_nl
+      <<        "retval = base->_tao_unmarshal_v (strm);" << be_nl
+      <<        "//%! ACE_DEBUG ((LM_DEBUG, \"" << node->name()
+      <<            "::_tao_unmarshal retval unmarshal_v is %d\\n\", "
+      <<            "retval));" << be_nl
+      <<         "if (!retval) return 0;"
+
+      <<       be_uidt_nl << "}" << be_uidt_nl
+      <<    "// Now base must be null or point to the unmarshaled object."
+      <<      be_nl
+      <<    "// Align the pointer to the right subobject." << be_nl
+      <<    "new_object = " << node->name () << "::_downcast (base);" << be_nl
+      <<    "// %! unmarshal_post" << be_nl
+      <<    "return 1;" << be_uidt_nl
+      <<  "}\n" << be_nl;
+
+  // The static T::_tao_unmarshal method  ------------------------ end
+
+  // generate the ifdefined macro for  the _init type
+  os->gen_ifdef_macro (node->flatname (), "_init");
+  if (this->gen_init_impl (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_cs::"
+                         "visit_valuetype - "
+                         "codegen for _init failed\n"), -1);
+    }
+  os->gen_endif ();
+
+  // generate code for the elements of the valuetype
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_cs::"
+                         "visit_valuetype - "
+                         "codegen for scope failed\n"), -1);
+    }
+
+
+  // by using a visitor to declare and define the TypeCode, we have the
+  // added advantage to conditionally not generate any code. This will be
+  // based on the command line options. This is still TO-DO
+     // (see interface code how to do this. not yet impl.)
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
new file mode 100644
index 00000000000..4cdee96d078
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -0,0 +1,176 @@
+
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_obv__ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes in the client header
+//    OBV_ class
+//    (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on interface_ch.cpp from Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype_obv_ch, valuetype_obv_ch, "$Id$")
+
+
+// ******************************************************
+// Valuetype visitor for client header
+// ******************************************************
+
+be_visitor_valuetype_obv_ch::be_visitor_valuetype_obv_ch (be_visitor_context *ctx)
+  : be_visitor_valuetype (ctx)
+{
+}
+
+be_visitor_valuetype_obv_ch::~be_visitor_valuetype_obv_ch (void)
+{
+}
+
+
+// OBV_ class must be in OBV_ namespace
+int
+be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
+{
+  // only visit non-abstract valuetype
+  if (node->is_abstract_valuetype ())
+    return 0;
+
+  TAO_OutStream *os; // output stream
+
+  os = this->ctx_->stream ();
+
+  // OBV_ class maps only to a typedef if we are optimizing accessors
+  if (node->opt_accessor ())
+    {
+      os->indent ();
+      *os << "typedef " << node->fullname () << " ";
+      if (!node->is_nested ())
+        *os << "OBV_";
+      *os << node->local_name () << ";" << be_nl;
+    }
+  else
+    {
+      // == STEP 1:  generate the class name and the class name we inherit ==
+
+      os->gen_ifdef_macro (node->flatname (), "_OBV");
+      os->indent ();
+
+      *os << "// OBV_ class" << be_nl;
+      *os << "class ";
+      if (!node->is_nested())   // we are in root ?
+        *os << "OBV_";
+      *os << node->local_name () << " : public virtual "
+                                 << node->fullname () << be_nl;
+
+      // == STEP 2: generate the body ==
+
+      *os << "{\n" << be_idt;
+
+      // generate code for the OBV_ class definition
+      if (this->visit_valuetype_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_obv_ch::"
+                             "visit_valuetype - "
+                             "codegen for scope failed\n"), -1);
+        }
+      // map fields to private data
+      if (!node->opt_accessor ())  // check again (redundant)
+        {
+          *os << be_uidt_nl << "protected:" << be_idt_nl;
+          *os << "virtual CORBA::Boolean _tao_marshal__"
+              <<    node->flatname () << " (TAO_OutputCDR &);" << be_nl;
+          *os << "virtual CORBA::Boolean _tao_unmarshal__"
+              <<    node->flatname () << " (TAO_InputCDR &);" << be_nl;
+          *os << "CORBA::Boolean "
+              << "_tao_marshal_state (TAO_OutputCDR &);" << be_nl
+              << "CORBA::Boolean "
+              << "_tao_unmarshal_state (TAO_InputCDR &);\n\n";
+          *os << be_uidt_nl << "private:" << be_idt_nl;
+          this->gen_pd (node);
+        }
+      *os << be_uidt;
+      os->indent ();
+      *os << "};\n";
+      os->gen_endif ();
+    } // if !opt_accessor ()
+
+  return 0;
+}
+
+
+int
+be_visitor_valuetype_obv_ch::visit_field (be_field *node)
+{
+  be_valuetype *vt = be_valuetype::narrow_from_scope (node->defined_in ());
+  if (!vt)
+    return -1;
+  // only in OBV_ class, if we are not optimizing accessors (and modifiers)
+  if (!vt->opt_accessor ())
+    {
+      be_visitor_context* ctx = new be_visitor_context (*this->ctx_);
+      ctx->state (TAO_CodeGen::TAO_FIELD_OBV_CH);
+      be_visitor_valuetype_field_ch *visitor =
+                 new be_visitor_valuetype_field_ch (ctx);
+
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_valuetype_obv_ch::"
+                             "visit_field - bad visitor\n"),
+                            -1);
+        }
+
+      visitor->setenclosings ("virtual ",";");
+      if (node->accept (visitor) == -1)
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_obv_ch::"
+                            "visit_field - codegen failed\n"),
+                            -1);
+        }
+      delete visitor;
+    }
+  return 0;
+}
+
+void
+be_visitor_valuetype_obv_ch::begin_public ()
+{
+  TAO_OutStream *os; // output stream
+
+  os = this->ctx_->stream ();
+  *os << be_uidt;
+  os->indent ();
+  *os << "public:\n" << be_idt;
+}
+
+void
+be_visitor_valuetype_obv_ch::begin_private ()
+{
+  TAO_OutStream *os; // output stream
+
+  os = this->ctx_->stream ();
+  *os << be_uidt;
+  os->indent ();
+  *os << "protected:\n" << be_idt;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
new file mode 100644
index 00000000000..ca026ba9dfd
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
@@ -0,0 +1,78 @@
+
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_obv_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes
+//    OBV_ class implementation
+//    (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on interface_ch.cpp from Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype_obv_ci, valuetype_obv_ci, "$Id$")
+
+
+// ******************************************************
+// Valuetype visitor for OBV_ class implementation
+// ******************************************************
+
+be_visitor_valuetype_obv_ci::be_visitor_valuetype_obv_ci (be_visitor_context *ctx)
+  : be_visitor_valuetype (ctx)
+{
+}
+
+be_visitor_valuetype_obv_ci::~be_visitor_valuetype_obv_ci (void)
+{
+}
+
+
+// OBV_ class must be in OBV_ namespace
+int
+be_visitor_valuetype_obv_ci::visit_valuetype (be_valuetype *node)
+{
+return 0; // %! dead code
+  // only visit non-abstract valuetype
+  if (node->is_abstract_valuetype ())
+    return 0;
+
+  TAO_OutStream *os; // output stream
+
+  os = this->ctx_->stream ();
+  os->indent ();
+
+  // OBV_ class is only a typedef if we are optimizing accessors
+  if (node->opt_accessor ())
+    {
+    }
+  else
+    {
+    } // if !opt_accessor ()
+  return 0;
+}
+
+
+int
+be_visitor_valuetype_obv_ci::visit_field (be_field *node)
+{
+  // dead code
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
new file mode 100644
index 00000000000..4bcf4ef00ba
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
@@ -0,0 +1,111 @@
+
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_obv_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes
+//    OBV_ class implementation
+//    (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    derived from interface_ch.cpp from Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype.h"
+
+ACE_RCSID(be_visitor_valuetype_obv_cs, valuetype_obv_cs, "$Id$")
+
+
+// ******************************************************
+// Valuetype visitor for OBV_ class implementation
+// ******************************************************
+
+be_visitor_valuetype_obv_cs::be_visitor_valuetype_obv_cs (be_visitor_context *ctx)
+  : be_visitor_scope (ctx)
+{
+}
+
+be_visitor_valuetype_obv_cs::~be_visitor_valuetype_obv_cs (void)
+{
+}
+
+
+// OBV_ class must be in OBV_ namespace
+int
+be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
+{
+  // only visit non-abstract valuetype
+  if (node->is_abstract_valuetype ())
+    return 0;
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // OBV_ class has no accessors or modifiers if we are optimizing
+  // or the valuetype is abstract.
+  if (!(node->opt_accessor () || node->is_abstract_valuetype () ))
+    {
+      os->indent ();
+      *os << "CORBA::Boolean " << be_nl
+          << node->full_obv_skel_name ()
+          << "::_tao_marshal__" << node->flatname ()
+          <<    " (TAO_OutputCDR &strm)"
+          << "{" << be_idt_nl
+          <<   "return " << node->full_obv_skel_name ()
+          <<   "::_tao_marshal_state (strm);" << be_nl
+          << be_uidt_nl << "}\n";
+
+      *os << "CORBA::Boolean "
+          << node->full_obv_skel_name ()
+          << "::_tao_unmarshal__" << node->flatname ()
+          <<    " (TAO_InputCDR &strm)"
+          << "{" << be_idt_nl
+          <<   "return " << node->full_obv_skel_name ()
+          <<   "::_tao_unmarshal_state (strm);" << be_nl
+          << be_uidt_nl << "}\n";
+
+      if (this->visit_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_obv_cs::"
+                             "visit_valuetype - "
+                             "visit_scope failed\n"
+                             ), -1);
+        }
+      }
+  return 0;
+}
+
+int
+be_visitor_valuetype_obv_cs::visit_field (be_field *node)
+{
+  be_visitor_context *ctx = new be_visitor_context (*this->ctx_);
+  be_visitor_valuetype_field_cs *visitor =
+    new be_visitor_valuetype_field_cs (ctx);
+  visitor->in_obv_space_ = 1;
+  // visitor->setenclosings ("ACE_INLINE ");
+  if (visitor->visit_field (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_valuetype_obv_cs::"
+                         "visit_field - "
+                         "visit_field failed\n"
+                         ), -1);
+    }
+  delete visitor;
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp
new file mode 100644
index 00000000000..79d1f442b5b
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp
@@ -0,0 +1,37 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_valuetype_fwd.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Valuetype_Fwd
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#ifdef IDL_HAS_VALUETYPE
+
+#include "be_visitor_valuetype_fwd.h"
+
+// include all the individual files
+//#include "be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp"
+//#include "be_visitor_valuetype_fwd/valuetype_fwd_ci.cpp"
+//#include "be_visitor_valuetype_fwd/cdr_op_ci.cpp"
+
+ACE_RCSID(be, be_visitor_valuetype_fwd, "$Id$")
+
+#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
new file mode 100644
index 00000000000..a290ee99010
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
@@ -0,0 +1,74 @@
+//
+// $Id$
+//
+
+// ================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for forward
+//    declarations of valuetypes. This uses compiled marshaling.
+//
+// = AUTHOR
+//    Torsten Kuepper based on code from
+//    Aniruddha Gokhale & Carlos O'Ryan (cdr_op_ci.cpp)
+//
+// ================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype_fwd.h"
+
+ACE_RCSID(be_visitor_valuetype_fwd, cdr_op_ci, "$Id$")
+
+// ****************************************************************
+// Interface visitor for generating CDR operator declarations in the
+// client header
+// ****************************************************************
+
+be_visitor_valuetype_fwd_cdr_op_ci::
+be_visitor_valuetype_fwd_cdr_op_ci (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_fwd_cdr_op_ci::"
+                             "must be implemented\n"), -1);
+}
+
+be_visitor_valuetype_fwd_cdr_op_ci::
+~be_visitor_valuetype_fwd_cdr_op_ci (void)
+{
+}
+
+int
+be_visitor_valuetype_fwd_cdr_op_ci::
+visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  if (node->cli_inline_cdr_op_gen () || node->imported ())
+    return 0;
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // generate the CDR << and >> operator declarations
+  os->indent ();
+  *os << "ACE_INLINE CORBA::Boolean" << be_nl
+      << "operator<< (" << be_idt << be_idt_nl
+      << "TAO_OutputCDR &," << be_nl
+      << "const " << node->name () << "_ptr" << be_uidt_nl
+      << ");" << be_uidt_nl;
+  *os << "ACE_INLINE CORBA::Boolean" << be_nl
+      << "operator>> (" << be_idt << be_idt_nl
+      << "TAO_InputCDR &," << be_nl
+      << node->name () << "_ptr &" << be_uidt_nl
+      << ");" << be_uidt << "\n";
+
+  node->cli_inline_cdr_op_gen (1);
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ch.cpp
new file mode 100644
index 00000000000..5411463a7ec
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ch.cpp
@@ -0,0 +1,100 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_fwd_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interface_Fwd node in the client header.
+//
+// = AUTHOR
+//    Torsten Kuepper
+//    based on code from Aniruddha Gokhale (interface_fwd_ch.cpp)
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype_fwd.h"
+
+ACE_RCSID(be_visitor_valuetype_fwd, valuetype_fwd_ch, "$Id$")
+
+
+// ********************************************************************
+// Visitor implementation for the Interface_Fwd type
+// This one for the client header file
+// ********************************************************************
+
+be_visitor_valuetype_fwd_ch::be_visitor_valuetype_fwd_ch (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_fwd_ch::"
+                             "must be implemented\n"), -1);
+}
+
+be_visitor_valuetype_fwd_ch::~be_visitor_valuetype_fwd_ch (void)
+{
+}
+
+// visit the Interface_Fwd_Ch node and its scope
+int
+be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (!node->cli_hdr_gen () && !node->imported ())
+    {
+      os->indent (); // start from the current
+
+      // all we do in this is generate a forward declaration of the class
+      *os << "class " << node->local_name () << ";" << be_nl;
+
+      // generate the ifdefined macro for the _ptr type
+      os->gen_ifdef_macro (node->flatname (), "_ptr");
+
+      // generate the _ptr declaration
+      *os << "typedef " << node->local_name () << " *" << node->local_name ()
+          << "_ptr;\n";
+
+      os->gen_endif ();
+
+      // enclose under an ifdef macro
+      os->gen_ifdef_macro (node->flatname (), "_var");
+
+      // generate the _var declaration
+      if (node->gen_var_defn () == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_fwd_ch::"
+                             "visit_valuetype_fwd - "
+                             "codegen for _var failed\n"), -1);
+        }
+      // gen an endif
+      os->gen_endif ();
+
+      // enclose under an ifdef macro
+      os->gen_ifdef_macro (node->flatname (), "_out");
+
+      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
+      if (node->gen_out_defn () == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_fwd_ch::"
+                             "visit_valuetype_fwd - "
+                             "codegen for _out failed\n"), -1);
+        }
+      // generate the endif macro
+      os->gen_endif ();
+      node->cli_hdr_gen (I_TRUE);
+    }
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ci.cpp
new file mode 100644
index 00000000000..aaadbbb38f6
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ci.cpp
@@ -0,0 +1,85 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_fwd_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interface_Fwd node in the client inline.
+//
+// = AUTHOR
+//    Torsten Kuepper
+//    based on code from Aniruddha Gokhale (interface_fwd_ci.cpp)
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_valuetype_fwd.h"
+
+ACE_RCSID(be_visitor_valuetype_fwd, valuetype_fwd_ci, "$Id$")
+
+
+// ********************************************************************
+// Visitor implementation for the Interface_Fwd type
+// This one for the client inline file
+// ********************************************************************
+
+be_visitor_valuetype_fwd_ci::be_visitor_valuetype_fwd_ci (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_fwd_ci::"
+                             "must be implemented\n"), -1);
+}
+
+be_visitor_valuetype_fwd_ci::~be_visitor_valuetype_fwd_ci (void)
+{
+}
+
+// visit the Interface_Fwd_ci node and its scope
+int
+be_visitor_valuetype_fwd_ci::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  if (!node->cli_inline_gen () && !node->imported ())
+    {
+
+      // generate the ifdefined macro for  the _var type
+      os->gen_ifdef_macro (node->flatname (), "_var");
+
+      if (node->gen_var_impl () == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_fwd_ci::"
+                             "visit_valuetype_fwd - "
+                             "codegen for _var failed\n"), -1);
+        }
+
+      os->gen_endif ();
+
+      // generate the ifdefined macro for  the _out type
+      os->gen_ifdef_macro (node->flatname (), "_out");
+
+      if (node->gen_out_impl () == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_valuetype_fwd_ci::"
+                             "visit_valuetype_fwd - "
+                             "codegen for _out failed\n"), -1);
+        }
+      os->gen_endif ();
+
+      node->cli_stub_gen (I_TRUE);
+    }
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be_include/be.h b/TAO/TAO_IDL/be_include/be.h
index 972dafa2e0d..b2c9ee43602 100644
--- a/TAO/TAO_IDL/be_include/be.h
+++ b/TAO/TAO_IDL/be_include/be.h
@@ -101,6 +101,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include        "be_module.h"           // class BE_Module
 #include        "be_interface.h"        // class BE_Interface
 #include        "be_interface_fwd.h"    // class BE_InterfaceFwd
+#include        "be_valuetype.h"        // class be_valuetype
+#include        "be_valuetype_fwd.h"    // class be_valuetype_fwd
 #include        "be_structure.h"        // class BE_Structure
 #include        "be_exception.h"        // class BE_Exception
 #include        "be_expression.h"       // class BE_Expr_val
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index e87d9bdd1d2..67176507714 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -126,6 +126,7 @@ public:
     TAO_FIELD_CS,
     TAO_FIELD_CDR_OP_CH,
     TAO_FIELD_CDR_OP_CS,
+    TAO_FIELD_OBV_CH,
 
     // emitting code for the interface
     TAO_INTERFACE_CH,
@@ -150,6 +151,34 @@ public:
     TAO_INTERFACE_FWD_CI,
     TAO_INTERFACE_FWD_CDR_OP_CI,
 
+    // emitting code for the valuetype
+    TAO_VALUETYPE_CH,
+    TAO_VALUETYPE_CI,
+    TAO_VALUETYPE_CS,
+    TAO_VALUETYPE_SH,
+    TAO_VALUETYPE_IH,
+    TAO_VALUETYPE_SI,
+    TAO_VALUETYPE_SS,
+    TAO_VALUETYPE_IS,
+    TAO_VALUETYPE_OBV_CH,               // OBV_ class
+    TAO_VALUETYPE_OBV_CI,
+    TAO_VALUETYPE_OBV_CS,
+    TAO_VALUETYPE_COLLOCATED_SH,
+    TAO_VALUETYPE_COLLOCATED_SS,
+    TAO_VALUETYPE_ANY_OP_CH,
+    TAO_VALUETYPE_ANY_OP_CS,
+    TAO_VALUETYPE_MARSHAL_CH,          // the actual generation of CDR in header
+    TAO_VALUETYPE_MARSHAL_CS,          // and the implementation, activated from:
+    TAO_VALUETYPE_CDR_OP_CH,
+    TAO_VALUETYPE_CDR_OP_CS,
+    //TAO_VALUETYPE_TIE_SH,
+    //TAO_VALUETYPE_TIE_SI,
+
+    // emitting code for the valuetype forward declaration
+    TAO_VALUETYPE_FWD_CH,
+    TAO_VALUETYPE_FWD_CI,
+    TAO_VALUETYPE_FWD_CDR_OP_CI,
+
     // emitting code for the module
     TAO_MODULE_CH,
     TAO_MODULE_CI,
@@ -163,6 +192,9 @@ public:
     TAO_MODULE_ANY_OP_CS,
     TAO_MODULE_CDR_OP_CH,
     TAO_MODULE_CDR_OP_CS,
+    TAO_MODULE_OBV_CH,                  // for OBV_ (cmp. POA_ namespace)
+    TAO_MODULE_OBV_CI,
+    TAO_MODULE_OBV_CS,
 
     // emitting code for an operation.
     TAO_OPERATION_CH,                       // in client header
@@ -217,6 +249,15 @@ public:
     TAO_OPERATION_TIE_SH,
     TAO_OPERATION_TIE_SI,
 
+    TAO_OBV_OPERATION_ARGLIST_CH,      // parameter list in obv op signature
+                                             // ... for client header
+    TAO_OBV_OPERATION_ARGLIST_OBV_CH,        // ... for OBV_ class
+    TAO_OBV_OPERATION_ARGLIST_SH,            // ... for server header
+    TAO_OBV_OPERATION_ARGLIST_IH,            // ... for implementation header
+    TAO_OBV_OPERATION_ARGLIST_IS,            // ... for implementation header
+    TAO_OBV_OPERATION_ARGLIST_COLLOCATED_SH,   // ... for collocated server
+    TAO_OBV_OPERATION_ARGLIST_OTHERS,          // ... for all other cases
+
     // emitting code for root
     TAO_ROOT_CH,
     TAO_ROOT_CI,
diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h
index 526cab7c19b..d4bc99a4252 100644
--- a/TAO/TAO_IDL/be_include/be_field.h
+++ b/TAO/TAO_IDL/be_include/be_field.h
@@ -34,7 +34,8 @@ public:
   be_field (void);
   // default constructor
 
-  be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p);
+  be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p,
+                                    Visibility vis = vis_NA);
   // constructor
 
   virtual int gen_encapsulation (void);
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
index d28bf650f1d..2bb9b227933 100644
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ b/TAO/TAO_IDL/be_include/be_generator.h
@@ -100,6 +100,12 @@ public:
                                           UTL_StrList *p);
   virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n,
                                                  UTL_StrList *p);
+  virtual AST_Interface *create_valuetype(UTL_ScopedName *n,
+                                          AST_Interface **ih,
+                                          long nih,
+                                          UTL_StrList *p);
+  virtual AST_InterfaceFwd *create_valuetype_fwd(UTL_ScopedName *n,
+                                                 UTL_StrList *p);
   virtual AST_Exception *create_exception(UTL_ScopedName *n, UTL_StrList *p);
   virtual AST_Structure *create_structure(UTL_ScopedName *n, UTL_StrList *p);
   virtual AST_Enum      *create_enum(UTL_ScopedName *n, UTL_StrList *p);
@@ -108,7 +114,9 @@ public:
                                           UTL_ScopedName *n,
                                           UTL_StrList *p);
   virtual AST_Field     *create_field(AST_Type *ft, UTL_ScopedName *n,
-                                      UTL_StrList *p);
+                                      UTL_StrList *p,
+                                      AST_Field::Visibility vis = AST_Field::vis_NA);
+
   virtual AST_Argument  *create_argument(AST_Argument::Direction d,
                                          AST_Type *ft,
                                          UTL_ScopedName *n,
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index ce0eacdfbe9..316597e83c5 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -173,20 +173,21 @@ public:
   // helper method to determine if the interface node is involved in some kind
   // of multiple inheritance or not. Required on the skeleton side
 
-  static int gen_def_ctors_helper (be_interface* node, 
-                                   be_interface* base, 
+  static int gen_def_ctors_helper (be_interface* node,
+                                   be_interface* base,
                                    TAO_OutStream *os);
 
   //helper method to generate a call to the default constructors of all the base classes
 
-  static int gen_copy_ctors_helper (be_interface* node, 
-                                   be_interface* base, 
+  static int gen_copy_ctors_helper (be_interface* node,
+                                   be_interface* base,
                                    TAO_OutStream *os);
 
   //helper method to generate a call to the copy constructors of all the base classes
 
 
   void compute_fullskelname (void);
+  void compute_fullskelname (char *&skelname, const char * prefix);
   // compute the fully scoped skel class name
 
   int gen_operation_table (void);
diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h
index f3b2d156710..0c40c4a6b36 100644
--- a/TAO/TAO_IDL/be_include/be_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h
@@ -39,9 +39,11 @@ public:
   be_interface_fwd (void);
   // default constructor
 
-  be_interface_fwd (UTL_ScopedName *n, UTL_StrList *p);
+  be_interface_fwd (AST_Interface *dummy, UTL_ScopedName *n, UTL_StrList *p);
   // constructor
 
+  virtual ~be_interface_fwd (void);
+
   virtual int gen_var_defn (void);
   // generate the _var class definition
 
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
new file mode 100644
index 00000000000..9e93bd99486
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_valuetype.h
@@ -0,0 +1,132 @@
+/* -*- c++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_valuetype.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Interface and be_interface that provides
+//    additional means for C++ mapping of an valuetype.
+//
+// ============================================================================
+
+#ifndef TAO_BE_VALUETYPE_H
+#define TAO_BE_VALUETYPE_H
+
+#ifdef IDL_HAS_VALUETYPE
+
+class TAO_OutStream;
+
+/*
+ * BE_Valuetype
+ */
+class be_valuetype : public virtual be_interface
+{
+  // = TITLE
+  //   Backend-class for valuetypes
+  //
+  // = DESCRIPTION
+  //   Extends be_interface and overrides member functions for valuetype
+  //   mapping.
+  //
+public:
+
+  // used to pass functions to the template method
+  //: typedef int (*tao_code_emitter) (be_interface *, be_interface *, TAO_OutStream *);
+
+  // Operations
+  be_valuetype (void);
+  // Default constructor
+
+  be_valuetype (UTL_ScopedName *n, AST_Interface **ih, long nih,
+                UTL_StrList *p, idl_bool set_abstract = 0);
+  // Constructor that sets its scoped name <n>, a list of inherited valuetypes
+  // and supported interfaces <ih>, the number of inherited interfaces <nih>,
+  // and any pragmas <p>
+
+  ~be_valuetype (void);
+  // dtor
+
+  virtual void redefine (be_valuetype *from, UTL_StrList *p);
+
+  idl_bool opt_accessor ();
+  // should generate optimized form ?
+
+  virtual int gen_var_defn (void);
+  // generate the _var class definition
+
+  // virtual void gen_def_ctors (TAO_OutStream* os);
+  //call the default constructors of all the base classes
+
+
+
+  // virtual void gen_copy_ctors (TAO_OutStream* os);
+  //call the copy constructors of all the base classes
+
+  virtual int gen_var_impl (void);
+  // generate the implementation for the _var class
+
+  virtual int gen_out_defn (void);
+  // generate the _out class definition
+
+  virtual int gen_out_impl (void);
+  // generate the _out implementation
+
+  const char *full_obv_skel_name (void);
+  // retrieve the fully scoped skel class name
+
+
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
+  // virtual int traverse_inheritance_graph (tao_code_emitter gen,
+  //                                         TAO_OutStream *os);
+  // template method using breadth first traversal of inheritance graph
+
+  //: const char *relative_skel_name (const char *other_class_name);
+  // relative skeleton name
+
+  const char *field_pd_prefix ();
+  const char *field_pd_postfix ();
+  // for building the name for private data fields
+  be_valuetype *statefull_inherit ();
+
+
+  // Visiting
+  virtual int accept (be_visitor *visitor);
+
+  virtual idl_bool is_valuetype ();
+  virtual idl_bool is_abstract_valuetype ();
+  virtual void set_abstract_valuetype ();
+
+ // Narrowing
+  DEF_NARROW_METHODS1 (be_valuetype, be_interface);
+  DEF_NARROW_FROM_DECL (be_valuetype);
+  DEF_NARROW_FROM_SCOPE (be_valuetype);
+
+  void compute_fullobvskelname (void);
+  // compute the fully scoped skel class name
+
+
+private:
+  char * full_obv_skel_name_;
+  idl_bool abstract_;
+};
+
+#endif  /* IDL_HAS_VALUETYPE */
+
+#endif  // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
new file mode 100644
index 00000000000..43ba4525274
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
@@ -0,0 +1,76 @@
+/* -*- c++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_valuetype_fwd.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Interface_Fwd that provides additional
+//    means for C++ mapping of a valuetype.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale,
+//    changed for valuetypes from Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#ifndef BE_VALUETYPE_FWD_H
+#define BE_VALUETYPE_FWD_H
+
+#ifdef IDL_HAS_VALUETYPE
+
+/*
+ * BE_InterfaceFwd
+ */
+
+class be_valuetype_fwd : public virtual be_interface_fwd
+{
+  // =TITLE
+  //  be_valuetype_fwd
+  // =DESCRIPTION
+  //  Extensions to the be_interface_fwd class
+public:
+  // Operations
+
+  be_valuetype_fwd (void);
+  // default constructor
+
+  be_valuetype_fwd (AST_Interface *dummy, UTL_ScopedName *n, UTL_StrList *p);
+  // constructor
+
+  virtual ~be_valuetype_fwd (void);
+
+  virtual void set_abstract_valuetype ();
+
+  // Generate Mapping
+  virtual int gen_var_defn (void);
+  // generate the _var class definition
+
+  virtual int gen_var_impl (void);
+  // generate the implementation for the _var class
+
+  virtual int gen_out_defn (void);
+  // generate the _out class definition
+
+  virtual int gen_out_impl (void);
+  // generate the _out implementation
+
+  // Visiting
+  virtual int accept (be_visitor* visitor);
+
+  // Narrowing
+  DEF_NARROW_METHODS1 (be_valuetype_fwd, be_interface_fwd);
+  DEF_NARROW_FROM_DECL (be_valuetype_fwd);
+
+};
+
+#endif /* IDL_HAS_VALUETYPE */
+
+#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h
index c6d0b00d9fd..249bee0d4c2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor.h
@@ -32,6 +32,10 @@ class be_predefined_type;
 class be_module;
 class be_interface;
 class be_interface_fwd;
+#ifdef IDL_HAS_VALUETYPE
+  class be_valuetype;
+  class be_valuetype_fwd;
+#endif /* IDL_HAS_VALUETYPE */
 class be_structure;
 class be_exception;
 class be_expression;
@@ -91,6 +95,14 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface_fwd
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype_fwd
+#endif /* IDL_HAS_VALUETYPE */
+
   virtual int visit_structure (be_structure *node);
   // visit a structure
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
index fe811e1104c..0e784a7e4b1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
@@ -83,6 +83,14 @@ public:
   virtual int visit_typedef (be_typedef *node);
   // visit the typedef type
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype_fwd
+#endif /* IDL_HAS_VALUETYPE */
+
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_ARGLIST_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h
index e06bfc3baa8..47a30f5b143 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h
@@ -58,6 +58,14 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h
index db6f8da19dd..e04b8edf204 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h
@@ -58,6 +58,14 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.h
index caf968f0565..53ae360551c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.h
@@ -52,6 +52,14 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   virtual int visit_typedef (be_typedef *node);
   // visit the typedef type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
index cd7707f74f3..fc578fe2662 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
@@ -58,6 +58,14 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
index a09695a383c..a4209caeb9e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
@@ -58,6 +58,14 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
@@ -103,6 +111,15 @@ public:
 
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
+
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_VARDECL_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
index a3fc7ce30db..27e7d702085 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
@@ -55,6 +55,14 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward type
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype type
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward type
+#endif /* IDL_HAS_VALUETYPE */
+
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
index 1949e865ef7..c12aeeed170 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
@@ -57,6 +57,14 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype_fwd
+#endif /* IDL_HAS_VALUETYPE */
+
   virtual int visit_module (be_module *node);
   // visit a module
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
index 6ebfa0a3e80..e27360f0b29 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
@@ -59,6 +59,14 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
index 9a196b55d48..a5ed3483393 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
@@ -76,6 +76,11 @@ public:
   int visit_union (be_union *node);
   // visit a union node
 
+# ifdef IDL_HAS_VALUETYPE
+  int visit_valuetype (be_valuetype *node);
+  int visit_valuetype_fwd (be_valuetype_fwd *node);
+# endif /* IDL_HAS_VALUETYPE */
+
 };
 
 #endif /* _BE_VISITOR_OPERATION_RETTYPE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
index c43e3094c57..26d943d55d5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
@@ -57,6 +57,14 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
index 644f9d27fbd..845ddb5f6c1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
@@ -56,6 +56,14 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
index 05626351ea5..cd173c0cedb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
@@ -55,6 +55,14 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
index f7bce1756ab..3b0d6613299 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
@@ -55,6 +55,14 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
index ba942a2bbfd..5adf69c8c89 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
@@ -56,6 +56,14 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
+#endif /* IDL_HAS_VALUETYPE */
+
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
index 79507d2254b..ded8bb0c11c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
@@ -60,6 +60,14 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype_fwd
+#endif /* IDL_HAS_VALUETYPE */
+
   virtual int visit_module (be_module *node);
   // visit a module
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
index d0deb7bc4f6..ffbcc9de479 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
@@ -59,6 +59,14 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward type
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype type
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward type
+#endif /* IDL_HAS_VALUETYPE */
+
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype.h
new file mode 100644
index 00000000000..116bc7147eb
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype.h
@@ -0,0 +1,47 @@
+
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_valuetype.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype class
+//
+// ============================================================================
+
+#ifndef TAO_BE_VISITOR_VALUETYPE_H
+#define TAO_BE_VISITOR_VALUETYPE_H
+
+#ifdef IDL_HAS_VALUETYPE
+
+#include "be_visitor_scope.h"
+
+#include "be_visitor_valuetype/valuetype.h"
+#include "be_visitor_valuetype/valuetype_ch.h"
+#include "be_visitor_valuetype/valuetype_obv_ch.h"
+#include "be_visitor_valuetype/valuetype_obv_cs.h"
+#include "be_visitor_valuetype/valuetype_ci.h"
+#include "be_visitor_valuetype/valuetype_cs.h"
+//#include "be_visitor_valuetype/valuetype_ih.h"
+//#include "be_visitor_valuetype/valuetype_is.h"
+//#include "be_visitor_valuetype/any_op_ch.h"
+//#include "be_visitor_valuetype/any_op_cs.h"
+#include "be_visitor_valuetype/cdr_op_ch.h"
+#include "be_visitor_valuetype/cdr_op_cs.h"
+#include "be_visitor_valuetype/marshal_ch.h"
+#include "be_visitor_valuetype/marshal_cs.h"
+#include "be_visitor_valuetype/arglist.h"
+#include "be_visitor_valuetype/field_ch.h"
+#include "be_visitor_valuetype/field_cs.h"
+#include "be_visitor_valuetype/field_cdr_ci.h"
+#include "be_visitor_valuetype/obv_module.h"
+
+#endif /* IDL_HAS_VALUETYPE */
+
+#endif /* TAO_BE_VISITOR_VALUETYPE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
new file mode 100644
index 00000000000..e9b6747180d
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
@@ -0,0 +1,55 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL (valuetype) operations.
+//    This generates the operation signature.
+//
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OBV_OPERATION_ARGLIST_H_
+#define _BE_VISITOR_OBV_OPERATION_ARGLIST_H_
+
+// ******************************************************************************
+// Operation visitor for argument list - generates parameters in the signature
+// ******************************************************************************
+
+class be_visitor_obv_operation_arglist : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_operaion_arglist
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate operation argument list
+  //
+  //
+public:
+  be_visitor_obv_operation_arglist (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_obv_operation_arglist (void);
+  // destructor
+
+  int visit_operation (be_operation *node);
+  // visit the operation
+
+  int visit_argument (be_argument *node);
+  // visit each argument
+
+  int post_process (be_decl *bd);
+  // set 'comma' only between arguments
+
+};
+
+#endif /* _BE_VISITOR_OBV_OPERATION_ARGLIST_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
new file mode 100644
index 00000000000..15d64a457cc
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_VALUETYPE_CDR_OP_CH_H_
+#define _BE_VISITOR_VALUETYPE_CDR_OP_CH_H_
+
+class be_visitor_valuetype_cdr_op_ch : public be_visitor_valuetype
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the CDR operator
+  //   declarations
+  //
+
+public:
+  be_visitor_valuetype_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_cdr_op_ch (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+};
+
+#endif /* _BE_VISITOR_VALUETYPE_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
new file mode 100644
index 00000000000..9ed00ec9478
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_VALUETYPE_CDR_OP_CS_H_
+#define _BE_VISITOR_VALUETYPE_CDR_OP_CS_H_
+
+class be_visitor_valuetype_cdr_op_cs : public be_visitor_valuetype
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the CDR operator
+  //   implementations
+  //
+
+public:
+  be_visitor_valuetype_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_cdr_op_cs (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+};
+
+#endif /* _BE_VISITOR_VALUETYPE_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ci.h
new file mode 100644
index 00000000000..db0a7d798a5
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ci.h
@@ -0,0 +1,115 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cdr_ci.h
+//
+// = DESCRIPTION
+//    Visitor generating code for Field in the client stubs file.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_field/cdr_op_cs.h
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_VALUETYPE_FIELD_CDR_CI_H_
+#define _BE_VISITOR_VALUETYPE_FIELD_CDR_CI_H_
+
+#include "be_visitor_scope.h"
+
+class be_visitor_valuetype_field_cdr_ci : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //    be_visitor_valuetype_field_cdr_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_field node for the client header.
+  //
+public:
+  be_visitor_valuetype_field_cdr_ci (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_field_cdr_ci (void);
+  // destructor
+
+  virtual int visit_field (be_field *node);
+  // visit the field node
+
+  // =visit operations on all possible data types that a field can be
+
+  virtual int visit_array (be_array *node);
+  // visit array type
+
+  virtual int visit_enum (be_enum *node);
+  // visit enum type
+
+  virtual int visit_interface (be_interface *node);
+  // visit interface type
+
+  virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
+
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype type
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward type
+
+  virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
+
+  virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
+
+  virtual int visit_string (be_string *node);
+  // visit string type
+
+  virtual int visit_structure (be_structure *node);
+  // visit structure type
+
+  virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
+
+  virtual int visit_union (be_union *node);
+  // visit union type
+
+  const char *pre_, *post_;
+};
+
+class be_visitor_valuetype_field_cdr_decl : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_cdr_op_cs_field_decl
+  //
+  // = DESCRIPTION
+  //   When generating CDR operators for fields of structures and/or
+  //   unions it may be necessary to define some local variables (for
+  //   instance to hold temporary T_forany objects); this visitor
+  //   generates that code.
+  //
+public:
+  be_visitor_valuetype_field_cdr_decl (be_visitor_context *ctx);
+  // constructor
+
+  virtual int visit_field (be_field *node);
+  // visit the field node
+
+  // = visit operations for data types that require a local variable.
+
+  virtual int visit_array (be_array *node);
+  // visit array type
+
+  virtual int visit_typedef (be_typedef *node);
+  // visit typedef type
+};
+
+#endif /*  _BE_VISITOR_VALUETYPE_FIELD_CDR_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
new file mode 100644
index 00000000000..cb1e6519f20
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
@@ -0,0 +1,96 @@
+/* -*- c++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ch.h
+//
+// = DESCRIPTION
+//    Visitor generating code for valuetype fields in the valuetype class
+//    (header).
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_union_branch/public_ch.h
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_VALUETYPE_FIELD_CH_H_
+#define _BE_VISITOR_VALUETYPE_FIELD_CH_H_
+
+class be_visitor_valuetype_field_ch : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //    be_visitor_field_ch
+  //
+  // = DESCRIPTION
+  //    Visitor generating code for valuetype fields in the valuetype class
+  //    (header).
+  //
+public:
+  be_visitor_valuetype_field_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_field_ch (void);
+  // destructor
+
+  virtual int visit_field (be_field *node);
+  // visit the field node
+
+  // =visit operations on all possible data types that a valuetype
+  //  state member can be.
+
+  virtual int visit_array (be_array *node);
+  // visit array type
+
+  virtual int visit_enum (be_enum *node);
+  // visit enum type
+
+  virtual int visit_interface (be_interface *node);
+  // visit interface type
+
+  virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
+
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype type
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward type
+
+  virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
+
+  virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
+
+  virtual int visit_string (be_string *node);
+  // visit string type
+
+  virtual int visit_structure (be_structure *node);
+  // visit structure type
+
+  virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
+
+  virtual int visit_union (be_union *node);
+  // visit union type
+
+  void setenclosings (char *pre, char *post);
+  const char *pre_op ();
+  const char *post_op ();
+  // print additional material around the field (e.g. virtual before)
+
+private:
+  char *pre_op_;
+  char *post_op_;
+};
+
+#endif /* _BE_VISITOR_VALUETYPE_FIELD_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
new file mode 100644
index 00000000000..b976f21ea44
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
@@ -0,0 +1,99 @@
+/* -*- c++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cs.h
+//
+// = DESCRIPTION
+//     Visitor for the Valuetype class.
+//     This one generates code for accessor and modifier functions of
+//     valuetype state members (in the stub or inline file).
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_union_branch/public_ci.h
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_VALUETYPE_FIELD_CS_H_
+#define _BE_VISITOR_VALUETYPE_FIELD_CS_H_
+
+class be_visitor_valuetype_field_cs : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //    be_visitor_valuetype_field_cs
+  //
+  // = DESCRIPTION
+  //    This visitor is used to generate the accessors and modifiers
+  //    for the members of valuetype
+  //
+public:
+  be_visitor_valuetype_field_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_field_cs (void);
+  // destructor
+
+  virtual int visit_field (be_field *node);
+  // visit the field node
+
+  // =visit operations on all possible data types that a union_branch can be
+
+  virtual int visit_array (be_array *node);
+  // visit array type
+
+  virtual int visit_enum (be_enum *node);
+  // visit enum type
+
+  virtual int visit_interface (be_interface *node);
+  // visit interface type
+
+  virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
+
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype type
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward type
+
+  virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
+
+  virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
+
+  virtual int visit_string (be_string *node);
+  // visit string type
+
+  virtual int visit_structure (be_structure *node);
+  // visit structure type
+
+  virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
+
+  virtual int visit_union (be_union *node);
+  // visit union type
+
+  void setenclosings (char *pre);
+  const char *pre_op ();
+  // print additional string before op (e.g. ACE_INLINE)
+
+  void op_name (be_valuetype *node, TAO_OutStream *os);
+  // if (in_obv_space_) print OBV_name else print name
+
+  idl_bool in_obv_space_;
+private:
+  char *pre_op_;
+};
+
+#endif /* _BE_VISITOR_VALUETYPE_FIELD_CS_H_ */
+
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
new file mode 100644
index 00000000000..662529b8de8
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    marshal_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for marshalling.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_VALUETYPE_MARSHAL_CH_H_
+#define _BE_VISITOR_VALUETYPE_MARSHAL_CH_H_
+
+class be_visitor_valuetype_marshal_ch : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_marshal_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the CDR operator
+  //   declarations
+  //
+
+public:
+  be_visitor_valuetype_marshal_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_marshal_ch (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+};
+
+#endif /* _BE_VISITOR_VALUETYPE_MARSHAL_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
new file mode 100644
index 00000000000..8ec036d370f
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    marshal_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for marshalling.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_VALUETYPE_MARSHAL_CS_H_
+#define _BE_VISITOR_VALUETYPE_MARSHAL_CS_H_
+
+class be_visitor_valuetype_marshal_cs : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_marshal_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the CDR operator
+  //   declarations
+  //
+
+public:
+  be_visitor_valuetype_marshal_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_marshal_cs (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
+
+  void class_name (be_valuetype *node, TAO_OutStream *os);
+  int gen_fields (be_valuetype *node, be_visitor_context &ctx);
+};
+
+#endif /* _BE_VISITOR_VALUETYPE_MARSHAL_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h
new file mode 100644
index 00000000000..84e82d06cca
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h
@@ -0,0 +1,50 @@
+/* -*- c++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    module_obv.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This provides code generation for the module in the header
+//    for the OBV_ namespace
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_VALUETYPE_OBV_MODULE_H_
+#define _BE_VISITOR_VALUETYPE_OBV_MODULE_H_
+
+class be_visitor_obv_module : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_obv_module
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the header for module
+  //   OBV_ namespace
+  //
+public:
+  be_visitor_obv_module (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_obv_module (void);
+  // destructor
+
+  virtual int visit_module (be_module *node);
+
+  virtual int visit_valuetype (be_valuetype *node);
+
+};
+
+#endif /* _BE_VISITOR_VALUETYPE_OBV_MODULE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
new file mode 100644
index 00000000000..745e5e73e0f
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
@@ -0,0 +1,103 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides the generic visitor for valuetypes from which others
+//    will inherit.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on interface.h from Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VALUETYPE_VALUETYPE_H_
+#define _BE_VALUETYPE_VALUETYPE_H_
+
+
+class be_visitor_valuetype : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuetype that abstracts all common tasks
+  //
+
+public:
+  be_visitor_valuetype (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit the valuetype node
+
+  virtual int visit_valuetype_scope (be_valuetype *node);
+  // visit the scope of the valuetype node
+  // (in public/private field order)
+
+  virtual void begin_public ();
+  virtual void begin_private ();
+
+ // =visit methods on all elements syntactically valid in a Valuetype scope
+
+  virtual int visit_attribute (be_attribute *node);
+  // visit attribute
+
+  virtual int visit_constant (be_constant *node);
+  // visit a constant
+
+  virtual int visit_enum (be_enum *node);
+  // visit an enum
+
+  virtual int visit_operation (be_operation *node);
+  // visit operation
+
+  virtual int visit_exception (be_exception *node);
+  // visit exception (not used)
+
+  virtual int visit_structure (be_structure *node);
+  // visit a structure
+
+  virtual int visit_union (be_union *node);
+  // visit a union
+
+  virtual int visit_typedef (be_typedef *node);
+  // visit the typedef node
+
+  virtual int visit_field (be_field *node);
+  // visit a field
+
+  // =helper methods for generation of fields
+
+  //int gen_field_i (be_field *node, idl_bool make_inline);
+  // field accessor and modifier implemantation
+
+  int gen_pd (be_valuetype *node);
+  // private data fields for scope
+
+  int gen_field_pd (be_field *node);
+  // private data for field
+
+  virtual int gen_init_defn (be_valuetype *node);
+  // generate the _init class definition
+
+  virtual int gen_init_impl (be_valuetype *node);
+  // generate the _init implementation
+
+};
+
+#endif /*  _BE_VALUETYPE_VALUETYPE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
new file mode 100644
index 00000000000..527262a2721
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
@@ -0,0 +1,55 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetypes in the (client) header.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VALUETYPE_VALUETYPE_CH_H_
+#define _BE_VALUETYPE_VALUETYPE_CH_H_
+
+// we need derived valuetype visitors for the client and server header files. For
+// the others, they use the default valuetype visitor
+
+class be_visitor_valuetype_ch : public be_visitor_valuetype
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for valuetype
+  //
+  //
+public:
+  be_visitor_valuetype_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_ch (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+
+  virtual int visit_operation (be_operation *node);
+  virtual int visit_field (be_field *node);
+
+  void begin_public ();
+  void begin_private ();
+};
+
+#endif /* _BE_VALUETYPE_VALUETYPE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
new file mode 100644
index 00000000000..44e8445de09
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
@@ -0,0 +1,51 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetypes in the client inline.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VALUETYPE_VALUETYPE_CI_H_
+#define _BE_VALUETYPE_VALUETYPE_CI_H_
+
+class be_visitor_valuetype_ci : public be_visitor_valuetype
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client inline for valuetype
+  //
+  //
+public:
+  be_visitor_valuetype_ci (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_ci (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+  // set the right context and make a visitor
+
+  virtual int visit_field (be_field *node);
+private:
+  idl_bool opt_accessor_;
+};
+
+#endif /* _BE_VALUETYPE_VALUETYPE_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
new file mode 100644
index 00000000000..b05f5ddc9ab
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
@@ -0,0 +1,47 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetypes in the client stubs.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VALUETYPE_VALUETYPE_CS_H_
+#define _BE_VALUETYPE_VALUETYPE_CS_H_
+
+class be_visitor_valuetype_cs : public be_visitor_valuetype
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for valuetype
+  //
+  //
+public:
+  be_visitor_valuetype_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_cs (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+  // set the right context and make a visitor
+};
+
+#endif /* _BE_VALUETYPE_VALUETYPE_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
new file mode 100644
index 00000000000..10fc526dca8
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
@@ -0,0 +1,55 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetype OBV_ class
+//    in the (client) header.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VALUETYPE_VALUETYPE_OBV_CH_H_
+#define _BE_VALUETYPE_VALUETYPE_OBV_CH_H_
+
+// we need derived valuetype visitors for the client and server header files. For
+// the others, they use the default valuetype visitor
+
+class be_visitor_valuetype_obv_ch : public be_visitor_valuetype
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the header for valuetype
+  //   OBV_ class
+  //
+public:
+  be_visitor_valuetype_obv_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_obv_ch (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+
+  virtual int visit_field (be_field *node);
+
+  void begin_public ();
+  void begin_private ();
+};
+
+#endif /* _BE_VALUETYPE_VALUETYPE_OBV_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
new file mode 100644
index 00000000000..ba4f3b0d584
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
@@ -0,0 +1,52 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetype OBV_ class
+//    in the (client) header.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VALUETYPE_VALUETYPE_OBV_CI_H_
+#define _BE_VALUETYPE_VALUETYPE_OBV_CI_H_
+
+// we need derived valuetype visitors for the client and server header files. For
+// the others, they use the default valuetype visitor
+
+class be_visitor_valuetype_obv_ci : public be_visitor_valuetype
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation for valuetype
+  //   OBV_ class
+  //
+public:
+  be_visitor_valuetype_obv_ci (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_obv_ci (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+
+  virtual int visit_field (be_field *node);
+};
+
+#endif /* _BE_VALUETYPE_VALUETYPE_OBV_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
new file mode 100644
index 00000000000..fc7eba823b4
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
@@ -0,0 +1,50 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_obv_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes
+//    OBV_ class implementation
+//    (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    derived from interface_ch.cpp from Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VALUETYPE_VALUETYPE_OBV_CS_H_
+#define _BE_VALUETYPE_VALUETYPE_OBV_CS_H_
+
+class be_visitor_valuetype_obv_cs : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_obv_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation for valuetype
+  //   OBV_ class
+  //
+public:
+  be_visitor_valuetype_obv_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_obv_cs (void);
+  // destructor
+
+  virtual int visit_valuetype (be_valuetype *node);
+
+  virtual int visit_field (be_field *node);
+};
+
+#endif /* _BE_VALUETYPE_VALUETYPE_OBV_CS_H_ */
+
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd.h
new file mode 100644
index 00000000000..435a992ae9d
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd.h
@@ -0,0 +1,37 @@
+/* -*- C++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_valuetype_fwd.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuetype_fwd class
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale (be_visitor_interface_fwd.h)
+//
+// ============================================================================
+
+#ifndef TAO_BE_VISITOR_VALUETYPE_FWD_H
+#define TAO_BE_VISITOR_VALUETYPE_FWD_H
+
+#ifdef IDL_HAS_VALUETYPE
+
+#include "be_visitor.h"
+#include "be_visitor_scope.h"
+
+#include "be_visitor_valuetype_fwd/valuetype_fwd_ch.h"
+#include "be_visitor_valuetype_fwd/valuetype_fwd_ci.h"
+#include "be_visitor_valuetype_fwd/cdr_op_ci.h"
+
+#endif /* IDL_HAS_VALUETYPE */
+
+#endif /* TAO_BE_VISITOR_VALUETYPE_FWD_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ci.h
new file mode 100644
index 00000000000..756824a5e28
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ci.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuetype_fwd class
+//    This one provides code generation for the CDR operators
+//    (actually just their declarations) for the valuetype forward
+//    declaration in the client inline.
+//
+// = AUTHOR
+//    Torsten Kuepper
+//    based on code from Aniruddha Gokhale & Carlos O'Ryan
+//
+// ============================================================================
+
+#ifndef BE_VISITOR_INTERFACE_FWD_CDR_OP_CI_H
+#define BE_VISITOR_INTERFACE_FWD_CDR_OP_CI_H
+
+class be_visitor_valuetype_fwd_cdr_op_ci : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_fwd_cdr_op_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuetype that generates the CDR
+  //   operator forward declarations.
+  //
+
+public:
+  be_visitor_valuetype_fwd_cdr_op_ci (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_fwd_cdr_op_ci (void);
+  // destructor
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype
+
+};
+
+#endif /* BE_VISITOR_INTERFACE_FWD_CDR_OP_CI_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
new file mode 100644
index 00000000000..57103509505
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
@@ -0,0 +1,48 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_fwd_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface Forward node.
+//    This one provides code generation for valuetype forward node.
+//
+// = AUTHOR
+//    Torsten Kuepper
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_INTERFACE_FWD_CH_H_
+#define _BE_INTERFACE_INTERFACE_FWD_CH_H_
+
+class be_visitor_valuetype_fwd_ch : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_fwd_ch
+  //
+  // = DESCRIPTION
+  //   This is the visitor for valuetype_fwd for the header file
+  //
+  //
+public:
+  be_visitor_valuetype_fwd_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_fwd_ch (void);
+  // destructor
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype_fwd.
+
+};
+
+#endif /* _BE_INTERFACE_INTERFACE_FWD_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ci.h
new file mode 100644
index 00000000000..e32639d9a6b
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ci.h
@@ -0,0 +1,48 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_fwd_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface Forward node.
+//    This one provides code generation for valuetype forward node.
+//
+// = AUTHOR
+//    Torsten Kuepper
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_INTERFACE_FWD_CI_H_
+#define _BE_INTERFACE_INTERFACE_FWD_CI_H_
+
+class be_visitor_valuetype_fwd_ci : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //   be_visitor_valuetype_fwd_ci
+  //
+  // = DESCRIPTION
+  //   This is the visitor for valuetype_fwd for the inline file
+  //
+  //
+public:
+  be_visitor_valuetype_fwd_ci (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_valuetype_fwd_ci (void);
+  // destructor
+
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype_fwd
+
+};
+
+#endif /* _BE_INTERFACE_INTERFACE_FWD_CH_I_ */
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 394f6ebbc86..15d651de616 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -123,6 +123,9 @@ DRV_usage (void)
   cerr << GTDEVEL (" -Gi\t\t\tenable Interpretive marshaling (default)\n");
   cerr << GTDEVEL (" -Ge\t\t\tenable C++ Exception support (suppressed by default)\n");
   cerr << GTDEVEL (" -Gt\t\t\tenable optimized TypeCode support (unopt by default)\n");
+#ifdef IDL_HAS_VALUETYPE
+  cerr << GTDEVEL (" -Gv\t\t\tenable OBV (Valuetype) support (disabled by default)\n");
+#endif /* IDL_HAS_VALUETYPE */
   cerr << GTDEVEL (" -GI[h|s|b|e|c]\tGenerate Implemenation Files \n");
   cerr << GTDEVEL ("  \t\t\th - Implementation header file name ending. Default is I.h \n");
   cerr << GTDEVEL ("  \t\t\ts - Implementation skeleton file name ending. Default is I.cpp\n");
@@ -146,6 +149,9 @@ DRV_usage (void)
   cerr << GTDEVEL (" -sT\t\t\tServer's template skeleton file name ending. Default is S_T.cpp\n");
   cerr << GTDEVEL (" -Sa\t\t\tsuppress Any support (support enabled by default)\n");
   cerr << GTDEVEL (" -St\t\t\tsuppress TypeCode support (support enabled by default)\n");
+#ifdef IDL_HAS_VALUETYPE
+  cerr << GTDEVEL (" -Sv\t\t\tdisable OBV (Valuetype) support (disabled by default)\n");
+#endif /* IDL_HAS_VALUETYPE */
   cerr << GTDEVEL (" -t\t\t\tTemporary directory to be used by the IDL compiler."
                    "(default is value of environment variable ACE_DEFAULT_TEMP_DIR_ENV)\n");
   cerr << GTDEVEL (" -u\t\t\tprints usage message and exits\n");
@@ -530,9 +536,16 @@ DRV_parse_args (long ac, char **av)
                 }
               else if (av[i][2] == 't')
                 {
-                  // supress typecode support
+                  // suppress typecode support
                   idl_global->tc_support (0);
                 }
+              else if (av[i][2] == 'v')
+                {
+                  // disable OBV (Valuetype) support
+#                 ifdef IDL_HAS_VALUETYPE
+                  idl_global->obv_support (0);
+#                 endif
+                }
               else
                 {
                   cerr << GTDEVEL("IDL: missing argument after '")
@@ -564,8 +577,17 @@ DRV_parse_args (long ac, char **av)
                   // optimized typecode support
                   idl_global->opt_tc (1);
                 }
+              else if (av[i][2] == 'v')
+                {
+#             ifdef IDL_HAS_VALUETYPE
+                  // enable OBV (Valuetype) support
+                  idl_global->obv_support (1);
+#             else /* IDL_HAS_VALUETYPE */
+                  cerr << GTDEVEL("IDL: -Gv (Valuetype) not compiled in\n");
+                  ACE_OS::exit (99);
+#             endif /* IDL_HAS_VALUETYPE */
+                }
               else if (av[i][2] == 'I')
-
                 {
                   int options = ACE_OS::strlen(av[i]) - 3;
                   int j;
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index 6ede75fca0b..32b82f1731e 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -187,6 +187,17 @@ fe_populate(AST_Module *m)
                                          NULL);
   m->fe_add_predefined_type(pdt);
 
+# ifdef IDL_HAS_VALUETYPE
+  if (idl_global->obv_support ())
+    {
+      pdt = idl_global->gen()
+                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
+                                         create_scoped_name("ValueBase"),
+                                         NULL);
+      m->fe_add_predefined_type(pdt);
+    }
+# endif /* IDL_HAS_VALUETYPE */
+
   /*
    * Add these to make all keywords protected even in different spellings
    */
@@ -316,6 +327,52 @@ fe_populate(AST_Module *m)
                                          create_scoped_name("FALSE"),
                                          NULL);
   m->fe_add_predefined_type(pdt);
+
+# ifdef IDL_HAS_VALUETYPE
+  if (idl_global->obv_support ())
+    {
+      pdt = idl_global->gen()
+                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
+                                         create_scoped_name("abstract"),
+                                         NULL);
+      m->fe_add_predefined_type(pdt);
+      pdt = idl_global->gen()
+                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
+                                         create_scoped_name("custom"),
+                                         NULL);
+      m->fe_add_predefined_type(pdt);
+      pdt = idl_global->gen()
+                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
+                                         create_scoped_name("init"),
+                                         NULL);
+      m->fe_add_predefined_type(pdt);
+      pdt = idl_global->gen()
+                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
+                                         create_scoped_name("private"),
+                                         NULL);
+      m->fe_add_predefined_type(pdt);
+      pdt = idl_global->gen()
+                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
+                                         create_scoped_name("public"),
+                                         NULL);
+      m->fe_add_predefined_type(pdt);
+      pdt = idl_global->gen()
+                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
+                                         create_scoped_name("supports"),
+                                         NULL);
+      m->fe_add_predefined_type(pdt);
+      pdt = idl_global->gen()
+                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
+                                         create_scoped_name("truncatable"),
+                                         NULL);
+      m->fe_add_predefined_type(pdt);
+      pdt = idl_global->gen()
+                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
+                                         create_scoped_name("valuetype"),
+                                         NULL);
+      m->fe_add_predefined_type(pdt);
+    }
+# endif /* IDL_HAS_VALUETYPE */
 }
 
 /*
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index e1b70fb99aa..1922b537a6f 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.  
-2550 Garcia Avenue 
+SunSoft, Inc.
+2550 Garcia Avenue
 Mountain View, California  94043
 
 NOTE:
@@ -72,10 +72,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * AST_Interface node used to represent this interface is created.
  */
 
-#include	"idl.h"
-#include	"idl_extern.h"
+#include        "idl.h"
+#include        "idl_extern.h"
 
-#include	"fe_private.h"
+#include        "fe_private.h"
 
 ACE_RCSID(fe, fe_interface_header, "$Id$")
 
@@ -83,10 +83,13 @@ ACE_RCSID(fe, fe_interface_header, "$Id$")
  * Constructor(s) and destructor
  */
 
-FE_InterfaceHeader::FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *nl)
-		  : pd_interface_name(n)
+FE_InterfaceHeader::FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *nl,
+                                       UTL_NameList *supports,
+                                       idl_bool compile_now)
+                  : pd_interface_name(n)
 {
-  compile_inheritance(nl);
+  if (compile_now)
+    compile_inheritance (nl, supports);
 }
 
 /*
@@ -95,16 +98,16 @@ FE_InterfaceHeader::FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *nl)
 
 // Compute flattened, non-repeating list of inherited interfaces
 
-#undef	INCREMENT
-#define	INCREMENT	512
+#undef  INCREMENT
+#define INCREMENT       512
 
 /*
  * Private storage used to store interfaces seen already in the
  * computation of the unique, flattened inheritance list
  */
 static AST_Interface **iseen = NULL;
-static long	    iallocated = 0;
-static long	    iused = 0;
+static long         iallocated = 0;
+static long         iused = 0;
 
 /*
  * Add an interface to an inheritance spec
@@ -112,8 +115,8 @@ static long	    iused = 0;
 static void
 add_inheritance(AST_Interface *i)
 {
-  long			k;
-  AST_Interface	      **oiseen;
+  long                  k;
+  AST_Interface       **oiseen;
 
   /*
    * Make sure there's space for one more
@@ -127,7 +130,7 @@ add_inheritance(AST_Interface *i)
       iallocated += INCREMENT;
       iseen = new AST_Interface *[iallocated];
       for (k = 0; k < iused; k++)
-	iseen[k] = oiseen[k];
+        iseen[k] = oiseen[k];
       delete oiseen;
     }
   }
@@ -144,7 +147,7 @@ add_inheritance(AST_Interface *i)
 static long
 already_seen(AST_Interface *ip)
 {
-  long	i;
+  long  i;
 
   for (i = 0; i < iused; i++) {
     if (iseen[i] == ip)
@@ -179,71 +182,104 @@ FE_InterfaceHeader::compile_one_inheritance(AST_Interface *i)
  * Compute the list of top-level interfaces this one inherits from
  */
 void
-FE_InterfaceHeader::compile_inheritance(UTL_NameList *nl)
+FE_InterfaceHeader::compile_inheritance(UTL_NameList *ifaces,
+                                        UTL_NameList *supports)
 {
-  UTL_NamelistActiveIterator *l = new UTL_NamelistActiveIterator(nl);
-  AST_Decl		       *d;
-  AST_Interface		       *i;
-  long			        k;
+  UTL_NamelistActiveIterator   *l;
+  AST_Decl                     *d;
+  AST_Interface                *i;
+  long                          k;
+  UTL_NameList                 *nl;
+  int                           loops;
+  long                          ichecked = 0;
+  idl_bool                      inh_err = 0;
+  idl_bool                      in_supports = 0;
 
   iused = 0;
   /*
    * Compute expanded flattened non-repeating list of interfaces
    * which this one inherits from
    */
-  while (!(l->is_done())) {
-    /*
-     * Check that scope stack is valid
-     */
-    if (idl_global->scopes()->top() == NULL) {
-      idl_global->err()->lookup_error(l->item());
-      return;
+  nl = ifaces;
+  // loop twice if nl and supports are nonempty
+  for (loops = 0; loops < 2; ++loops) {
+    if (nl != NULL) {
+      l = new UTL_NamelistActiveIterator(nl);
+      while (!(l->is_done())) {
+        /*
+         * Check that scope stack is valid
+         */
+        if (idl_global->scopes()->top() == NULL) {
+          idl_global->err()->lookup_error(l->item());
+          return;
+        }
+        /*
+         * Look it up
+         */
+        d = idl_global->scopes()->top()->lookup_by_name(l->item(), I_TRUE);
+        /*
+         * Not found?
+         */
+        if (d == NULL) {
+          idl_global->err()->lookup_error(l->item());
+          return;
+        }
+        /*
+         * Not an appropriate interface?
+         */
+        while(d->node_type() == AST_Decl::NT_typedef)
+          d = AST_Typedef::narrow_from_decl(d)->base_type();
+        if (d->node_type() == AST_Decl::NT_interface)
+          i = AST_Interface::narrow_from_decl(d);
+        else
+          i = NULL;
+        if (i != NULL)
+          {
+            if (in_supports)
+              {
+                inh_err = ! this->check_supports (i);
+              }
+            else
+              {
+                if (ichecked == 0)
+                  inh_err = ! this->check_first (i);
+                else
+                  inh_err = ! this->check_further (i);
+              }
+          }
+        else
+          {
+            inh_err = 1;
+          }
+        if (inh_err)
+          {
+            idl_global->err()->inheritance_error(pd_interface_name, d);
+            return;  //%! really ? inh_err=0; and test the remaining...?
+          }
+        /*
+         * Forward declared interface?
+         */
+        if (!i->is_defined()) {
+          idl_global->err()->inheritance_fwd_error(pd_interface_name, i);
+          return;
+        }
+        /*
+         * OK, see if we have to add this to the list of interfaces
+         * inherited from
+         */
+        compile_one_inheritance(i);
+
+        /*
+         * Next element in header list
+         */
+        ++ ichecked;
+        l->next();
+      }
+      delete l;
     }
-    /*
-     * Look it up
-     */
-    d = idl_global->scopes()->top()->lookup_by_name(l->item(), I_TRUE);
-    /*
-     * Not found?
-     */
-    if (d == NULL) {
-      idl_global->err()->lookup_error(l->item());
-      return;
-    }
-    /*
-     * Not an interface?
-     */
-    while(d->node_type() == AST_Decl::NT_typedef) 
-      d = AST_Typedef::narrow_from_decl(d)->base_type();
-    if (d->node_type() != AST_Decl::NT_interface) {
-      idl_global->err()->inheritance_error(pd_interface_name, d);
-      return;
-    }
-    /*
-     * OK, cast to an interface
-     */
-    i = AST_Interface::narrow_from_decl(d);
-    if (i == NULL)
-       idl_global->err()->inheritance_error(pd_interface_name, d);
-    /*
-     * Forward declared interface?
-     */
-    if (!i->is_defined()) {
-      idl_global->err()->inheritance_fwd_error(pd_interface_name, i);
-      return;
-    }
-    /*
-     * OK, see if we have to add this to the list of interfaces
-     * inherited from
-     */
-    compile_one_inheritance(i);
-
-    /*
-     * Next element in header list
-     */
-    l->next();
+    in_supports = 1;
+    nl = supports;
   }
-  delete l;
   /*
    * OK, install in interface header
    */
@@ -253,6 +289,35 @@ FE_InterfaceHeader::compile_inheritance(UTL_NameList *nl)
   pd_n_inherits = iused;
 }
 
+// check_ methods called from compile_inheritance()
+// overridden in derived classes
+idl_bool
+FE_InterfaceHeader::check_first (AST_Interface *i)
+{
+  // nothing special for the first
+  return this->check_further (i);
+}
+
+idl_bool
+FE_InterfaceHeader::check_further (AST_Interface *i)
+{
+  if (i && ! i->is_valuetype())
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+idl_bool
+FE_InterfaceHeader::check_supports (AST_Interface *i)
+{
+  return 0;
+}
+
+
 /*
  * Public operations
  */
@@ -282,3 +347,67 @@ FE_InterfaceHeader::n_inherits()
 {
   return pd_n_inherits;
 }
+
+
+// #ifdef IDL_HAS_VALUETYPE
+
+// FE_obv_header
+
+FE_obv_header::FE_obv_header (UTL_ScopedName *n, UTL_NameList *nl, UTL_NameList *supports)
+                  : FE_InterfaceHeader (n, nl, supports,0),
+                    truncatable_ (0),
+                    n_concrete_ (0)
+{
+  compile_inheritance (nl, supports);
+}
+
+// check_ methods called from compile_inheritance()
+idl_bool
+FE_obv_header::check_first (AST_Interface *i)
+{
+  if (i && i->is_valuetype())
+    {
+      if (! i->is_abstract_valuetype())
+        ++ n_concrete_;
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+idl_bool
+FE_obv_header::check_further (AST_Interface *i)
+{
+  if (i && i->is_valuetype() && i->is_abstract_valuetype())
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+idl_bool
+FE_obv_header::check_supports (AST_Interface *i)
+{
+  if (i && ! i->is_valuetype())
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+
+long
+FE_obv_header::n_concrete ()
+{
+  return n_concrete_;
+}
+
+// #endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 2b976240b61..f6c597e405d 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -1,6 +1,6 @@
 
 %{
-/*
+/*  $Id$
 
 COPYRIGHT
 
@@ -93,6 +93,19 @@ inline char *__yytext()
 #else
 #define ace_yytext yytext
 #endif /* 0 */
+
+static int scan_obv_token (int token)
+{
+#ifdef IDL_HAS_VALUETYPE
+    if (idl_global->obv_support ())
+      {
+        return token;
+      }
+#endif /* IDL_HAS_VALUETYPE */
+    yylval.strval = ACE_OS::strdup (ace_yytext);
+    return IDENTIFIER;
+}
+
 %}
 
 /* SO we don't choke on files that use \r\n */
@@ -133,6 +146,14 @@ boolean		return IDL_BOOLEAN;
 octet		return IDL_OCTET;
 void		return IDL_VOID;
 native          return IDL_NATIVE;
+abstract        return scan_obv_token (IDL_ABSTRACT);
+custom          return scan_obv_token (IDL_CUSTOM);
+init            return scan_obv_token (IDL_INIT);
+private         return scan_obv_token (IDL_PRIVATE);
+public          return scan_obv_token (IDL_PUBLIC);
+supports        return scan_obv_token (IDL_SUPPORTS);
+truncatable     return scan_obv_token (IDL_TRUNCATABLE);
+valuetype       return scan_obv_token (IDL_VALUETYPE);
 
 TRUE		return IDL_TRUETOK;
 FALSE		return IDL_FALSETOK;
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index 45d2762f2b8..94bddc33d33 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -1,4 +1,4 @@
-
+/* $Id$ */
 
 /*
 
@@ -102,9 +102,11 @@ extern int yyleng;
   UTL_LabelList		*llval;		/* Label list		*/
   UTL_DeclList		*dlval;		/* Declaration list	*/
   FE_InterfaceHeader	*ihval;		/* Interface header	*/
+  FE_obv_header         *vhval;         /* Valuetype header     */
   AST_Expression	*exval;		/* Expression value	*/
   AST_UnionLabel	*ulval;		/* Union label		*/
   AST_Field		*ffval;		/* Field value		*/
+  AST_Field::Visibility  vival;         /* N/A, pub or priv     */
   AST_Expression::ExprType etval;	/* Expression type	*/
   AST_Argument::Direction dival;	/* Argument direction	*/
   AST_Operation::Flags	ofval;		/* Operation flags	*/
@@ -162,6 +164,15 @@ extern int yyleng;
 %token		IDL_RAISES
 %token		IDL_CONTEXT
 %token          IDL_NATIVE
+                 /* OBV tokens  see OMG ptc/98-10-04 3.2.4 */
+%token          IDL_ABSTRACT
+%token          IDL_CUSTOM
+%token          IDL_INIT
+%token          IDL_PRIVATE
+%token          IDL_PUBLIC
+%token          IDL_SUPPORTS
+%token          IDL_TRUNCATABLE
+%token          IDL_VALUETYPE
 
 %token <ival>	IDL_INTEGER_LITERAL
 %token <sval>	IDL_STRING_LITERAL
@@ -189,7 +200,7 @@ extern int yyleng;
 %type <slval>	string_literals
 
 %type <nlval>	at_least_one_scoped_name scoped_names inheritance_spec
-%type <nlval>	opt_raises
+%type <nlval>	opt_raises supports_spec 
 
 %type <elval>	at_least_one_array_dim array_dims
 
@@ -200,6 +211,8 @@ extern int yyleng;
 
 %type <ihval>	interface_header
 
+%type <vhval>   value_header
+
 %type <exval>	expression const_expr or_expr xor_expr and_expr shift_expr
 %type <exval>	add_expr mult_expr unary_expr primary_expr literal
 %type <exval>	positive_int_expr array_dim
@@ -218,9 +231,9 @@ extern int yyleng;
 
 %type <deval>	declarator simple_declarator complex_declarator
 
-%type <bval>	opt_readonly
+%type <bval>	opt_readonly, opt_truncatable
 
-%type <idval>	interface_decl id
+%type <idval>	interface_decl value_decl id
 
 %type <ival> type_dcl
 %%
@@ -276,6 +289,14 @@ definition
 	{
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         }
+	| value_def
+	{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeDeclSeen);
+        }
+	  ';'
+	{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        }
 	| error
 	{
 	  idl_global->err()->syntax_error(idl_global->parse_state());
@@ -348,9 +369,6 @@ interface :
 	  AST_Interface *i = NULL;
 	  AST_Decl	*v = NULL;
 	  UTL_StrList   *p = idl_global->pragmas();
-	  AST_Decl	*d = NULL;
-	  AST_Interface *fd = NULL;
-
 	  ACE_UNUSED_ARG (v);
 
 	  /*
@@ -361,61 +379,7 @@ interface :
 						    $1->inherits(),
 						    $1->n_inherits(),
 						    p);
-	    if (i != NULL &&
-		(d = s->lookup_by_name(i->name(), I_FALSE)) != NULL) {
-	      /*
-	       * See if we're defining a forward declared interface.
-	       */
-	      if (d->node_type() == AST_Decl::NT_interface) {
-		/*
-		 * Narrow to an interface
-		 */
-		fd = AST_Interface::narrow_from_decl(d);
-		/*
-		 * Successful?
-		 */
-		if (fd == NULL) {
-		  /*
-		   * Should we give an error here?
-		   */
-		}
-		/*
-		 * If it is a forward declared interface..
-		 */
-		else if (!fd->is_defined()) {
-		  /*
-		   * Check if redefining in same scope
-		   */
-		  if (fd->defined_in() != s) {
-		    idl_global->err()
-		       ->error3(UTL_Error::EIDL_SCOPE_CONFLICT,
-				i,
-				fd,
-				ScopeAsDecl(s));
-		  }
-		  /*
-		   * All OK, do the redefinition
-		   */
-		  else {
-		    fd->set_inherits($1->inherits());
-		    fd->set_n_inherits($1->n_inherits());
-		    /*
-		     * Update place of definition
-		     */
-		    fd->set_imported(idl_global->imported());
-		    fd->set_in_main_file(idl_global->in_main_file());
-		    fd->set_line(idl_global->lineno());
-		    fd->set_file_name(idl_global->filename());
-		    fd->add_pragmas(p);
-		    /*
-		     * Use full definition node
-		     */
-		    delete i;
-		    i = fd;
-		  }
-	        }
-	      }
-	    }
+            AST_Interface::fwd_redefinition_helper (i,s,p);
 	    /*
 	     * Add the interface to its definition scope
 	     */
@@ -491,6 +455,250 @@ inheritance_spec
 	}
 	;
 
+value_def
+        : valuetype
+        | value_abs_decl
+        | value_forward_decl
+        | value_box_decl
+	;
+
+valuetype
+        : IDL_CUSTOM value_concrete_decl
+        {
+           cerr << "error in " << idl_global->filename()->get_string()
+		<< " line " << idl_global->lineno() << ":\n" ;
+           cerr << "Sorry, I (TAO_IDL) can't handle custom yet\n";
+            /* set custom (if not truncatable) */
+        }
+        | value_concrete_decl
+        ;
+
+value_concrete_decl :
+        value_header
+	{
+	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
+	  AST_Interface *i = NULL;
+	  UTL_StrList   *p = idl_global->pragmas();
+
+	  if (s != NULL && $1 != NULL) {
+	    i = idl_global->gen()->create_valuetype($1->interface_name(),
+						    $1->inherits(),
+						    $1->n_inherits(),
+						    p);
+            AST_Interface::fwd_redefinition_helper (i,s,p);
+	    /*
+	     * Add the valuetype to its definition scope
+	     */
+	    (void) s->fe_add_interface(i);
+	  }
+	  /*
+	   * Push it on the scope stack
+	   */
+	  idl_global->scopes()->push(i);
+        }
+	'{'
+	{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
+	}
+	value_elements
+	{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
+	}
+	'}'
+        {
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
+	  /*
+	   * Done with this interface - pop it off the scopes stack
+	   */
+	  UTL_Scope* s = idl_global->scopes()->top();
+	  AST_Interface* m = AST_Interface::narrow_from_scope (s);
+	  UTL_StrList *p = m->pragmas ();
+	  if (p != 0) p = (UTL_StrList*)p->copy ();
+	  idl_global->set_pragmas (p);
+	  idl_global->scopes()->pop();
+        }
+        ;
+
+value_abs_decl :
+        IDL_ABSTRACT
+        value_header
+	{
+	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
+	  AST_Interface *i = NULL;
+	  UTL_StrList   *p = idl_global->pragmas();
+
+	  if (s != NULL && $2 != NULL) {
+
+            if ($2->n_concrete() > 0) {
+              idl_global->err()->abstract_inheritance_error ($2->interface_name ());
+            }
+
+	    i = idl_global->gen()->create_valuetype($2->interface_name(),
+						    $2->inherits(),
+						    $2->n_inherits(),
+						    p);
+            i->set_abstract_valuetype ();
+            AST_Interface::fwd_redefinition_helper (i,s,p);
+	    /*
+	     * Add the valuetype to its definition scope
+	     */
+	    (void) s->fe_add_interface(i);
+	  }
+	  /*
+	   * Push it on the scope stack
+	   */
+	  idl_global->scopes()->push(i);
+        }
+	'{'
+	{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
+	}
+	exports
+	{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
+	}
+	'}'
+        {
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
+	  /*
+	   * Done with this interface - pop it off the scopes stack
+	   */
+	  UTL_Scope* s = idl_global->scopes()->top();
+	  AST_Interface* m = AST_Interface::narrow_from_scope (s);
+	  UTL_StrList *p = m->pragmas ();
+	  if (p != 0) p = (UTL_StrList*)p->copy ();
+	  idl_global->set_pragmas (p);
+	  idl_global->scopes()->pop();
+        }
+
+        ;
+
+value_header : 
+        value_decl 
+        opt_truncatable
+        inheritance_spec
+        supports_spec
+        {
+          $$ = new FE_obv_header (new UTL_ScopedName ($1, NULL), $3, $4);
+        }
+        ;
+
+value_decl
+        : IDL_VALUETYPE
+        {
+	   idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeSeen);
+        }
+        id
+        {
+           idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeIDSeen);
+	   $$ = $3;
+        }
+        ;
+
+opt_truncatable :
+          IDL_TRUNCATABLE 
+ 	  {
+            cerr << "warning in " << idl_global->filename()->get_string()
+	         << " line " << idl_global->lineno() << ":\n" ;
+            cerr << "truncatable modifier not supported and is ignored\n";
+	    $$ = I_FALSE;
+	    /* $$ = I_TRUE; */
+	  }
+	| /* EMPTY */
+	  {
+	    $$ = I_FALSE;
+	  }
+	;
+
+supports_spec :
+            IDL_SUPPORTS 
+            scoped_name 
+            { 
+              $$ = new UTL_NameList($2, NULL); 
+            }
+        |   /* empty */     
+            { 
+              $$ = NULL; 
+            }
+        ;
+
+value_forward_decl :
+        IDL_ABSTRACT
+        value_decl
+        {
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_ScopedName	*n = new UTL_ScopedName($2, NULL);
+	  AST_InterfaceFwd	*f = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
+	  /*
+	   * Create a node representing a forward declaration of an
+	   * valuetype. Store it in the enclosing scope
+	   */
+	  if (s != NULL) {
+	    f = idl_global->gen()->create_valuetype_fwd(n, p);
+         //   if ($1)
+            f->set_abstract_valuetype ();
+	    (void) s->fe_add_interface_fwd(f);
+	  }
+	}
+      |
+        value_decl
+        {
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_ScopedName	*n = new UTL_ScopedName($1, NULL);
+	  AST_InterfaceFwd	*f = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
+	  /*
+	   * Create a node representing a forward declaration of an
+	   * valuetype. Store it in the enclosing scope
+	   */
+	  if (s != NULL) {
+	    f = idl_global->gen()->create_valuetype_fwd(n, p);
+	    (void) s->fe_add_interface_fwd(f);
+	  }
+	}
+	;
+
+      
+value_box_decl
+        : value_decl type_spec /* in this order %!?*/
+        {
+           cerr << "error in " << idl_global->filename()->get_string()
+		<< " line " << idl_global->lineno() << ":\n" ;
+           cerr << "Sorry, I (TAO_IDL) can't handle boxes yet\n";
+        }
+        ;
+
+value_elements
+        : value_elements value_element
+        | /* EMPTY */
+        ;
+
+value_element
+        : state_member
+        | export
+        | init_decl
+        ;
+
+state_member
+        : IDL_PUBLIC
+          {
+            /* is $0 to member_i */
+            $<vival>$ = AST_Field::vis_PUBLIC;
+          }
+          member_i
+        | IDL_PRIVATE
+          {
+            /* is $0 to member_i */
+            $<vival>$ = AST_Field::vis_PRIVATE;
+          }
+          member_i
+        ; 
+
 exports
 	: exports export
 	| /* EMPTY */
@@ -1219,7 +1427,15 @@ members
 	| /* EMPTY */
 	;
 
-member	:
+member  : 
+        { 
+          /* is $0 to member_i */
+          $<vival>$ = AST_Field::vis_NA;
+        }
+        member_i
+        ;
+
+member_i:
 	type_spec
 	{
 	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
@@ -1255,7 +1471,8 @@ member	:
  	      AST_Type *tp = d->compose($1);
 	      if (tp == NULL)
 		continue;
-	      f = idl_global->gen()->create_field(tp, d->name(), p);
+              /* $0 denotes Visibility, must be on yacc reduction stack */
+	      f = idl_global->gen()->create_field(tp, d->name(), p, $<vival>0);
 	      (void) s->fe_add_field(f);
 	    }
 	    delete l;
@@ -2124,6 +2341,16 @@ op_type_spec
 	}
 	;
 
+init_decl
+        : IDL_INIT
+        {
+           cerr << "error in " << idl_global->filename()->get_string()
+		<< " line " << idl_global->lineno() << ":\n" ;
+           cerr << "Sorry, I (TAO_IDL) can't handle init yet\n";
+        }
+        ;
+
+
 parameter_list
 	: '('
 	{
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index ff87610fa03..868409f6c93 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -28,15 +28,15 @@
 /* The "const" storage-class-modifier is valid. */
 #define TAO_YY_USE_CONST
 
-#else	/* ! __cplusplus */
+#else   /* ! __cplusplus */
 
 #if __STDC__
 
 #define TAO_YY_USE_PROTOS
 #define TAO_YY_USE_CONST
 
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
+#endif  /* __STDC__ */
+#endif  /* ! __cplusplus */
 
 #ifdef __TURBOC__
  #pragma warn -rch
@@ -105,10 +105,10 @@ extern FILE *tao_yyin, *tao_yyout;
  * int a single C statement (which needs a semi-colon terminator).  This
  * avoids problems with code like:
  *
- * 	if ( condition_holds )
- *		tao_yyless( 5 );
- *	else
- *		do_something_else();
+ *      if ( condition_holds )
+ *              tao_yyless( 5 );
+ *      else
+ *              do_something_else();
  *
  * Prior to using the do-while the compiler would get upset at the
  * "else" because it interpreted the "if" statement as being all
@@ -118,15 +118,15 @@ extern FILE *tao_yyin, *tao_yyout;
 /* Return all but the first 'n' matched characters back to the input stream. */
 
 #define tao_yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up tao_yytext. */ \
-		*tao_yy_cp = tao_yy_hold_char; \
-		TAO_YY_RESTORE_TAO_YY_MORE_OFFSET \
-		tao_yy_c_buf_p = tao_yy_cp = tao_yy_bp + n - TAO_YY_MORE_ADJ; \
-		TAO_YY_DO_BEFORE_ACTION; /* set up tao_yytext again */ \
-		} \
-	while ( 0 )
+        do \
+                { \
+                /* Undo effects of setting up tao_yytext. */ \
+                *tao_yy_cp = tao_yy_hold_char; \
+                TAO_YY_RESTORE_TAO_YY_MORE_OFFSET \
+                tao_yy_c_buf_p = tao_yy_cp = tao_yy_bp + n - TAO_YY_MORE_ADJ; \
+                TAO_YY_DO_BEFORE_ACTION; /* set up tao_yytext again */ \
+                } \
+        while ( 0 )
 
 #define unput(c) tao_yyunput( c, tao_yytext_ptr )
 
@@ -138,61 +138,61 @@ typedef unsigned int tao_yy_size_t;
 
 
 struct tao_yy_buffer_state
-	{
-	FILE *tao_yy_input_file;
-
-	char *tao_yy_ch_buf;		/* input buffer */
-	char *tao_yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	tao_yy_size_t tao_yy_buf_size;
-
-	/* Number of characters read into tao_yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int tao_yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int tao_yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int tao_yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int tao_yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int tao_yy_fill_buffer;
-
-	int tao_yy_buffer_status;
+        {
+        FILE *tao_yy_input_file;
+
+        char *tao_yy_ch_buf;            /* input buffer */
+        char *tao_yy_buf_pos;           /* current position in input buffer */
+
+        /* Size of input buffer in bytes, not including room for EOB
+         * characters.
+         */
+        tao_yy_size_t tao_yy_buf_size;
+
+        /* Number of characters read into tao_yy_ch_buf, not including EOB
+         * characters.
+         */
+        int tao_yy_n_chars;
+
+        /* Whether we "own" the buffer - i.e., we know we created it,
+         * and can realloc() it to grow it, and should free() it to
+         * delete it.
+         */
+        int tao_yy_is_our_buffer;
+
+        /* Whether this is an "interactive" input source; if so, and
+         * if we're using stdio for input, then we want to use getc()
+         * instead of fread(), to make sure we stop fetching input after
+         * each newline.
+         */
+        int tao_yy_is_interactive;
+
+        /* Whether we're considered to be at the beginning of a line.
+         * If so, '^' rules will be active on the next match, otherwise
+         * not.
+         */
+        int tao_yy_at_bol;
+
+        /* Whether to try to fill the input buffer when we reach the
+         * end of it.
+         */
+        int tao_yy_fill_buffer;
+
+        int tao_yy_buffer_status;
 #define TAO_YY_BUFFER_NEW 0
 #define TAO_YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as TAO_YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via tao_yyrestart()), so that the user can continue scanning by
-	 * just pointing tao_yyin at a new input file.
-	 */
+        /* When an EOF's been seen but there's still some text to process
+         * then we mark the buffer as TAO_YY_EOF_PENDING, to indicate that we
+         * shouldn't try reading from the input source any more.  We might
+         * still have a bunch of tokens to match, though, because of
+         * possible backing-up.
+         *
+         * When we actually see the EOF, we change the status to "new"
+         * (via tao_yyrestart()), so that the user can continue scanning by
+         * just pointing tao_yyin at a new input file.
+         */
 #define TAO_YY_BUFFER_EOF_PENDING 2
-	};
+        };
 
 static TAO_YY_BUFFER_STATE tao_yy_current_buffer = 0;
 
@@ -206,15 +206,15 @@ static TAO_YY_BUFFER_STATE tao_yy_current_buffer = 0;
 /* tao_yy_hold_char holds the character lost when tao_yytext is formed. */
 static char tao_yy_hold_char;
 
-static int tao_yy_n_chars;		/* number of characters read into tao_yy_ch_buf */
+static int tao_yy_n_chars;              /* number of characters read into tao_yy_ch_buf */
 
 
 int tao_yyleng;
 
 /* Points to current character in buffer. */
 static char *tao_yy_c_buf_p = (char *) 0;
-static int tao_yy_init = 1;		/* whether we need to initialize */
-static int tao_yy_start = 0;	/* start state number */
+static int tao_yy_init = 1;             /* whether we need to initialize */
+static int tao_yy_start = 0;    /* start state number */
 
 /* Flag which is used to allow tao_yywrap()'s to do buffer switches
  * instead of setting up a fresh tao_yyin.  A bit of a hack ...
@@ -242,18 +242,18 @@ static void tao_yy_flex_free TAO_YY_PROTO(( void * ));
 #define tao_yy_new_buffer tao_yy_create_buffer
 
 #define tao_yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! tao_yy_current_buffer ) \
-		tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE ); \
-	tao_yy_current_buffer->tao_yy_is_interactive = is_interactive; \
-	}
+        { \
+        if ( ! tao_yy_current_buffer ) \
+                tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE ); \
+        tao_yy_current_buffer->tao_yy_is_interactive = is_interactive; \
+        }
 
 #define tao_yy_set_bol(at_bol) \
-	{ \
-	if ( ! tao_yy_current_buffer ) \
-		tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE ); \
-	tao_yy_current_buffer->tao_yy_at_bol = at_bol; \
-	}
+        { \
+        if ( ! tao_yy_current_buffer ) \
+                tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE ); \
+        tao_yy_current_buffer->tao_yy_at_bol = at_bol; \
+        }
 
 #define TAO_YY_AT_BOL() (tao_yy_current_buffer->tao_yy_at_bol)
 
@@ -272,50 +272,56 @@ static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] ));
  * corresponding action - sets up tao_yytext.
  */
 #define TAO_YY_DO_BEFORE_ACTION \
-	tao_yytext_ptr = tao_yy_bp; \
-	tao_yyleng = (int) (tao_yy_cp - tao_yy_bp); \
-	tao_yy_hold_char = *tao_yy_cp; \
-	*tao_yy_cp = '\0'; \
-	if ( tao_yyleng >= TAO_YYLMAX ) \
-		TAO_YY_FATAL_ERROR( "token too large, exceeds TAO_YYLMAX" ); \
-	tao_yy_flex_strncpy( tao_yytext, tao_yytext_ptr, tao_yyleng + 1 ); \
-	tao_yy_c_buf_p = tao_yy_cp;
-
-#define TAO_YY_NUM_RULES 62
-#define TAO_YY_END_OF_BUFFER 63
-static tao_yyconst short int tao_yy_accept[288] =
+        tao_yytext_ptr = tao_yy_bp; \
+        tao_yyleng = (int) (tao_yy_cp - tao_yy_bp); \
+        tao_yy_hold_char = *tao_yy_cp; \
+        *tao_yy_cp = '\0'; \
+        if ( tao_yyleng >= TAO_YYLMAX ) \
+                TAO_YY_FATAL_ERROR( "token too large, exceeds TAO_YYLMAX" ); \
+        tao_yy_flex_strncpy( tao_yytext, tao_yytext_ptr, tao_yyleng + 1 ); \
+        tao_yy_c_buf_p = tao_yy_cp;
+
+#define TAO_YY_NUM_RULES 70
+#define TAO_YY_END_OF_BUFFER 71
+static tao_yyconst short int tao_yy_accept[339] =
     {   0,
-       59,   59,   63,   61,   59,   60,   60,   61,   61,   61,
-       61,   45,   43,   61,   61,   61,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   61,   59,    0,   46,
-        0,    0,   45,   43,   58,    0,   41,   45,    0,    0,
-        0,   43,   39,   37,   38,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   34,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,    0,   55,    0,
-        0,    0,    0,    0,   47,    0,   47,    0,    0,    0,
-
-       57,   57,   41,    0,   41,    0,   42,   44,   40,   40,
-        1,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   35,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,    0,    0,    0,    0,    0,   50,   48,    0,    0,
-        0,   41,   42,   40,   31,   40,   40,   18,   25,   40,
-       40,   40,   40,   12,   40,   40,   40,   40,   22,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   29,   40,   40,    0,    0,    0,    0,
-        0,   48,    0,   49,    0,   32,   40,   40,    9,   40,
-
-       40,   40,   40,   20,   33,   40,   40,   40,   28,   40,
-       40,   40,   40,   23,   40,   40,   40,   40,   16,   40,
-       26,   40,   53,    0,    0,    0,    0,   40,   40,   40,
-       40,   21,   40,   40,    2,   30,   36,    3,   40,   40,
-       13,   11,   17,   40,   40,   40,   52,    0,    0,    0,
-        0,    0,    0,   40,   27,    7,   19,   40,   40,   40,
-       40,   10,   40,   14,    0,   56,   56,    0,    0,    0,
-       40,   40,   40,    4,   15,   24,    0,    0,    0,    5,
-        6,    8,   54,    0,   51,   51,    0
+       67,   67,   71,   69,   67,   68,   68,   69,   69,   69,
+       69,   53,   51,   69,   69,   69,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,   69,   67,    0,
+       54,    0,    0,   53,   51,   66,    0,   49,   53,    0,
+        0,    0,   51,   47,   45,   46,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,   42,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,    0,   63,    0,    0,    0,
+
+        0,    0,   55,    0,   55,    0,    0,    0,   65,   65,
+       49,    0,   49,    0,   50,   52,   48,   48,   48,    1,
+       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,   48,   48,   43,
+       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,    0,    0,    0,
+        0,    0,   58,   56,    0,    0,    0,   49,   50,   48,
+       39,   48,   48,   48,   18,   25,   48,   48,   48,   48,
+       48,   12,   48,   48,   33,   48,   48,   22,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+
+       48,   48,   48,   48,   48,   48,   48,   29,   48,   48,
+        0,    0,    0,    0,    0,   56,    0,   57,    0,   40,
+       48,   48,   48,    9,   48,   48,   48,   48,   48,   20,
+       41,   48,   48,   48,   28,   48,   48,   48,   48,   48,
+       48,   23,   48,   48,   48,   48,   48,   48,   16,   48,
+       48,   26,   48,   61,    0,    0,    0,    0,   48,   48,
+       48,   48,   32,   48,   21,   48,   48,    2,   30,   44,
+       48,   35,    3,   48,   48,   13,   11,   48,   17,   48,
+       48,   48,   48,   48,   60,    0,    0,    0,    0,    0,
+        0,   48,   48,   27,    7,   19,   48,   48,   34,   48,
+
+       48,   48,   48,   10,   48,   48,   14,    0,   64,   64,
+        0,    0,    0,   31,   48,   48,   48,    4,   15,   36,
+       48,   24,   48,    0,    0,    0,    5,    6,    8,   48,
+       38,   62,    0,   59,   59,   48,   37,    0
     } ;
 
 static tao_yyconst int tao_yy_ec[256] =
@@ -360,204 +366,224 @@ static tao_yyconst int tao_yy_meta[56] =
         5,    5,    5,    5,    5
     } ;
 
-static tao_yyconst short int tao_yy_base[300] =
+static tao_yyconst short int tao_yy_base[351] =
     {   0,
-        0,  468,  474,  476,   54,  476,  476,  467,  441,   46,
-       54,   54,   59,  454,  452,  450,    0,  448,  441,   14,
-      421,   32,   41,   35,  423,  420,  418,  417,  428,   48,
-       57,   45,  405,  415,  413,   52,  107,   95,  451,  476,
-      448,  105,  102,  114,  476,   99,  146,  128,  158,  171,
-        0,  177,  476,  476,  476,    0,  430,  425,  398,  402,
-      406,  401,  416,  404,  409,  395,  394,  409,  398,   43,
-      398,  405,  390,  389,  401,  387,  395,  402,  387,  388,
-      384,  390,  384,   66,  388,  388,  377,  384,  476,   99,
-      193,  389,  383,  375,  476,  414,  413,  119,  412,  134,
-
-      476,  142,    0,  190,  476,  161,  196,    0,  392,  396,
-        0,  369,  374,  378,  366,  105,  380,  378,  368,  373,
-      376,  357,  370,  367,  354,  363,  366,  349,    0,  352,
-      364,  348,  350,  106,  347,  359,  350,  353,  357,  359,
-      343,  384,  383,  351,  343,  353,  476,  476,  208,  377,
-      210,  214,  476,  362,    0,  342,  345,    0,    0,  331,
-      343,  328,  336,    0,  331,  326,  325,  326,    0,  331,
-      320,  321,  337,  332,  323,  330,  316,  321,  329,  328,
-      326,  317,  321,    0,  311,  317,  351,  228,  312,  318,
-      315,  476,  345,  476,  344,    0,  317,  317,    0,  295,
-
-      306,  310,  296,    0,    0,  307,  307,  306,    0,  287,
-      292,  296,  295,    0,  299,  287,  296,  298,    0,  290,
-        0,  289,  476,  232,  282,  239,  288,  247,  247,  228,
-      224,    0,  231,  236,    0,    0,    0,    0,  226,  224,
-        0,    0,    0,  213,  208,  201,  476,  246,  160,  261,
-      265,  268,  194,  170,    0,    0,    0,  172,  178,  139,
-      153,    0,  122,    0,  163,  476,  175,  146,  125,  213,
-       88,   62,   67,    0,    0,    0,   74,  199,  239,    0,
-        0,    0,  476,  254,  476,  261,  476,  284,  289,  291,
-      296,  301,   53,  304,  308,  311,  315,  320,  325
-
+        0,  518,  524,  526,   54,  526,  526,  517,  491,   46,
+       54,   54,   59,  504,  502,  500,    0,  498,  491,   38,
+      471,   47,   20,   35,  473,  470,  468,  467,  478,   42,
+       46,   62,   63,   30,  466,   57,   66,  115,  102,  503,
+      526,  500,   97,  110,  121,  526,  106,  151,  138,  165,
+      180,    0,  170,  526,  526,  526,    0,  482,  477,  456,
+      449,  453,  457,  452,  467,  455,  449,  459,  445,  444,
+      459,  448,  118,  448,  455,  440,  439,  451,  437,  445,
+      451,  443,  450,  435,  436,  432,  433,  437,  426,  430,
+       93,  433,  433,  433,  422,  429,  526,  156,  196,  434,
+
+      428,  420,  526,  459,  458,  130,  457,  145,  526,  166,
+        0,  203,  526,  189,  206,    0,  437,  441,  412,    0,
+      413,  418,  422,  410,  122,  407,  423,  421,  411,  416,
+      419,  401,  399,  412,  409,  396,  405,  408,  391,    0,
+      391,  400,  392,  404,  388,  390,  165,  391,  386,  391,
+      397,  388,  391,  380,  394,  396,  380,  421,  420,  388,
+      380,  390,  526,  526,  218,  414,  209,  220,  526,  399,
+        0,  372,  378,  381,    0,    0,  367,  379,  370,  363,
+      371,    0,  366,  361,    0,  360,  361,    0,  366,  355,
+      356,  372,  371,  362,  365,  356,  363,  349,  354,  362,
+
+      351,  360,  359,  357,  348,  352,  353,    0,  341,  347,
+      381,  234,  342,  348,  345,  526,  375,  526,  374,    0,
+      348,  346,  346,    0,  324,  334,  334,  338,  324,    0,
+        0,  335,  335,  334,    0,  315,  319,  333,  318,  322,
+      321,    0,  325,  313,  314,  321,  327,  322,    0,  314,
+      307,    0,  312,  526,  237,  305,  245,  311,  318,  301,
+      307,  300,    0,  299,    0,  307,  314,    0,    0,    0,
+      309,    0,    0,  303,  309,    0,    0,  293,    0,  292,
+      303,  303,  284,  299,  526,  251,  205,  266,  270,  273,
+      272,  248,  233,    0,    0,    0,  234,  242,    0,  187,
+
+      193,  166,  164,    0,  147,  132,    0,  224,  526,  253,
+      149,  140,  244,    0,  104,   95,   91,    0,    0,    0,
+       89,    0,   84,  100,  260,  266,    0,    0,    0,   41,
+        0,  526,  270,  526,  287,   27,    0,  526,  291,  296,
+      298,  303,  308,   54,  311,  315,  318,  322,  327,  332
     } ;
 
-static tao_yyconst short int tao_yy_def[300] =
+static tao_yyconst short int tao_yy_def[351] =
     {   0,
-      287,    1,  287,  287,  287,  287,  287,  288,  289,  287,
-      287,  287,  287,  287,  287,  287,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  287,  287,  288,  287,
-      287,  291,  287,  287,  287,  292,  287,  287,  287,  287,
-      293,  287,  287,  287,  287,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,   37,  287,   37,
-      287,  287,  287,  287,  287,  287,  287,  287,  294,  292,
-
-      287,  292,   47,  287,  287,  287,  287,  293,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  295,  287,  287,  287,  287,  287,  287,  287,  296,
-      287,  287,  287,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  295,  287,  287,  287,
-      287,  287,  287,  287,  287,  290,  290,  290,  290,  290,
-
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  287,  287,  287,  287,  287,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  290,  290,  287,  287,  297,  287,
-      287,  287,  287,  290,  290,  290,  290,  290,  290,  290,
-      290,  290,  290,  290,  297,  287,  297,  298,  287,  287,
-      290,  290,  290,  290,  290,  290,  298,  287,  299,  290,
-      290,  290,  287,  299,  287,  299,    0,  287,  287,  287,
-      287,  287,  287,  287,  287,  287,  287,  287,  287
-
+      338,    1,  338,  338,  338,  338,  338,  339,  340,  338,
+      338,  338,  338,  338,  338,  338,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  338,  338,  339,
+      338,  338,  342,  338,  338,  338,  343,  338,  338,  338,
+      338,  344,  338,  338,  338,  338,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,   38,  338,   38,  338,  338,
+
+      338,  338,  338,  338,  338,  338,  345,  343,  338,  343,
+       48,  338,  338,  338,  338,  344,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  346,  338,  338,
+      338,  338,  338,  338,  338,  347,  338,  338,  338,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      346,  338,  338,  338,  338,  338,  338,  338,  338,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  338,  338,  338,  338,  338,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  338,  338,  348,  338,  338,  338,
+      338,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+
+      341,  341,  341,  341,  341,  341,  341,  348,  338,  348,
+      349,  338,  338,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  349,  338,  350,  341,  341,  341,  341,
+      341,  338,  350,  338,  350,  341,  341,    0,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338
     } ;
 
-static tao_yyconst short int tao_yy_nxt[532] =
+static tao_yyconst short int tao_yy_nxt[582] =
     {   0,
         4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
        10,    4,   11,   12,   13,   13,   14,   15,   16,   17,
        17,   17,   18,   17,   17,   17,   17,   19,   17,   17,
         4,    4,   20,   21,   22,   23,   24,   25,   17,   17,
-       26,   27,   28,   29,   30,   17,   17,   31,   32,   33,
-       34,   35,   36,   17,   17,   38,  108,   59,   38,   43,
-       44,   44,   45,   60,   62,   47,   46,   48,   48,   49,
-       47,   63,   52,   52,   52,   50,   64,   65,   67,  278,
-       50,   79,   74,   51,   80,   66,   86,  122,   68,   77,
-       50,   75,  123,   78,   81,   50,   38,   82,   76,   38,
-
-       87,  101,  102,  282,  142,  281,  137,   51,   88,   89,
-       89,   90,   97,   47,  138,   48,   48,   49,   98,   98,
-       91,   91,   91,   50,  280,   47,  148,   52,   52,   52,
-      268,   51,  149,  149,   99,   50,  101,  102,   50,   47,
-      287,   48,   48,   49,  101,  102,  178,   92,   93,   50,
-       50,  278,   94,  160,  161,   51,  179,  276,   99,  103,
-      103,  103,  266,  267,   50,  266,  267,  104,  105,   47,
-      105,   49,   49,   49,  107,  107,  107,  266,  267,   50,
-      106,  106,  104,  105,  107,  107,  107,  105,   47,  275,
-       52,   52,   52,  274,   50,   89,   89,  143,   50,  151,
-
-      151,  283,  283,  152,  152,  152,   91,   91,   91,  107,
-      107,  107,  273,   50,  279,  192,  272,  279,  153,  271,
-      153,  193,  193,  152,  152,  152,  270,  152,  152,  152,
-      223,  223,  224,  153,  247,  247,  105,  153,  105,  264,
-      250,  285,  286,  251,  263,  248,  248,  248,  247,  247,
-      262,  105,  252,  252,  252,  105,  285,  286,  261,  248,
-      248,  248,  250,  285,  286,  251,  250,  260,  259,  251,
-      268,  258,  269,  257,  252,  252,  252,  256,  252,  252,
-      252,  252,  252,  252,   39,   39,   39,   39,   39,   41,
-      255,   41,   41,   41,   56,   56,   96,  254,   96,   96,
-
-       96,  100,  100,  100,  100,  100,  150,  150,  187,  187,
-      187,  187,  187,  195,  195,  265,  265,  265,  265,  265,
-      277,  277,  277,  277,  277,  284,  284,  284,  284,  284,
-      253,  249,  246,  245,  244,  243,  242,  241,  240,  239,
-      238,  237,  236,  235,  234,  233,  232,  231,  230,  229,
-      228,  194,  192,  227,  226,  225,  188,  222,  221,  220,
-      219,  218,  217,  216,  215,  214,  213,  212,  211,  210,
-      209,  208,  207,  206,  205,  204,  203,  202,  201,  200,
-      199,  198,  197,  196,  194,  191,  190,  189,  142,  188,
-      186,  185,  184,  183,  182,  181,  180,  177,  176,  175,
-
-      174,  173,  172,  171,  170,  169,  168,  167,  166,  165,
-      164,  163,  162,  159,  158,  157,  156,  155,  154,  147,
-      147,  147,  146,  145,  144,  287,  141,  140,  139,  136,
-      135,  134,  133,  132,  131,  130,  129,  128,  127,  126,
-      125,  124,  121,  120,  119,  118,  117,  116,  115,  114,
-      113,  112,  111,  110,  109,   95,   40,   85,   84,   83,
-       73,   72,   71,   70,   69,   61,   58,   57,   55,   54,
-       53,   42,   40,  287,   37,    3,  287,  287,  287,  287,
-      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-
-      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-      287
+       26,   27,   28,   29,   30,   31,   17,   32,   33,   34,
+       35,   36,   37,   17,   17,   39,   68,  116,   39,   44,
+       45,   45,   46,  337,   69,   48,   47,   49,   49,   50,
+       48,   60,   53,   53,   53,   51,   77,   89,   70,   64,
+       51,   61,  336,   52,   90,   78,   65,   62,   71,   92,
+       51,   66,   79,   80,   82,   51,   81,   67,   83,   84,
+
+       94,   93,   85,   39,  105,  325,   39,   52,  109,  110,
+      106,  106,   86,   87,   95,   88,   96,   97,   97,   98,
+      331,   48,  330,   49,   49,   50,  107,  329,   99,   99,
+       99,   51,   48,  152,   53,   53,   53,  164,  328,   52,
+      327,  153,   51,  165,  165,  311,   51,  109,  110,   48,
+      107,   49,   49,   50,  325,  100,  101,   51,  132,   51,
+      102,  158,  133,   52,  111,  111,  111,  134,  109,  110,
+      177,  178,  112,  113,   51,  113,   48,  323,   50,   50,
+       50,   48,  322,   53,   53,   53,   51,  112,  113,  114,
+      114,   51,  113,  115,  115,  115,  321,  338,   97,   97,
+
+      159,   51,  115,  115,  115,  199,   51,  309,  310,   99,
+       99,   99,  167,  167,  320,  200,  168,  168,  168,  115,
+      115,  115,  168,  168,  168,  216,  309,  310,  169,  319,
+      169,  217,  217,  168,  168,  168,  254,  254,  255,  285,
+      285,  318,  113,  169,  113,  326,  288,  169,  326,  289,
+      286,  286,  286,  285,  285,  309,  310,  113,  290,  290,
+      290,  113,  332,  332,  286,  286,  286,  288,  334,  335,
+      289,  288,  334,  335,  289,  311,  317,  312,  316,  290,
+      290,  290,  315,  290,  290,  290,  290,  290,  290,  334,
+      335,   40,   40,   40,   40,   40,   42,  314,   42,   42,
+
+       42,   57,   57,  104,  313,  104,  104,  104,  108,  108,
+      108,  108,  108,  166,  166,  211,  211,  211,  211,  211,
+      219,  219,  308,  308,  308,  308,  308,  324,  324,  324,
+      324,  324,  333,  333,  333,  333,  333,  307,  306,  305,
+      304,  303,  302,  301,  300,  299,  298,  297,  296,  295,
+      294,  293,  292,  291,  287,  284,  283,  282,  281,  280,
+      279,  278,  277,  276,  275,  274,  273,  272,  271,  270,
+      269,  268,  267,  266,  265,  264,  263,  262,  261,  260,
+      259,  218,  216,  258,  257,  256,  212,  253,  252,  251,
+      250,  249,  248,  247,  246,  245,  244,  243,  242,  241,
+
+      240,  239,  238,  237,  236,  235,  234,  233,  232,  231,
+      230,  229,  228,  227,  226,  225,  224,  223,  222,  221,
+      220,  218,  215,  214,  213,  158,  212,  210,  209,  208,
+      207,  206,  205,  204,  203,  202,  201,  198,  197,  196,
+      195,  194,  193,  192,  191,  190,  189,  188,  187,  186,
+      185,  184,  183,  182,  181,  180,  179,  176,  175,  174,
+      173,  172,  171,  170,  163,  163,  163,  162,  161,  160,
+      338,  157,  156,  155,  154,  151,  150,  149,  148,  147,
+      146,  145,  144,  143,  142,  141,  140,  139,  138,  137,
+      136,  135,  131,  130,  129,  128,  127,  126,  125,  124,
+
+      123,  122,  121,  120,  119,  118,  117,  103,   41,   91,
+       76,   75,   74,   73,   72,   63,   59,   58,   56,   55,
+       54,   43,   41,  338,   38,    3,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338
     } ;
 
-static tao_yyconst short int tao_yy_chk[532] =
+static tao_yyconst short int tao_yy_chk[582] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    5,  293,   20,    5,   10,
-       10,   10,   11,   20,   22,   12,   11,   12,   12,   12,
-       13,   22,   13,   13,   13,   12,   22,   23,   24,  277,
-       13,   32,   30,   12,   32,   23,   36,   70,   24,   31,
-       12,   30,   70,   31,   32,   13,   38,   32,   30,   38,
-
-       36,   46,   46,  273,   90,  272,   84,   12,   37,   37,
-       37,   37,   42,   43,   84,   43,   43,   43,   42,   42,
-       37,   37,   37,   43,  271,   44,   98,   44,   44,   44,
-      269,   43,   98,   98,   42,   44,  100,  100,   43,   48,
-       90,   48,   48,   48,  102,  102,  134,   37,   37,   48,
-       44,  268,   37,  116,  116,   43,  134,  263,   42,   47,
-       47,   47,  249,  249,   48,  265,  265,   47,   47,   49,
-       47,   49,   49,   49,  106,  106,  106,  267,  267,   49,
-       50,   50,   47,   47,   50,   50,   50,   47,   52,  261,
-       52,   52,   52,  260,   49,   91,   91,   91,   52,  104,
-
-      104,  278,  278,  104,  104,  104,   91,   91,   91,  107,
-      107,  107,  259,   52,  270,  149,  258,  270,  107,  254,
-      107,  149,  149,  151,  151,  151,  253,  152,  152,  152,
-      188,  188,  188,  107,  224,  224,  152,  107,  152,  246,
-      226,  279,  279,  226,  245,  224,  224,  224,  248,  248,
-      244,  152,  226,  226,  226,  152,  284,  284,  240,  248,
-      248,  248,  250,  286,  286,  250,  251,  239,  234,  251,
-      251,  233,  252,  231,  250,  250,  250,  230,  251,  251,
-      251,  252,  252,  252,  288,  288,  288,  288,  288,  289,
-      229,  289,  289,  289,  290,  290,  291,  228,  291,  291,
-
-      291,  292,  292,  292,  292,  292,  294,  294,  295,  295,
-      295,  295,  295,  296,  296,  297,  297,  297,  297,  297,
-      298,  298,  298,  298,  298,  299,  299,  299,  299,  299,
-      227,  225,  222,  220,  218,  217,  216,  215,  213,  212,
-      211,  210,  208,  207,  206,  203,  202,  201,  200,  198,
-      197,  195,  193,  191,  190,  189,  187,  186,  185,  183,
-      182,  181,  180,  179,  178,  177,  176,  175,  174,  173,
-      172,  171,  170,  168,  167,  166,  165,  163,  162,  161,
-      160,  157,  156,  154,  150,  146,  145,  144,  143,  142,
-      141,  140,  139,  138,  137,  136,  135,  133,  132,  131,
-
-      130,  128,  127,  126,  125,  124,  123,  122,  121,  120,
-      119,  118,  117,  115,  114,  113,  112,  110,  109,   99,
-       97,   96,   94,   93,   92,   88,   87,   86,   85,   83,
-       82,   81,   80,   79,   78,   77,   76,   75,   74,   73,
-       72,   71,   69,   68,   67,   66,   65,   64,   63,   62,
-       61,   60,   59,   58,   57,   41,   39,   35,   34,   33,
+        1,    1,    1,    1,    1,    5,   23,  344,    5,   10,
+       10,   10,   11,  336,   23,   12,   11,   12,   12,   12,
+       13,   20,   13,   13,   13,   12,   30,   34,   24,   22,
+       13,   20,  330,   12,   34,   30,   22,   20,   24,   36,
+       12,   22,   30,   31,   32,   13,   31,   22,   32,   33,
+
+       37,   36,   33,   39,   43,  324,   39,   12,   47,   47,
+       43,   43,   33,   33,   37,   33,   38,   38,   38,   38,
+      323,   44,  321,   44,   44,   44,   43,  317,   38,   38,
+       38,   44,   45,   91,   45,   45,   45,  106,  316,   44,
+      315,   91,   45,  106,  106,  312,   44,  108,  108,   49,
+       43,   49,   49,   49,  311,   38,   38,   45,   73,   49,
+       38,   98,   73,   44,   48,   48,   48,   73,  110,  110,
+      125,  125,   48,   48,   49,   48,   50,  306,   50,   50,
+       50,   53,  305,   53,   53,   53,   50,   48,   48,   51,
+       51,   53,   48,   51,   51,   51,  303,   98,   99,   99,
+
+       99,   50,  114,  114,  114,  147,   53,  287,  287,   99,
+       99,   99,  112,  112,  302,  147,  112,  112,  112,  115,
+      115,  115,  167,  167,  167,  165,  308,  308,  115,  301,
+      115,  165,  165,  168,  168,  168,  212,  212,  212,  255,
+      255,  300,  168,  115,  168,  313,  257,  115,  313,  257,
+      255,  255,  255,  286,  286,  310,  310,  168,  257,  257,
+      257,  168,  325,  325,  286,  286,  286,  288,  326,  326,
+      288,  289,  333,  333,  289,  289,  298,  290,  297,  288,
+      288,  288,  293,  289,  289,  289,  290,  290,  290,  335,
+      335,  339,  339,  339,  339,  339,  340,  292,  340,  340,
+
+      340,  341,  341,  342,  291,  342,  342,  342,  343,  343,
+      343,  343,  343,  345,  345,  346,  346,  346,  346,  346,
+      347,  347,  348,  348,  348,  348,  348,  349,  349,  349,
+      349,  349,  350,  350,  350,  350,  350,  284,  283,  282,
+      281,  280,  278,  275,  274,  271,  267,  266,  264,  262,
+      261,  260,  259,  258,  256,  253,  251,  250,  248,  247,
+      246,  245,  244,  243,  241,  240,  239,  238,  237,  236,
+      234,  233,  232,  229,  228,  227,  226,  225,  223,  222,
+      221,  219,  217,  215,  214,  213,  211,  210,  209,  207,
+      206,  205,  204,  203,  202,  201,  200,  199,  198,  197,
+
+      196,  195,  194,  193,  192,  191,  190,  189,  187,  186,
+      184,  183,  181,  180,  179,  178,  177,  174,  173,  172,
+      170,  166,  162,  161,  160,  159,  158,  157,  156,  155,
+      154,  153,  152,  151,  150,  149,  148,  146,  145,  144,
+      143,  142,  141,  139,  138,  137,  136,  135,  134,  133,
+      132,  131,  130,  129,  128,  127,  126,  124,  123,  122,
+      121,  119,  118,  117,  107,  105,  104,  102,  101,  100,
+       96,   95,   94,   93,   92,   90,   89,   88,   87,   86,
+       85,   84,   83,   82,   81,   80,   79,   78,   77,   76,
+       75,   74,   72,   71,   70,   69,   68,   67,   66,   65,
+
+       64,   63,   62,   61,   60,   59,   58,   42,   40,   35,
        29,   28,   27,   26,   25,   21,   19,   18,   16,   15,
-       14,    9,    8,    3,    2,  287,  287,  287,  287,  287,
-      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-
-      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-      287
+       14,    9,    8,    3,    2,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338
     } ;
 
 static tao_yy_state_type tao_yy_last_accepting_state;
@@ -579,7 +605,7 @@ char *tao_yytext_ptr;
 #line 1 "fe/idl.ll"
 #define INITIAL 0
 #line 3 "fe/idl.ll"
-/*
+/*  $Id: idl.ll,v 1.6 1999/04/08 09:46:19 tkue Exp $
 
 COPYRIGHT
 
@@ -652,11 +678,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "fe_private.h"
 #include "y.tab.h"
 
-static char	idl_escape_reader(char *);
-static double	idl_atof(char *);
-static long	idl_atoi(char *, long);
-static void	idl_parse_line_and_file(char *);
-static void	idl_store_pragma(char *);
+static char     idl_escape_reader(char *);
+static double   idl_atof(char *);
+static long     idl_atoi(char *, long);
+static void     idl_parse_line_and_file(char *);
+static void     idl_store_pragma(char *);
 
 #if 0 /* defined (HPUX) */
 // HPUX has tao_yytext typed to unsigned char *. We make sure here that
@@ -672,6 +698,19 @@ inline char *__tao_yytext()
 #else
 #define ace_tao_yytext tao_yytext
 #endif /* 0 */
+
+static int scan_obv_token (int token)
+{
+#ifdef IDL_HAS_VALUETYPE
+    if (idl_global->obv_support ())
+      {
+        return token;
+      }
+#endif /* IDL_HAS_VALUETYPE */
+    tao_yylval.strval = ACE_OS::strdup (ace_tao_yytext);
+    return IDENTIFIER;
+}
+
 /* SO we don't choke on files that use \r\n */
 #define TAO_YY_NEVER_INTERACTIVE 1
 
@@ -760,21 +799,21 @@ TAO_YY_MALLOC_DECL
  */
 #ifndef TAO_YY_INPUT
 #define TAO_YY_INPUT(buf,result,max_size) \
-	if ( tao_yy_current_buffer->tao_yy_is_interactive ) \
-		{ \
-		int c = '*', n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( tao_yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( tao_yyin ) ) \
-			TAO_YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else if ( ((result = fread( buf, 1, max_size, tao_yyin )) == 0) \
-		  && ferror( tao_yyin ) ) \
-		TAO_YY_FATAL_ERROR( "input in flex scanner failed" );
+        if ( tao_yy_current_buffer->tao_yy_is_interactive ) \
+                { \
+                int c = '*', n; \
+                for ( n = 0; n < max_size && \
+                             (c = getc( tao_yyin )) != EOF && c != '\n'; ++n ) \
+                        buf[n] = (char) c; \
+                if ( c == '\n' ) \
+                        buf[n++] = (char) c; \
+                if ( c == EOF && ferror( tao_yyin ) ) \
+                        TAO_YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                result = n; \
+                } \
+        else if ( ((result = fread( buf, 1, max_size, tao_yyin )) == 0) \
+                  && ferror( tao_yyin ) ) \
+                TAO_YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
 
 /* No semi-colon after return; correct usage is to write "tao_yyterminate();" -
@@ -811,308 +850,348 @@ TAO_YY_MALLOC_DECL
 
 /* Code executed at the end of each rule. */
 #ifndef TAO_YY_BREAK
-#define TAO_YY_BREAK ACE_NOTREACHED (break;)
+#define TAO_YY_BREAK break;
 #endif
 
 #define TAO_YY_RULE_SETUP \
-	if ( tao_yyleng > 0 ) \
-		tao_yy_current_buffer->tao_yy_at_bol = \
-				(tao_yytext[tao_yyleng - 1] == '\n'); \
-	TAO_YY_USER_ACTION
+        if ( tao_yyleng > 0 ) \
+                tao_yy_current_buffer->tao_yy_at_bol = \
+                                (tao_yytext[tao_yyleng - 1] == '\n'); \
+        TAO_YY_USER_ACTION
 
 TAO_YY_DECL
-	{
-	register tao_yy_state_type tao_yy_current_state;
-	register char *tao_yy_cp, *tao_yy_bp;
-	register int tao_yy_act;
+        {
+        register tao_yy_state_type tao_yy_current_state;
+        register char *tao_yy_cp, *tao_yy_bp;
+        register int tao_yy_act;
 
-#line 104 "fe/idl.ll"
+#line 117 "fe/idl.ll"
 
 
 
-	if ( tao_yy_init )
-		{
-		tao_yy_init = 0;
+        if ( tao_yy_init )
+                {
+                tao_yy_init = 0;
 
 #ifdef TAO_YY_USER_INIT
-		TAO_YY_USER_INIT;
+                TAO_YY_USER_INIT;
 #endif
 
-		if ( ! tao_yy_start )
-			tao_yy_start = 1;	/* first start state */
+                if ( ! tao_yy_start )
+                        tao_yy_start = 1;       /* first start state */
 
-		if ( ! tao_yyin )
-			tao_yyin = stdin;
+                if ( ! tao_yyin )
+                        tao_yyin = stdin;
 
-		if ( ! tao_yyout )
-			tao_yyout = stdout;
+                if ( ! tao_yyout )
+                        tao_yyout = stdout;
 
-		if ( ! tao_yy_current_buffer )
-			tao_yy_current_buffer =
-				tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE );
+                if ( ! tao_yy_current_buffer )
+                        tao_yy_current_buffer =
+                                tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE );
 
-		tao_yy_load_buffer_state();
-		}
+                tao_yy_load_buffer_state();
+                }
 
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		tao_yy_cp = tao_yy_c_buf_p;
+        while ( 1 )             /* loops until end-of-file is reached */
+                {
+                tao_yy_cp = tao_yy_c_buf_p;
 
-		/* Support of tao_yytext. */
-		*tao_yy_cp = tao_yy_hold_char;
+                /* Support of tao_yytext. */
+                *tao_yy_cp = tao_yy_hold_char;
 
-		/* tao_yy_bp points to the position in tao_yy_ch_buf of the start of
-		 * the current run.
-		 */
-		tao_yy_bp = tao_yy_cp;
+                /* tao_yy_bp points to the position in tao_yy_ch_buf of the start of
+                 * the current run.
+                 */
+                tao_yy_bp = tao_yy_cp;
 
-		tao_yy_current_state = tao_yy_start;
-		tao_yy_current_state += TAO_YY_AT_BOL();
+                tao_yy_current_state = tao_yy_start;
+                tao_yy_current_state += TAO_YY_AT_BOL();
 tao_yy_match:
-		do
-			{
-			register TAO_YY_CHAR tao_yy_c = tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)];
-			if ( tao_yy_accept[tao_yy_current_state] )
-				{
-				tao_yy_last_accepting_state = tao_yy_current_state;
-				tao_yy_last_accepting_cpos = tao_yy_cp;
-				}
-			while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-				{
-				tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-				if ( tao_yy_current_state >= 288 )
-					tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-				}
-			tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-			++tao_yy_cp;
-			}
-		while ( tao_yy_base[tao_yy_current_state] != 476 );
+                do
+                        {
+                        register TAO_YY_CHAR tao_yy_c = tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)];
+                        if ( tao_yy_accept[tao_yy_current_state] )
+                                {
+                                tao_yy_last_accepting_state = tao_yy_current_state;
+                                tao_yy_last_accepting_cpos = tao_yy_cp;
+                                }
+                        while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
+                                {
+                                tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
+                                if ( tao_yy_current_state >= 339 )
+                                        tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
+                                }
+                        tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
+                        ++tao_yy_cp;
+                        }
+                while ( tao_yy_base[tao_yy_current_state] != 526 );
 
 tao_yy_find_action:
-		tao_yy_act = tao_yy_accept[tao_yy_current_state];
-		if ( tao_yy_act == 0 )
-			{ /* have to back up */
-			tao_yy_cp = tao_yy_last_accepting_cpos;
-			tao_yy_current_state = tao_yy_last_accepting_state;
-			tao_yy_act = tao_yy_accept[tao_yy_current_state];
-			}
+                tao_yy_act = tao_yy_accept[tao_yy_current_state];
+                if ( tao_yy_act == 0 )
+                        { /* have to back up */
+                        tao_yy_cp = tao_yy_last_accepting_cpos;
+                        tao_yy_current_state = tao_yy_last_accepting_state;
+                        tao_yy_act = tao_yy_accept[tao_yy_current_state];
+                        }
 
-		TAO_YY_DO_BEFORE_ACTION;
+                TAO_YY_DO_BEFORE_ACTION;
 
 
-do_action:	/* This label is used only to access EOF actions. */
+do_action:      /* This label is used only to access EOF actions. */
 
 
-		switch ( tao_yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of TAO_YY_DO_BEFORE_ACTION */
-			*tao_yy_cp = tao_yy_hold_char;
-			tao_yy_cp = tao_yy_last_accepting_cpos;
-			tao_yy_current_state = tao_yy_last_accepting_state;
-			goto tao_yy_find_action;
+                switch ( tao_yy_act )
+        { /* beginning of action switch */
+                        case 0: /* must back up */
+                        /* undo the effects of TAO_YY_DO_BEFORE_ACTION */
+                        *tao_yy_cp = tao_yy_hold_char;
+                        tao_yy_cp = tao_yy_last_accepting_cpos;
+                        tao_yy_current_state = tao_yy_last_accepting_state;
+                        goto tao_yy_find_action;
 
 case 1:
 TAO_YY_RULE_SETUP
-#line 106 "fe/idl.ll"
+#line 119 "fe/idl.ll"
 return IDL_ANY;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 2:
 TAO_YY_RULE_SETUP
-#line 107 "fe/idl.ll"
+#line 120 "fe/idl.ll"
 return IDL_MODULE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 3:
 TAO_YY_RULE_SETUP
-#line 108 "fe/idl.ll"
+#line 121 "fe/idl.ll"
 return IDL_RAISES;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 4:
 TAO_YY_RULE_SETUP
-#line 109 "fe/idl.ll"
+#line 122 "fe/idl.ll"
 return IDL_READONLY;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 5:
 TAO_YY_RULE_SETUP
-#line 110 "fe/idl.ll"
+#line 123 "fe/idl.ll"
 return IDL_ATTRIBUTE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 6:
 TAO_YY_RULE_SETUP
-#line 111 "fe/idl.ll"
+#line 124 "fe/idl.ll"
 return IDL_EXCEPTION;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 7:
 TAO_YY_RULE_SETUP
-#line 112 "fe/idl.ll"
+#line 125 "fe/idl.ll"
 return IDL_CONTEXT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 8:
 TAO_YY_RULE_SETUP
-#line 113 "fe/idl.ll"
+#line 126 "fe/idl.ll"
 return IDL_INTERFACE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 9:
 TAO_YY_RULE_SETUP
-#line 114 "fe/idl.ll"
+#line 127 "fe/idl.ll"
 return IDL_CONST;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 10:
 TAO_YY_RULE_SETUP
-#line 115 "fe/idl.ll"
+#line 128 "fe/idl.ll"
 return IDL_TYPEDEF;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 11:
 TAO_YY_RULE_SETUP
-#line 116 "fe/idl.ll"
+#line 129 "fe/idl.ll"
 return IDL_STRUCT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 12:
 TAO_YY_RULE_SETUP
-#line 117 "fe/idl.ll"
+#line 130 "fe/idl.ll"
 return IDL_ENUM;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 13:
 TAO_YY_RULE_SETUP
-#line 118 "fe/idl.ll"
+#line 131 "fe/idl.ll"
 return IDL_STRING;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 14:
 TAO_YY_RULE_SETUP
-#line 119 "fe/idl.ll"
+#line 132 "fe/idl.ll"
 return IDL_WSTRING;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 15:
 TAO_YY_RULE_SETUP
-#line 120 "fe/idl.ll"
+#line 133 "fe/idl.ll"
 return IDL_SEQUENCE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 16:
 TAO_YY_RULE_SETUP
-#line 121 "fe/idl.ll"
+#line 134 "fe/idl.ll"
 return IDL_UNION;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 17:
 TAO_YY_RULE_SETUP
-#line 122 "fe/idl.ll"
+#line 135 "fe/idl.ll"
 return IDL_SWITCH;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 18:
 TAO_YY_RULE_SETUP
-#line 123 "fe/idl.ll"
+#line 136 "fe/idl.ll"
 return IDL_CASE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 19:
 TAO_YY_RULE_SETUP
-#line 124 "fe/idl.ll"
+#line 137 "fe/idl.ll"
 return IDL_DEFAULT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 20:
 TAO_YY_RULE_SETUP
-#line 125 "fe/idl.ll"
+#line 138 "fe/idl.ll"
 return IDL_FLOAT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 21:
 TAO_YY_RULE_SETUP
-#line 126 "fe/idl.ll"
+#line 139 "fe/idl.ll"
 return IDL_DOUBLE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 22:
 TAO_YY_RULE_SETUP
-#line 127 "fe/idl.ll"
+#line 140 "fe/idl.ll"
 return IDL_LONG;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 23:
 TAO_YY_RULE_SETUP
-#line 128 "fe/idl.ll"
+#line 141 "fe/idl.ll"
 return IDL_SHORT;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 24:
 TAO_YY_RULE_SETUP
-#line 129 "fe/idl.ll"
+#line 142 "fe/idl.ll"
 return IDL_UNSIGNED;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 25:
 TAO_YY_RULE_SETUP
-#line 130 "fe/idl.ll"
+#line 143 "fe/idl.ll"
 return IDL_CHAR;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 26:
 TAO_YY_RULE_SETUP
-#line 131 "fe/idl.ll"
+#line 144 "fe/idl.ll"
 return IDL_WCHAR;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 27:
 TAO_YY_RULE_SETUP
-#line 132 "fe/idl.ll"
+#line 145 "fe/idl.ll"
 return IDL_BOOLEAN;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 28:
 TAO_YY_RULE_SETUP
-#line 133 "fe/idl.ll"
+#line 146 "fe/idl.ll"
 return IDL_OCTET;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 29:
 TAO_YY_RULE_SETUP
-#line 134 "fe/idl.ll"
+#line 147 "fe/idl.ll"
 return IDL_VOID;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 30:
 TAO_YY_RULE_SETUP
-#line 135 "fe/idl.ll"
+#line 148 "fe/idl.ll"
 return IDL_NATIVE;
-	TAO_YY_BREAK
+        TAO_YY_BREAK
 case 31:
 TAO_YY_RULE_SETUP
-#line 137 "fe/idl.ll"
-return IDL_TRUETOK;
-	TAO_YY_BREAK
+#line 149 "fe/idl.ll"
+return scan_obv_token (IDL_ABSTRACT);
+        TAO_YY_BREAK
 case 32:
 TAO_YY_RULE_SETUP
-#line 138 "fe/idl.ll"
-return IDL_FALSETOK;
-	TAO_YY_BREAK
+#line 150 "fe/idl.ll"
+return scan_obv_token (IDL_CUSTOM);
+        TAO_YY_BREAK
 case 33:
 TAO_YY_RULE_SETUP
-#line 140 "fe/idl.ll"
-return IDL_INOUT;
-	TAO_YY_BREAK
+#line 151 "fe/idl.ll"
+return scan_obv_token (IDL_INIT);
+        TAO_YY_BREAK
 case 34:
 TAO_YY_RULE_SETUP
-#line 141 "fe/idl.ll"
-return IDL_IN;
-	TAO_YY_BREAK
+#line 152 "fe/idl.ll"
+return scan_obv_token (IDL_PRIVATE);
+        TAO_YY_BREAK
 case 35:
 TAO_YY_RULE_SETUP
-#line 142 "fe/idl.ll"
-return IDL_OUT;
-	TAO_YY_BREAK
+#line 153 "fe/idl.ll"
+return scan_obv_token (IDL_PUBLIC);
+        TAO_YY_BREAK
 case 36:
 TAO_YY_RULE_SETUP
-#line 143 "fe/idl.ll"
-return IDL_ONEWAY;
-	TAO_YY_BREAK
+#line 154 "fe/idl.ll"
+return scan_obv_token (IDL_SUPPORTS);
+        TAO_YY_BREAK
 case 37:
 TAO_YY_RULE_SETUP
-#line 145 "fe/idl.ll"
-return IDL_LEFT_SHIFT;
-	TAO_YY_BREAK
+#line 155 "fe/idl.ll"
+return scan_obv_token (IDL_TRUNCATABLE);
+        TAO_YY_BREAK
 case 38:
 TAO_YY_RULE_SETUP
-#line 146 "fe/idl.ll"
-return IDL_RIGHT_SHIFT;
-	TAO_YY_BREAK
+#line 156 "fe/idl.ll"
+return scan_obv_token (IDL_VALUETYPE);
+        TAO_YY_BREAK
 case 39:
 TAO_YY_RULE_SETUP
-#line 147 "fe/idl.ll"
-{
-		  tao_yylval.strval = "::";
-		  return IDL_SCOPE_DELIMITOR;
-		}
+#line 158 "fe/idl.ll"
+return IDL_TRUETOK;
         TAO_YY_BREAK
 case 40:
 TAO_YY_RULE_SETUP
-#line 152 "fe/idl.ll"
+#line 159 "fe/idl.ll"
+return IDL_FALSETOK;
+        TAO_YY_BREAK
+case 41:
+TAO_YY_RULE_SETUP
+#line 161 "fe/idl.ll"
+return IDL_INOUT;
+        TAO_YY_BREAK
+case 42:
+TAO_YY_RULE_SETUP
+#line 162 "fe/idl.ll"
+return IDL_IN;
+        TAO_YY_BREAK
+case 43:
+TAO_YY_RULE_SETUP
+#line 163 "fe/idl.ll"
+return IDL_OUT;
+        TAO_YY_BREAK
+case 44:
+TAO_YY_RULE_SETUP
+#line 164 "fe/idl.ll"
+return IDL_ONEWAY;
+        TAO_YY_BREAK
+case 45:
+TAO_YY_RULE_SETUP
+#line 166 "fe/idl.ll"
+return IDL_LEFT_SHIFT;
+        TAO_YY_BREAK
+case 46:
+TAO_YY_RULE_SETUP
+#line 167 "fe/idl.ll"
+return IDL_RIGHT_SHIFT;
+        TAO_YY_BREAK
+case 47:
+TAO_YY_RULE_SETUP
+#line 168 "fe/idl.ll"
+{
+                  tao_yylval.strval = "::";
+                  return IDL_SCOPE_DELIMITOR;
+                }
+        TAO_YY_BREAK
+case 48:
+TAO_YY_RULE_SETUP
+#line 173 "fe/idl.ll"
 {
     /* make sure that this identifier is not a C++ keyword. If it is,
        prepend it with a _cxx_. Lookup in the perfect hash table for
@@ -1132,490 +1211,490 @@ TAO_YY_RULE_SETUP
       }
     return IDENTIFIER;
 }
-	TAO_YY_BREAK
-case 41:
+        TAO_YY_BREAK
+case 49:
 TAO_YY_RULE_SETUP
-#line 172 "fe/idl.ll"
+#line 193 "fe/idl.ll"
 {
                   tao_yylval.dval = idl_atof(ace_tao_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
-	TAO_YY_BREAK
-case 42:
+        TAO_YY_BREAK
+case 50:
 TAO_YY_RULE_SETUP
-#line 176 "fe/idl.ll"
+#line 197 "fe/idl.ll"
 {
                   tao_yylval.dval = idl_atof(ace_tao_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
-	TAO_YY_BREAK
-case 43:
+        TAO_YY_BREAK
+case 51:
 TAO_YY_RULE_SETUP
-#line 181 "fe/idl.ll"
+#line 202 "fe/idl.ll"
 {
-		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 10);
-		  return IDL_INTEGER_LITERAL;
-	        }
-	TAO_YY_BREAK
-case 44:
+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 10);
+                  return IDL_INTEGER_LITERAL;
+                }
+        TAO_YY_BREAK
+case 52:
 TAO_YY_RULE_SETUP
-#line 185 "fe/idl.ll"
+#line 206 "fe/idl.ll"
 {
-		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 16);
-		  return IDL_INTEGER_LITERAL;
-	        }
-	TAO_YY_BREAK
-case 45:
+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 16);
+                  return IDL_INTEGER_LITERAL;
+                }
+        TAO_YY_BREAK
+case 53:
 TAO_YY_RULE_SETUP
-#line 189 "fe/idl.ll"
+#line 210 "fe/idl.ll"
 {
-		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 8);
-		  return IDL_INTEGER_LITERAL;
-	      	}
-	TAO_YY_BREAK
-case 46:
+                  tao_yylval.ival = idl_atoi(ace_tao_yytext, 8);
+                  return IDL_INTEGER_LITERAL;
+                }
+        TAO_YY_BREAK
+case 54:
 TAO_YY_RULE_SETUP
-#line 194 "fe/idl.ll"
+#line 215 "fe/idl.ll"
 {
-		  /* Skip the quotes */
-		  char *tmp = ace_tao_yytext;
-		  tmp[strlen(tmp)-1] = '\0';
-		  tao_yylval.sval = new String(tmp + 1);
-		  return IDL_STRING_LITERAL;
-	      	}
-	TAO_YY_BREAK
-case 47:
+                  /* Skip the quotes */
+                  char *tmp = ace_tao_yytext;
+                  tmp[strlen(tmp)-1] = '\0';
+                  tao_yylval.sval = new String(tmp + 1);
+                  return IDL_STRING_LITERAL;
+                }
+        TAO_YY_BREAK
+case 55:
 TAO_YY_RULE_SETUP
-#line 201 "fe/idl.ll"
+#line 222 "fe/idl.ll"
 {
-		  tao_yylval.cval = ace_tao_yytext [1];
-		  return IDL_CHARACTER_LITERAL;
-	      	}
-	TAO_YY_BREAK
-case 48:
+                  tao_yylval.cval = ace_tao_yytext [1];
+                  return IDL_CHARACTER_LITERAL;
+                }
+        TAO_YY_BREAK
+case 56:
 TAO_YY_RULE_SETUP
-#line 205 "fe/idl.ll"
+#line 226 "fe/idl.ll"
 {
-		  // octal character constant
-		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-	TAO_YY_BREAK
-case 49:
+                  // octal character constant
+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
+                  return IDL_CHARACTER_LITERAL;
+                }
+        TAO_YY_BREAK
+case 57:
 TAO_YY_RULE_SETUP
-#line 210 "fe/idl.ll"
+#line 231 "fe/idl.ll"
 {
-		  // hexadecimal character constant
-		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-	TAO_YY_BREAK
-case 50:
+                  // hexadecimal character constant
+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
+                  return IDL_CHARACTER_LITERAL;
+                }
+        TAO_YY_BREAK
+case 58:
 TAO_YY_RULE_SETUP
-#line 215 "fe/idl.ll"
+#line 236 "fe/idl.ll"
 {
-		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-	TAO_YY_BREAK
-case 51:
+                  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
+                  return IDL_CHARACTER_LITERAL;
+                }
+        TAO_YY_BREAK
+case 59:
 TAO_YY_RULE_SETUP
-#line 219 "fe/idl.ll"
+#line 240 "fe/idl.ll"
 {/* remember pragma */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		  idl_store_pragma(ace_tao_yytext);
-		}
-	break;
-case 52:
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                  idl_store_pragma(ace_tao_yytext);
+                }
+        TAO_YY_BREAK
+case 60:
 TAO_YY_RULE_SETUP
-#line 223 "fe/idl.ll"
+#line 244 "fe/idl.ll"
 {
-		  idl_parse_line_and_file(ace_tao_yytext);
-		}
-	break;
-case 53:
+                  idl_parse_line_and_file(ace_tao_yytext);
+                }
+        TAO_YY_BREAK
+case 61:
 TAO_YY_RULE_SETUP
-#line 226 "fe/idl.ll"
+#line 247 "fe/idl.ll"
 {
-		  idl_parse_line_and_file(ace_tao_yytext);
-		}
-	break;
-case 54:
+                  idl_parse_line_and_file(ace_tao_yytext);
+                }
+        TAO_YY_BREAK
+case 62:
 TAO_YY_RULE_SETUP
-#line 229 "fe/idl.ll"
+#line 250 "fe/idl.ll"
 {
-		  idl_parse_line_and_file(ace_tao_yytext);
-		}
-	break;
-case 55:
+                  idl_parse_line_and_file(ace_tao_yytext);
+                }
+        TAO_YY_BREAK
+case 63:
 TAO_YY_RULE_SETUP
-#line 232 "fe/idl.ll"
+#line 253 "fe/idl.ll"
 {
-		  idl_parse_line_and_file(ace_tao_yytext);
-	        }
-	break;
-case 56:
+                  idl_parse_line_and_file(ace_tao_yytext);
+                }
+        TAO_YY_BREAK
+case 64:
 TAO_YY_RULE_SETUP
-#line 235 "fe/idl.ll"
+#line 256 "fe/idl.ll"
 {
-		  /* ignore cpp ident */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-	break;
-case 57:
+                  /* ignore cpp ident */
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
+        TAO_YY_BREAK
+case 65:
 TAO_YY_RULE_SETUP
-#line 239 "fe/idl.ll"
+#line 260 "fe/idl.ll"
 {
-		  /* ignore comments */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-	break;
-case 58:
+                  /* ignore comments */
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
+        TAO_YY_BREAK
+case 66:
 TAO_YY_RULE_SETUP
-#line 243 "fe/idl.ll"
+#line 264 "fe/idl.ll"
 {
-		  for(;;) {
-		    char c = tao_yyinput();
-		    if (c == '*') {
-		      char next = tao_yyinput();
-		      if (next == '/')
-			break;
-		      else
-			tao_yyunput(c, NULL);
-	              if (c == '\n')
-		        idl_global->set_lineno(idl_global->lineno() + 1);
-		    }
-	          }
-	        }
-	break;
-case 59:
+                  for(;;) {
+                    char c = tao_yyinput();
+                    if (c == '*') {
+                      char next = tao_yyinput();
+                      if (next == '/')
+                        break;
+                      else
+                        tao_yyunput(c, NULL);
+                      if (c == '\n')
+                        idl_global->set_lineno(idl_global->lineno() + 1);
+                    }
+                  }
+                }
+        TAO_YY_BREAK
+case 67:
 TAO_YY_RULE_SETUP
-#line 257 "fe/idl.ll"
+#line 278 "fe/idl.ll"
 ;
-	break;
-case 60:
+        TAO_YY_BREAK
+case 68:
 TAO_YY_RULE_SETUP
-#line 258 "fe/idl.ll"
+#line 279 "fe/idl.ll"
 {
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-	break;
-case 61:
+                  idl_global->set_lineno(idl_global->lineno() + 1);
+                }
+        TAO_YY_BREAK
+case 69:
 TAO_YY_RULE_SETUP
-#line 261 "fe/idl.ll"
+#line 282 "fe/idl.ll"
 return ace_tao_yytext [0];
-	TAO_YY_BREAK
-case 62:
+        TAO_YY_BREAK
+case 70:
 TAO_YY_RULE_SETUP
-#line 263 "fe/idl.ll"
+#line 284 "fe/idl.ll"
 TAO_YY_ECHO;
-	break;
+        TAO_YY_BREAK
 case TAO_YY_STATE_EOF(INITIAL):
-	tao_yyterminate();
-
-	case TAO_YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int tao_yy_amount_of_matched_text = (int) (tao_yy_cp - tao_yytext_ptr) - 1;
-
-		/* Undo the effects of TAO_YY_DO_BEFORE_ACTION. */
-		*tao_yy_cp = tao_yy_hold_char;
-		TAO_YY_RESTORE_TAO_YY_MORE_OFFSET
-
-		if ( tao_yy_current_buffer->tao_yy_buffer_status == TAO_YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed tao_yyin at a new source and called
-			 * tao_yylex().  If so, then we have to assure
-			 * consistency between tao_yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			tao_yy_n_chars = tao_yy_current_buffer->tao_yy_n_chars;
-			tao_yy_current_buffer->tao_yy_input_file = tao_yyin;
-			tao_yy_current_buffer->tao_yy_buffer_status = TAO_YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for tao_yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since tao_yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( tao_yy_c_buf_p <= &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] )
-			{ /* This was really a NUL. */
-			tao_yy_state_type tao_yy_next_state;
-
-			tao_yy_c_buf_p = tao_yytext_ptr + tao_yy_amount_of_matched_text;
-
-			tao_yy_current_state = tao_yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * tao_yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			tao_yy_next_state = tao_yy_try_NUL_trans( tao_yy_current_state );
-
-			tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-
-			if ( tao_yy_next_state )
-				{
-				/* Consume the NUL. */
-				tao_yy_cp = ++tao_yy_c_buf_p;
-				tao_yy_current_state = tao_yy_next_state;
-				goto tao_yy_match;
-				}
-
-			else
-				{
-				tao_yy_cp = tao_yy_c_buf_p;
-				goto tao_yy_find_action;
-				}
-			}
-
-		else switch ( tao_yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				tao_yy_did_buffer_switch_on_eof = 0;
-
-				if ( tao_yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * tao_yy_get_next_buffer() to have set up
-					 * tao_yytext, we can now set up
-					 * tao_yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * TAO_YY_NULL, it'll still work - another
-					 * TAO_YY_NULL will get returned.
-					 */
-					tao_yy_c_buf_p = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-
-					tao_yy_act = TAO_YY_STATE_EOF(TAO_YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! tao_yy_did_buffer_switch_on_eof )
-						TAO_YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				tao_yy_c_buf_p =
-					tao_yytext_ptr + tao_yy_amount_of_matched_text;
-
-				tao_yy_current_state = tao_yy_get_previous_state();
-
-				tao_yy_cp = tao_yy_c_buf_p;
-				tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-				goto tao_yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				tao_yy_c_buf_p =
-				&tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars];
-
-				tao_yy_current_state = tao_yy_get_previous_state();
-
-				tao_yy_cp = tao_yy_c_buf_p;
-				tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
-				goto tao_yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		TAO_YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of tao_yylex */
+        tao_yyterminate();
+
+        case TAO_YY_END_OF_BUFFER:
+                {
+                /* Amount of text matched not including the EOB char. */
+                int tao_yy_amount_of_matched_text = (int) (tao_yy_cp - tao_yytext_ptr) - 1;
+
+                /* Undo the effects of TAO_YY_DO_BEFORE_ACTION. */
+                *tao_yy_cp = tao_yy_hold_char;
+                TAO_YY_RESTORE_TAO_YY_MORE_OFFSET
+
+                if ( tao_yy_current_buffer->tao_yy_buffer_status == TAO_YY_BUFFER_NEW )
+                        {
+                        /* We're scanning a new file or input source.  It's
+                         * possible that this happened because the user
+                         * just pointed tao_yyin at a new source and called
+                         * tao_yylex().  If so, then we have to assure
+                         * consistency between tao_yy_current_buffer and our
+                         * globals.  Here is the right place to do so, because
+                         * this is the first action (other than possibly a
+                         * back-up) that will match for the new input source.
+                         */
+                        tao_yy_n_chars = tao_yy_current_buffer->tao_yy_n_chars;
+                        tao_yy_current_buffer->tao_yy_input_file = tao_yyin;
+                        tao_yy_current_buffer->tao_yy_buffer_status = TAO_YY_BUFFER_NORMAL;
+                        }
+
+                /* Note that here we test for tao_yy_c_buf_p "<=" to the position
+                 * of the first EOB in the buffer, since tao_yy_c_buf_p will
+                 * already have been incremented past the NUL character
+                 * (since all states make transitions on EOB to the
+                 * end-of-buffer state).  Contrast this with the test
+                 * in input().
+                 */
+                if ( tao_yy_c_buf_p <= &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] )
+                        { /* This was really a NUL. */
+                        tao_yy_state_type tao_yy_next_state;
+
+                        tao_yy_c_buf_p = tao_yytext_ptr + tao_yy_amount_of_matched_text;
+
+                        tao_yy_current_state = tao_yy_get_previous_state();
+
+                        /* Okay, we're now positioned to make the NUL
+                         * transition.  We couldn't have
+                         * tao_yy_get_previous_state() go ahead and do it
+                         * for us because it doesn't know how to deal
+                         * with the possibility of jamming (and we don't
+                         * want to build jamming into it because then it
+                         * will run more slowly).
+                         */
+
+                        tao_yy_next_state = tao_yy_try_NUL_trans( tao_yy_current_state );
+
+                        tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
+
+                        if ( tao_yy_next_state )
+                                {
+                                /* Consume the NUL. */
+                                tao_yy_cp = ++tao_yy_c_buf_p;
+                                tao_yy_current_state = tao_yy_next_state;
+                                goto tao_yy_match;
+                                }
+
+                        else
+                                {
+                                tao_yy_cp = tao_yy_c_buf_p;
+                                goto tao_yy_find_action;
+                                }
+                        }
+
+                else switch ( tao_yy_get_next_buffer() )
+                        {
+                        case EOB_ACT_END_OF_FILE:
+                                {
+                                tao_yy_did_buffer_switch_on_eof = 0;
+
+                                if ( tao_yywrap() )
+                                        {
+                                        /* Note: because we've taken care in
+                                         * tao_yy_get_next_buffer() to have set up
+                                         * tao_yytext, we can now set up
+                                         * tao_yy_c_buf_p so that if some total
+                                         * hoser (like flex itself) wants to
+                                         * call the scanner after we return the
+                                         * TAO_YY_NULL, it'll still work - another
+                                         * TAO_YY_NULL will get returned.
+                                         */
+                                        tao_yy_c_buf_p = tao_yytext_ptr + TAO_YY_MORE_ADJ;
+
+                                        tao_yy_act = TAO_YY_STATE_EOF(TAO_YY_START);
+                                        goto do_action;
+                                        }
+
+                                else
+                                        {
+                                        if ( ! tao_yy_did_buffer_switch_on_eof )
+                                                TAO_YY_NEW_FILE;
+                                        }
+                                break;
+                                }
+
+                        case EOB_ACT_CONTINUE_SCAN:
+                                tao_yy_c_buf_p =
+                                        tao_yytext_ptr + tao_yy_amount_of_matched_text;
+
+                                tao_yy_current_state = tao_yy_get_previous_state();
+
+                                tao_yy_cp = tao_yy_c_buf_p;
+                                tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
+                                goto tao_yy_match;
+
+                        case EOB_ACT_LAST_MATCH:
+                                tao_yy_c_buf_p =
+                                &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars];
+
+                                tao_yy_current_state = tao_yy_get_previous_state();
+
+                                tao_yy_cp = tao_yy_c_buf_p;
+                                tao_yy_bp = tao_yytext_ptr + TAO_YY_MORE_ADJ;
+                                goto tao_yy_find_action;
+                        }
+                break;
+                }
+
+        default:
+                TAO_YY_FATAL_ERROR(
+                        "fatal flex scanner internal error--no action found" );
+        } /* end of action switch */
+                } /* end of scanning one token */
+        } /* end of tao_yylex */
 
 
 /* tao_yy_get_next_buffer - try to read in a new buffer
  *
  * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
+ *      EOB_ACT_LAST_MATCH -
+ *      EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *      EOB_ACT_END_OF_FILE - end of file
  */
 
 static int tao_yy_get_next_buffer()
-	{
-	register char *dest = tao_yy_current_buffer->tao_yy_ch_buf;
-	register char *source = tao_yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( tao_yy_c_buf_p > &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars + 1] )
-		TAO_YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( tao_yy_current_buffer->tao_yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( tao_yy_c_buf_p - tao_yytext_ptr - TAO_YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (tao_yy_c_buf_p - tao_yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( tao_yy_current_buffer->tao_yy_buffer_status == TAO_YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			tao_yy_current_buffer->tao_yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
+        {
+        register char *dest = tao_yy_current_buffer->tao_yy_ch_buf;
+        register char *source = tao_yytext_ptr;
+        register int number_to_move, i;
+        int ret_val;
+
+        if ( tao_yy_c_buf_p > &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars + 1] )
+                TAO_YY_FATAL_ERROR(
+                "fatal flex scanner internal error--end of buffer missed" );
+
+        if ( tao_yy_current_buffer->tao_yy_fill_buffer == 0 )
+                { /* Don't try to fill the buffer, so this is an EOF. */
+                if ( tao_yy_c_buf_p - tao_yytext_ptr - TAO_YY_MORE_ADJ == 1 )
+                        {
+                        /* We matched a single character, the EOB, so
+                         * treat this as a final EOF.
+                         */
+                        return EOB_ACT_END_OF_FILE;
+                        }
+
+                else
+                        {
+                        /* We matched some text prior to the EOB, first
+                         * process it.
+                         */
+                        return EOB_ACT_LAST_MATCH;
+                        }
+                }
+
+        /* Try to read more data. */
+
+        /* First move last chars to start of buffer. */
+        number_to_move = (int) (tao_yy_c_buf_p - tao_yytext_ptr) - 1;
+
+        for ( i = 0; i < number_to_move; ++i )
+                *(dest++) = *(source++);
+
+        if ( tao_yy_current_buffer->tao_yy_buffer_status == TAO_YY_BUFFER_EOF_PENDING )
+                /* don't do the read, it's not guaranteed to return an EOF,
+                 * just force an EOF
+                 */
+                tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars = 0;
+
+        else
+                {
+                int num_to_read =
+                        tao_yy_current_buffer->tao_yy_buf_size - number_to_move - 1;
+
+                while ( num_to_read <= 0 )
+                        { /* Not enough room in the buffer - grow it. */
 #ifdef TAO_YY_USES_REJECT
-			TAO_YY_FATAL_ERROR(
+                        TAO_YY_FATAL_ERROR(
 "input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
 #else
 
-			/* just a shorter name for the current buffer */
-			TAO_YY_BUFFER_STATE b = tao_yy_current_buffer;
+                        /* just a shorter name for the current buffer */
+                        TAO_YY_BUFFER_STATE b = tao_yy_current_buffer;
 
-			int tao_yy_c_buf_p_offset =
-				(int) (tao_yy_c_buf_p - b->tao_yy_ch_buf);
+                        int tao_yy_c_buf_p_offset =
+                                (int) (tao_yy_c_buf_p - b->tao_yy_ch_buf);
 
-			if ( b->tao_yy_is_our_buffer )
-				{
-				int new_size = b->tao_yy_buf_size * 2;
+                        if ( b->tao_yy_is_our_buffer )
+                                {
+                                int new_size = b->tao_yy_buf_size * 2;
 
-				if ( new_size <= 0 )
-					b->tao_yy_buf_size += b->tao_yy_buf_size / 8;
-				else
-					b->tao_yy_buf_size *= 2;
+                                if ( new_size <= 0 )
+                                        b->tao_yy_buf_size += b->tao_yy_buf_size / 8;
+                                else
+                                        b->tao_yy_buf_size *= 2;
 
-				b->tao_yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					tao_yy_flex_realloc( (void *) b->tao_yy_ch_buf,
-							 b->tao_yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->tao_yy_ch_buf = 0;
+                                b->tao_yy_ch_buf = (char *)
+                                        /* Include room in for 2 EOB chars. */
+                                        tao_yy_flex_realloc( (void *) b->tao_yy_ch_buf,
+                                                         b->tao_yy_buf_size + 2 );
+                                }
+                        else
+                                /* Can't grow it, we don't own it. */
+                                b->tao_yy_ch_buf = 0;
 
-			if ( ! b->tao_yy_ch_buf )
-				TAO_YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
+                        if ( ! b->tao_yy_ch_buf )
+                                TAO_YY_FATAL_ERROR(
+                                "fatal error - scanner input buffer overflow" );
 
-			tao_yy_c_buf_p = &b->tao_yy_ch_buf[tao_yy_c_buf_p_offset];
+                        tao_yy_c_buf_p = &b->tao_yy_ch_buf[tao_yy_c_buf_p_offset];
 
-			num_to_read = tao_yy_current_buffer->tao_yy_buf_size -
-						number_to_move - 1;
+                        num_to_read = tao_yy_current_buffer->tao_yy_buf_size -
+                                                number_to_move - 1;
 #endif
-			}
-
-		if ( num_to_read > TAO_YY_READ_BUF_SIZE )
-			num_to_read = TAO_YY_READ_BUF_SIZE;
+                        }
 
-		/* Read in more data. */
-		TAO_YY_INPUT( (&tao_yy_current_buffer->tao_yy_ch_buf[number_to_move]),
-			tao_yy_n_chars, num_to_read );
+                if ( num_to_read > TAO_YY_READ_BUF_SIZE )
+                        num_to_read = TAO_YY_READ_BUF_SIZE;
 
-		tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars;
-		}
+                /* Read in more data. */
+                TAO_YY_INPUT( (&tao_yy_current_buffer->tao_yy_ch_buf[number_to_move]),
+                        tao_yy_n_chars, num_to_read );
 
-	if ( tao_yy_n_chars == 0 )
-		{
-		if ( number_to_move == TAO_YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			tao_yyrestart( tao_yyin );
-			}
+                tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars;
+                }
 
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			tao_yy_current_buffer->tao_yy_buffer_status =
-				TAO_YY_BUFFER_EOF_PENDING;
-			}
-		}
+        if ( tao_yy_n_chars == 0 )
+                {
+                if ( number_to_move == TAO_YY_MORE_ADJ )
+                        {
+                        ret_val = EOB_ACT_END_OF_FILE;
+                        tao_yyrestart( tao_yyin );
+                        }
+
+                else
+                        {
+                        ret_val = EOB_ACT_LAST_MATCH;
+                        tao_yy_current_buffer->tao_yy_buffer_status =
+                                TAO_YY_BUFFER_EOF_PENDING;
+                        }
+                }
 
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
+        else
+                ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	tao_yy_n_chars += number_to_move;
-	tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] = TAO_YY_END_OF_BUFFER_CHAR;
-	tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars + 1] = TAO_YY_END_OF_BUFFER_CHAR;
+        tao_yy_n_chars += number_to_move;
+        tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] = TAO_YY_END_OF_BUFFER_CHAR;
+        tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars + 1] = TAO_YY_END_OF_BUFFER_CHAR;
 
-	tao_yytext_ptr = &tao_yy_current_buffer->tao_yy_ch_buf[0];
+        tao_yytext_ptr = &tao_yy_current_buffer->tao_yy_ch_buf[0];
 
-	return ret_val;
-	}
+        return ret_val;
+        }
 
 
 /* tao_yy_get_previous_state - get the state just before the EOB char was reached */
 
 static tao_yy_state_type tao_yy_get_previous_state()
-	{
-	register tao_yy_state_type tao_yy_current_state;
-	register char *tao_yy_cp;
-
-	tao_yy_current_state = tao_yy_start;
-	tao_yy_current_state += TAO_YY_AT_BOL();
-
-	for ( tao_yy_cp = tao_yytext_ptr + TAO_YY_MORE_ADJ; tao_yy_cp < tao_yy_c_buf_p; ++tao_yy_cp )
-		{
-		register TAO_YY_CHAR tao_yy_c = (*tao_yy_cp ? tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)] : 1);
-		if ( tao_yy_accept[tao_yy_current_state] )
-			{
-			tao_yy_last_accepting_state = tao_yy_current_state;
-			tao_yy_last_accepting_cpos = tao_yy_cp;
-			}
-		while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-			{
-			tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-			if ( tao_yy_current_state >= 288 )
-				tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-			}
-		tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-		}
-
-	return tao_yy_current_state;
-	}
+        {
+        register tao_yy_state_type tao_yy_current_state;
+        register char *tao_yy_cp;
+
+        tao_yy_current_state = tao_yy_start;
+        tao_yy_current_state += TAO_YY_AT_BOL();
+
+        for ( tao_yy_cp = tao_yytext_ptr + TAO_YY_MORE_ADJ; tao_yy_cp < tao_yy_c_buf_p; ++tao_yy_cp )
+                {
+                register TAO_YY_CHAR tao_yy_c = (*tao_yy_cp ? tao_yy_ec[TAO_YY_SC_TO_UI(*tao_yy_cp)] : 1);
+                if ( tao_yy_accept[tao_yy_current_state] )
+                        {
+                        tao_yy_last_accepting_state = tao_yy_current_state;
+                        tao_yy_last_accepting_cpos = tao_yy_cp;
+                        }
+                while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
+                        {
+                        tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
+                        if ( tao_yy_current_state >= 339 )
+                                tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
+                        }
+                tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
+                }
+
+        return tao_yy_current_state;
+        }
 
 
 /* tao_yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
- *	next_state = tao_yy_try_NUL_trans( current_state );
+ *      next_state = tao_yy_try_NUL_trans( current_state );
  */
 
 #ifdef TAO_YY_USE_PROTOS
@@ -1624,27 +1703,27 @@ static tao_yy_state_type tao_yy_try_NUL_trans( tao_yy_state_type tao_yy_current_
 static tao_yy_state_type tao_yy_try_NUL_trans( tao_yy_current_state )
 tao_yy_state_type tao_yy_current_state;
 #endif
-	{
-	register int tao_yy_is_jam;
-	register char *tao_yy_cp = tao_yy_c_buf_p;
-
-	register TAO_YY_CHAR tao_yy_c = 1;
-	if ( tao_yy_accept[tao_yy_current_state] )
-		{
-		tao_yy_last_accepting_state = tao_yy_current_state;
-		tao_yy_last_accepting_cpos = tao_yy_cp;
-		}
-	while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
-		{
-		tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
-		if ( tao_yy_current_state >= 288 )
-			tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
-		}
-	tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
-	tao_yy_is_jam = (tao_yy_current_state == 287);
-
-	return tao_yy_is_jam ? 0 : tao_yy_current_state;
-	}
+        {
+        register int tao_yy_is_jam;
+        register char *tao_yy_cp = tao_yy_c_buf_p;
+
+        register TAO_YY_CHAR tao_yy_c = 1;
+        if ( tao_yy_accept[tao_yy_current_state] )
+                {
+                tao_yy_last_accepting_state = tao_yy_current_state;
+                tao_yy_last_accepting_cpos = tao_yy_cp;
+                }
+        while ( tao_yy_chk[tao_yy_base[tao_yy_current_state] + tao_yy_c] != tao_yy_current_state )
+                {
+                tao_yy_current_state = (int) tao_yy_def[tao_yy_current_state];
+                if ( tao_yy_current_state >= 339 )
+                        tao_yy_c = tao_yy_meta[(unsigned int) tao_yy_c];
+                }
+        tao_yy_current_state = tao_yy_nxt[tao_yy_base[tao_yy_current_state] + (unsigned int) tao_yy_c];
+        tao_yy_is_jam = (tao_yy_current_state == 338);
+
+        return tao_yy_is_jam ? 0 : tao_yy_current_state;
+        }
 
 
 #ifndef TAO_YY_NO_UNPUT
@@ -1655,41 +1734,41 @@ static void tao_yyunput( c, tao_yy_bp )
 int c;
 register char *tao_yy_bp;
 #endif
-	{
-	register char *tao_yy_cp = tao_yy_c_buf_p;
-
-	/* undo effects of setting up tao_yytext */
-	*tao_yy_cp = tao_yy_hold_char;
-
-	if ( tao_yy_cp < tao_yy_current_buffer->tao_yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = tao_yy_n_chars + 2;
-		register char *dest = &tao_yy_current_buffer->tao_yy_ch_buf[
-					tao_yy_current_buffer->tao_yy_buf_size + 2];
-		register char *source =
-				&tao_yy_current_buffer->tao_yy_ch_buf[number_to_move];
-
-		while ( source > tao_yy_current_buffer->tao_yy_ch_buf )
-			*--dest = *--source;
-
-		tao_yy_cp += (int) (dest - source);
-		tao_yy_bp += (int) (dest - source);
-		tao_yy_current_buffer->tao_yy_n_chars =
-			tao_yy_n_chars = tao_yy_current_buffer->tao_yy_buf_size;
-
-		if ( tao_yy_cp < tao_yy_current_buffer->tao_yy_ch_buf + 2 )
-			TAO_YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
+        {
+        register char *tao_yy_cp = tao_yy_c_buf_p;
+
+        /* undo effects of setting up tao_yytext */
+        *tao_yy_cp = tao_yy_hold_char;
+
+        if ( tao_yy_cp < tao_yy_current_buffer->tao_yy_ch_buf + 2 )
+                { /* need to shift things up to make room */
+                /* +2 for EOB chars. */
+                register int number_to_move = tao_yy_n_chars + 2;
+                register char *dest = &tao_yy_current_buffer->tao_yy_ch_buf[
+                                        tao_yy_current_buffer->tao_yy_buf_size + 2];
+                register char *source =
+                                &tao_yy_current_buffer->tao_yy_ch_buf[number_to_move];
+
+                while ( source > tao_yy_current_buffer->tao_yy_ch_buf )
+                        *--dest = *--source;
+
+                tao_yy_cp += (int) (dest - source);
+                tao_yy_bp += (int) (dest - source);
+                tao_yy_current_buffer->tao_yy_n_chars =
+                        tao_yy_n_chars = tao_yy_current_buffer->tao_yy_buf_size;
+
+                if ( tao_yy_cp < tao_yy_current_buffer->tao_yy_ch_buf + 2 )
+                        TAO_YY_FATAL_ERROR( "flex scanner push-back overflow" );
+                }
 
-	*--tao_yy_cp = (char) c;
+        *--tao_yy_cp = (char) c;
 
 
-	tao_yytext_ptr = tao_yy_bp;
-	tao_yy_hold_char = *tao_yy_cp;
-	tao_yy_c_buf_p = tao_yy_cp;
-	}
-#endif	/* ifndef TAO_YY_NO_UNPUT */
+        tao_yytext_ptr = tao_yy_bp;
+        tao_yy_hold_char = *tao_yy_cp;
+        tao_yy_c_buf_p = tao_yy_cp;
+        }
+#endif  /* ifndef TAO_YY_NO_UNPUT */
 
 
 #ifdef __cplusplus
@@ -1697,73 +1776,73 @@ static int tao_yyinput()
 #else
 static int input()
 #endif
-	{
-	int c;
-
-	*tao_yy_c_buf_p = tao_yy_hold_char;
-
-	if ( *tao_yy_c_buf_p == TAO_YY_END_OF_BUFFER_CHAR )
-		{
-		/* tao_yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( tao_yy_c_buf_p < &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] )
-			/* This was really a NUL. */
-			*tao_yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = tao_yy_c_buf_p - tao_yytext_ptr;
-			++tao_yy_c_buf_p;
-
-			switch ( tao_yy_get_next_buffer() )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because tao_yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					tao_yyrestart( tao_yyin );
-
-					/* fall through */
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( tao_yywrap() )
-						return EOF;
-
-					if ( ! tao_yy_did_buffer_switch_on_eof )
-						TAO_YY_NEW_FILE;
+        {
+        int c;
+
+        *tao_yy_c_buf_p = tao_yy_hold_char;
+
+        if ( *tao_yy_c_buf_p == TAO_YY_END_OF_BUFFER_CHAR )
+                {
+                /* tao_yy_c_buf_p now points to the character we want to return.
+                 * If this occurs *before* the EOB characters, then it's a
+                 * valid NUL; if not, then we've hit the end of the buffer.
+                 */
+                if ( tao_yy_c_buf_p < &tao_yy_current_buffer->tao_yy_ch_buf[tao_yy_n_chars] )
+                        /* This was really a NUL. */
+                        *tao_yy_c_buf_p = '\0';
+
+                else
+                        { /* need more input */
+                        int offset = tao_yy_c_buf_p - tao_yytext_ptr;
+                        ++tao_yy_c_buf_p;
+
+                        switch ( tao_yy_get_next_buffer() )
+                                {
+                                case EOB_ACT_LAST_MATCH:
+                                        /* This happens because tao_yy_g_n_b()
+                                         * sees that we've accumulated a
+                                         * token and flags that we need to
+                                         * try matching the token before
+                                         * proceeding.  But for input(),
+                                         * there's no matching to consider.
+                                         * So convert the EOB_ACT_LAST_MATCH
+                                         * to EOB_ACT_END_OF_FILE.
+                                         */
+
+                                        /* Reset buffer status. */
+                                        tao_yyrestart( tao_yyin );
+
+                                        /* fall through */
+
+                                case EOB_ACT_END_OF_FILE:
+                                        {
+                                        if ( tao_yywrap() )
+                                                return EOF;
+
+                                        if ( ! tao_yy_did_buffer_switch_on_eof )
+                                                TAO_YY_NEW_FILE;
 #ifdef __cplusplus
-					return tao_yyinput();
+                                        return tao_yyinput();
 #else
-					return input();
+                                        return input();
 #endif
-					}
+                                        }
 
-				case EOB_ACT_CONTINUE_SCAN:
-					tao_yy_c_buf_p = tao_yytext_ptr + offset;
-					break;
-				}
-			}
-		}
+                                case EOB_ACT_CONTINUE_SCAN:
+                                        tao_yy_c_buf_p = tao_yytext_ptr + offset;
+                                        break;
+                                }
+                        }
+                }
 
-	c = *(unsigned char *) tao_yy_c_buf_p;	/* cast for 8-bit char's */
-	*tao_yy_c_buf_p = '\0';	/* preserve tao_yytext */
-	tao_yy_hold_char = *++tao_yy_c_buf_p;
+        c = *(unsigned char *) tao_yy_c_buf_p;  /* cast for 8-bit char's */
+        *tao_yy_c_buf_p = '\0'; /* preserve tao_yytext */
+        tao_yy_hold_char = *++tao_yy_c_buf_p;
 
-	tao_yy_current_buffer->tao_yy_at_bol = (c == '\n');
+        tao_yy_current_buffer->tao_yy_at_bol = (c == '\n');
 
-	return c;
-	}
+        return c;
+        }
 
 
 #ifdef TAO_YY_USE_PROTOS
@@ -1772,13 +1851,13 @@ void tao_yyrestart( FILE *input_file )
 void tao_yyrestart( input_file )
 FILE *input_file;
 #endif
-	{
-	if ( ! tao_yy_current_buffer )
-		tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE );
+        {
+        if ( ! tao_yy_current_buffer )
+                tao_yy_current_buffer = tao_yy_create_buffer( tao_yyin, TAO_YY_BUF_SIZE );
 
-	tao_yy_init_buffer( tao_yy_current_buffer, input_file );
-	tao_yy_load_buffer_state();
-	}
+        tao_yy_init_buffer( tao_yy_current_buffer, input_file );
+        tao_yy_load_buffer_state();
+        }
 
 
 #ifdef TAO_YY_USE_PROTOS
@@ -1787,28 +1866,28 @@ void tao_yy_switch_to_buffer( TAO_YY_BUFFER_STATE new_buffer )
 void tao_yy_switch_to_buffer( new_buffer )
 TAO_YY_BUFFER_STATE new_buffer;
 #endif
-	{
-	if ( tao_yy_current_buffer == new_buffer )
-		return;
-
-	if ( tao_yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*tao_yy_c_buf_p = tao_yy_hold_char;
-		tao_yy_current_buffer->tao_yy_buf_pos = tao_yy_c_buf_p;
-		tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars;
-		}
+        {
+        if ( tao_yy_current_buffer == new_buffer )
+                return;
+
+        if ( tao_yy_current_buffer )
+                {
+                /* Flush out information for old buffer. */
+                *tao_yy_c_buf_p = tao_yy_hold_char;
+                tao_yy_current_buffer->tao_yy_buf_pos = tao_yy_c_buf_p;
+                tao_yy_current_buffer->tao_yy_n_chars = tao_yy_n_chars;
+                }
 
-	tao_yy_current_buffer = new_buffer;
-	tao_yy_load_buffer_state();
+        tao_yy_current_buffer = new_buffer;
+        tao_yy_load_buffer_state();
 
-	/* We don't actually know whether we did this switch during
-	 * EOF (tao_yywrap()) processing, but the only time this flag
-	 * is looked at is after tao_yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	tao_yy_did_buffer_switch_on_eof = 1;
-	}
+        /* We don't actually know whether we did this switch during
+         * EOF (tao_yywrap()) processing, but the only time this flag
+         * is looked at is after tao_yywrap() is called, so it's safe
+         * to go ahead and always set it.
+         */
+        tao_yy_did_buffer_switch_on_eof = 1;
+        }
 
 
 #ifdef TAO_YY_USE_PROTOS
@@ -1816,12 +1895,12 @@ void tao_yy_load_buffer_state( void )
 #else
 void tao_yy_load_buffer_state()
 #endif
-	{
-	tao_yy_n_chars = tao_yy_current_buffer->tao_yy_n_chars;
-	tao_yytext_ptr = tao_yy_c_buf_p = tao_yy_current_buffer->tao_yy_buf_pos;
-	tao_yyin = tao_yy_current_buffer->tao_yy_input_file;
-	tao_yy_hold_char = *tao_yy_c_buf_p;
-	}
+        {
+        tao_yy_n_chars = tao_yy_current_buffer->tao_yy_n_chars;
+        tao_yytext_ptr = tao_yy_c_buf_p = tao_yy_current_buffer->tao_yy_buf_pos;
+        tao_yyin = tao_yy_current_buffer->tao_yy_input_file;
+        tao_yy_hold_char = *tao_yy_c_buf_p;
+        }
 
 
 #ifdef TAO_YY_USE_PROTOS
@@ -1831,28 +1910,28 @@ TAO_YY_BUFFER_STATE tao_yy_create_buffer( file, size )
 FILE *file;
 int size;
 #endif
-	{
-	TAO_YY_BUFFER_STATE b;
+        {
+        TAO_YY_BUFFER_STATE b;
 
-	b = (TAO_YY_BUFFER_STATE) tao_yy_flex_alloc( sizeof( struct tao_yy_buffer_state ) );
-	if ( ! b )
-		TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
+        b = (TAO_YY_BUFFER_STATE) tao_yy_flex_alloc( sizeof( struct tao_yy_buffer_state ) );
+        if ( ! b )
+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
 
-	b->tao_yy_buf_size = size;
+        b->tao_yy_buf_size = size;
 
-	/* tao_yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->tao_yy_ch_buf = (char *) tao_yy_flex_alloc( b->tao_yy_buf_size + 2 );
-	if ( ! b->tao_yy_ch_buf )
-		TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
+        /* tao_yy_ch_buf has to be 2 characters longer than the size given because
+         * we need to put in 2 end-of-buffer characters.
+         */
+        b->tao_yy_ch_buf = (char *) tao_yy_flex_alloc( b->tao_yy_buf_size + 2 );
+        if ( ! b->tao_yy_ch_buf )
+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_create_buffer()" );
 
-	b->tao_yy_is_our_buffer = 1;
+        b->tao_yy_is_our_buffer = 1;
 
-	tao_yy_init_buffer( b, file );
+        tao_yy_init_buffer( b, file );
 
-	return b;
-	}
+        return b;
+        }
 
 
 #ifdef TAO_YY_USE_PROTOS
@@ -1861,18 +1940,18 @@ void tao_yy_delete_buffer( TAO_YY_BUFFER_STATE b )
 void tao_yy_delete_buffer( b )
 TAO_YY_BUFFER_STATE b;
 #endif
-	{
-	if ( ! b )
-		return;
+        {
+        if ( ! b )
+                return;
 
-	if ( b == tao_yy_current_buffer )
-		tao_yy_current_buffer = (TAO_YY_BUFFER_STATE) 0;
+        if ( b == tao_yy_current_buffer )
+                tao_yy_current_buffer = (TAO_YY_BUFFER_STATE) 0;
 
-	if ( b->tao_yy_is_our_buffer )
-		tao_yy_flex_free( (void *) b->tao_yy_ch_buf );
+        if ( b->tao_yy_is_our_buffer )
+                tao_yy_flex_free( (void *) b->tao_yy_ch_buf );
 
-	tao_yy_flex_free( (void *) b );
-	}
+        tao_yy_flex_free( (void *) b );
+        }
 
 
 #ifndef TAO_YY_ALWAYS_INTERACTIVE
@@ -1890,22 +1969,22 @@ FILE *file;
 #endif
 
 
-	{
-	tao_yy_flush_buffer( b );
+        {
+        tao_yy_flush_buffer( b );
 
-	b->tao_yy_input_file = file;
-	b->tao_yy_fill_buffer = 1;
+        b->tao_yy_input_file = file;
+        b->tao_yy_fill_buffer = 1;
 
 #if TAO_YY_ALWAYS_INTERACTIVE
-	b->tao_yy_is_interactive = 1;
+        b->tao_yy_is_interactive = 1;
 #else
 #if TAO_YY_NEVER_INTERACTIVE
-	b->tao_yy_is_interactive = 0;
+        b->tao_yy_is_interactive = 0;
 #else
-	b->tao_yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+        b->tao_yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
 #endif
 #endif
-	}
+        }
 
 
 #ifdef TAO_YY_USE_PROTOS
@@ -1915,27 +1994,27 @@ void tao_yy_flush_buffer( b )
 TAO_YY_BUFFER_STATE b;
 #endif
 
-	{
-	if ( ! b )
-		return;
+        {
+        if ( ! b )
+                return;
 
-	b->tao_yy_n_chars = 0;
+        b->tao_yy_n_chars = 0;
 
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->tao_yy_ch_buf[0] = TAO_YY_END_OF_BUFFER_CHAR;
-	b->tao_yy_ch_buf[1] = TAO_YY_END_OF_BUFFER_CHAR;
+        /* We always need two end-of-buffer characters.  The first causes
+         * a transition to the end-of-buffer state.  The second causes
+         * a jam in that state.
+         */
+        b->tao_yy_ch_buf[0] = TAO_YY_END_OF_BUFFER_CHAR;
+        b->tao_yy_ch_buf[1] = TAO_YY_END_OF_BUFFER_CHAR;
 
-	b->tao_yy_buf_pos = &b->tao_yy_ch_buf[0];
+        b->tao_yy_buf_pos = &b->tao_yy_ch_buf[0];
 
-	b->tao_yy_at_bol = 1;
-	b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
+        b->tao_yy_at_bol = 1;
+        b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
 
-	if ( b == tao_yy_current_buffer )
-		tao_yy_load_buffer_state();
-	}
+        if ( b == tao_yy_current_buffer )
+                tao_yy_load_buffer_state();
+        }
 
 
 #ifndef TAO_YY_NO_SCAN_BUFFER
@@ -1946,33 +2025,33 @@ TAO_YY_BUFFER_STATE tao_yy_scan_buffer( base, size )
 char *base;
 tao_yy_size_t size;
 #endif
-	{
-	TAO_YY_BUFFER_STATE b;
-
-	if ( size < 2 ||
-	     base[size-2] != TAO_YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != TAO_YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (TAO_YY_BUFFER_STATE) tao_yy_flex_alloc( sizeof( struct tao_yy_buffer_state ) );
-	if ( ! b )
-		TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_buffer()" );
-
-	b->tao_yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->tao_yy_buf_pos = b->tao_yy_ch_buf = base;
-	b->tao_yy_is_our_buffer = 0;
-	b->tao_yy_input_file = 0;
-	b->tao_yy_n_chars = b->tao_yy_buf_size;
-	b->tao_yy_is_interactive = 0;
-	b->tao_yy_at_bol = 1;
-	b->tao_yy_fill_buffer = 0;
-	b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
-
-	tao_yy_switch_to_buffer( b );
-
-	return b;
-	}
+        {
+        TAO_YY_BUFFER_STATE b;
+
+        if ( size < 2 ||
+             base[size-2] != TAO_YY_END_OF_BUFFER_CHAR ||
+             base[size-1] != TAO_YY_END_OF_BUFFER_CHAR )
+                /* They forgot to leave room for the EOB's. */
+                return 0;
+
+        b = (TAO_YY_BUFFER_STATE) tao_yy_flex_alloc( sizeof( struct tao_yy_buffer_state ) );
+        if ( ! b )
+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_buffer()" );
+
+        b->tao_yy_buf_size = size - 2;  /* "- 2" to take care of EOB's */
+        b->tao_yy_buf_pos = b->tao_yy_ch_buf = base;
+        b->tao_yy_is_our_buffer = 0;
+        b->tao_yy_input_file = 0;
+        b->tao_yy_n_chars = b->tao_yy_buf_size;
+        b->tao_yy_is_interactive = 0;
+        b->tao_yy_at_bol = 1;
+        b->tao_yy_fill_buffer = 0;
+        b->tao_yy_buffer_status = TAO_YY_BUFFER_NEW;
+
+        tao_yy_switch_to_buffer( b );
+
+        return b;
+        }
 #endif
 
 
@@ -1983,13 +2062,13 @@ TAO_YY_BUFFER_STATE tao_yy_scan_string( tao_yyconst char *tao_yy_str )
 TAO_YY_BUFFER_STATE tao_yy_scan_string( tao_yy_str )
 tao_yyconst char *tao_yy_str;
 #endif
-	{
-	int len;
-	for ( len = 0; tao_yy_str[len]; ++len )
-		;
+        {
+        int len;
+        for ( len = 0; tao_yy_str[len]; ++len )
+                ;
 
-	return tao_yy_scan_bytes( tao_yy_str, len );
-	}
+        return tao_yy_scan_bytes( tao_yy_str, len );
+        }
 #endif
 
 
@@ -2001,34 +2080,34 @@ TAO_YY_BUFFER_STATE tao_yy_scan_bytes( bytes, len )
 tao_yyconst char *bytes;
 int len;
 #endif
-	{
-	TAO_YY_BUFFER_STATE b;
-	char *buf;
-	tao_yy_size_t n;
-	int i;
+        {
+        TAO_YY_BUFFER_STATE b;
+        char *buf;
+        tao_yy_size_t n;
+        int i;
 
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) tao_yy_flex_alloc( n );
-	if ( ! buf )
-		TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_bytes()" );
+        /* Get memory for full buffer, including space for trailing EOB's. */
+        n = len + 2;
+        buf = (char *) tao_yy_flex_alloc( n );
+        if ( ! buf )
+                TAO_YY_FATAL_ERROR( "out of dynamic memory in tao_yy_scan_bytes()" );
 
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
+        for ( i = 0; i < len; ++i )
+                buf[i] = bytes[i];
 
-	buf[len] = buf[len+1] = TAO_YY_END_OF_BUFFER_CHAR;
+        buf[len] = buf[len+1] = TAO_YY_END_OF_BUFFER_CHAR;
 
-	b = tao_yy_scan_buffer( buf, n );
-	if ( ! b )
-		TAO_YY_FATAL_ERROR( "bad buffer in tao_yy_scan_bytes()" );
+        b = tao_yy_scan_buffer( buf, n );
+        if ( ! b )
+                TAO_YY_FATAL_ERROR( "bad buffer in tao_yy_scan_bytes()" );
 
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->tao_yy_is_our_buffer = 1;
+        /* It's okay to grow etc. this buffer, and we should throw it
+         * away when we're done.
+         */
+        b->tao_yy_is_our_buffer = 1;
 
-	return b;
-	}
+        return b;
+        }
 #endif
 
 
@@ -2039,49 +2118,49 @@ static void tao_yy_push_state( int new_state )
 static void tao_yy_push_state( new_state )
 int new_state;
 #endif
-	{
-	if ( tao_yy_start_stack_ptr >= tao_yy_start_stack_depth )
-		{
-		tao_yy_size_t new_size;
+        {
+        if ( tao_yy_start_stack_ptr >= tao_yy_start_stack_depth )
+                {
+                tao_yy_size_t new_size;
 
-		tao_yy_start_stack_depth += TAO_YY_START_STACK_INCR;
-		new_size = tao_yy_start_stack_depth * sizeof( int );
+                tao_yy_start_stack_depth += TAO_YY_START_STACK_INCR;
+                new_size = tao_yy_start_stack_depth * sizeof( int );
 
-		if ( ! tao_yy_start_stack )
-			tao_yy_start_stack = (int *) tao_yy_flex_alloc( new_size );
+                if ( ! tao_yy_start_stack )
+                        tao_yy_start_stack = (int *) tao_yy_flex_alloc( new_size );
 
-		else
-			tao_yy_start_stack = (int *) tao_yy_flex_realloc(
-					(void *) tao_yy_start_stack, new_size );
+                else
+                        tao_yy_start_stack = (int *) tao_yy_flex_realloc(
+                                        (void *) tao_yy_start_stack, new_size );
 
-		if ( ! tao_yy_start_stack )
-			TAO_YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
+                if ( ! tao_yy_start_stack )
+                        TAO_YY_FATAL_ERROR(
+                        "out of memory expanding start-condition stack" );
+                }
 
-	tao_yy_start_stack[tao_yy_start_stack_ptr++] = TAO_YY_START;
+        tao_yy_start_stack[tao_yy_start_stack_ptr++] = TAO_YY_START;
 
-	BEGIN(new_state);
-	}
+        BEGIN(new_state);
+        }
 #endif
 
 
 #ifndef TAO_YY_NO_POP_STATE
 static void tao_yy_pop_state()
-	{
-	if ( --tao_yy_start_stack_ptr < 0 )
-		TAO_YY_FATAL_ERROR( "start-condition stack underflow" );
+        {
+        if ( --tao_yy_start_stack_ptr < 0 )
+                TAO_YY_FATAL_ERROR( "start-condition stack underflow" );
 
-	BEGIN(tao_yy_start_stack[tao_yy_start_stack_ptr]);
-	}
+        BEGIN(tao_yy_start_stack[tao_yy_start_stack_ptr]);
+        }
 #endif
 
 
 #ifndef TAO_YY_NO_TOP_STATE
 static int tao_yy_top_state()
-	{
-	return tao_yy_start_stack[tao_yy_start_stack_ptr - 1];
-	}
+        {
+        return tao_yy_start_stack[tao_yy_start_stack_ptr - 1];
+        }
 #endif
 
 #ifndef TAO_YY_EXIT_FAILURE
@@ -2094,10 +2173,10 @@ static void tao_yy_fatal_error( tao_yyconst char msg[] )
 static void tao_yy_fatal_error( msg )
 char msg[];
 #endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	ACE_OS::exit (TAO_YY_EXIT_FAILURE);
-	}
+        {
+        (void) fprintf( stderr, "%s\n", msg );
+        exit( TAO_YY_EXIT_FAILURE );
+        }
 
 
 
@@ -2105,16 +2184,16 @@ char msg[];
 
 #undef tao_yyless
 #define tao_yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up tao_yytext. */ \
-		tao_yytext[tao_yyleng] = tao_yy_hold_char; \
-		tao_yy_c_buf_p = tao_yytext + n; \
-		tao_yy_hold_char = *tao_yy_c_buf_p; \
-		*tao_yy_c_buf_p = '\0'; \
-		tao_yyleng = n; \
-		} \
-	while ( 0 )
+        do \
+                { \
+                /* Undo effects of setting up tao_yytext. */ \
+                tao_yytext[tao_yyleng] = tao_yy_hold_char; \
+                tao_yy_c_buf_p = tao_yytext + n; \
+                tao_yy_hold_char = *tao_yy_c_buf_p; \
+                *tao_yy_c_buf_p = '\0'; \
+                tao_yyleng = n; \
+                } \
+        while ( 0 )
 
 
 /* Internal utility routines. */
@@ -2128,11 +2207,11 @@ char *s1;
 tao_yyconst char *s2;
 int n;
 #endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
+        {
+        register int i;
+        for ( i = 0; i < n; ++i )
+                s1[i] = s2[i];
+        }
 #endif
 
 #ifdef TAO_YY_NEED_STRLEN
@@ -2142,13 +2221,13 @@ static int tao_yy_flex_strlen( tao_yyconst char *s )
 static int tao_yy_flex_strlen( s )
 tao_yyconst char *s;
 #endif
-	{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
+        {
+        register int n;
+        for ( n = 0; s[n]; ++n )
+                ;
 
-	return n;
-	}
+        return n;
+        }
 #endif
 
 
@@ -2158,9 +2237,9 @@ static void *tao_yy_flex_alloc( tao_yy_size_t size )
 static void *tao_yy_flex_alloc( size )
 tao_yy_size_t size;
 #endif
-	{
-	return (void *) malloc( size );
-	}
+        {
+        return (void *) malloc( size );
+        }
 
 #ifdef TAO_YY_USE_PROTOS
 static void *tao_yy_flex_realloc( void *ptr, tao_yy_size_t size )
@@ -2169,16 +2248,16 @@ static void *tao_yy_flex_realloc( ptr, size )
 void *ptr;
 tao_yy_size_t size;
 #endif
-	{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-	}
+        {
+        /* The cast to (char *) in the following accommodates both
+         * implementations that use char* generic pointers, and those
+         * that use void* generic pointers.  It works with the latter
+         * because both ANSI C and C++ allow castless assignment from
+         * any pointer type to void*, and deal with argument conversions
+         * as though doing an assignment.
+         */
+        return (void *) realloc( (char *) ptr, size );
+        }
 
 #ifdef TAO_YY_USE_PROTOS
 static void tao_yy_flex_free( void *ptr )
@@ -2186,20 +2265,20 @@ static void tao_yy_flex_free( void *ptr )
 static void tao_yy_flex_free( ptr )
 void *ptr;
 #endif
-	{
-	free( ptr );
-	}
+        {
+        free( ptr );
+        }
 
 #if TAO_YY_MAIN
 int main()
-	{
-	tao_yylex();
-	return 0;
-	}
+        {
+        tao_yylex();
+        return 0;
+        }
 #endif
-#line 263 "fe/idl.ll"
+#line 284 "fe/idl.ll"
 
-	/* subroutines */
+        /* subroutines */
 
 /*
  * Strip down a name to the last component, i.e. everything after the last
@@ -2208,11 +2287,11 @@ int main()
 static char *
 stripped_name(UTL_String *fn)
 {
-    char	*n = fn->get_string();
-    long	l;
+    char        *n = fn->get_string();
+    long        l;
 
     if (n == NULL)
-	return NULL;
+        return NULL;
     l = strlen(n);
     for (n += l; l > 0 && *n != '/'; l--, n--);
     if (*n == '/') n++;
@@ -2225,9 +2304,9 @@ stripped_name(UTL_String *fn)
 static void
 idl_parse_line_and_file(char *buf)
 {
-  char		*r = buf;
-  char 		*h;
-  UTL_String	*nm;
+  char          *r = buf;
+  char          *h;
+  UTL_String    *nm;
 
   /* Skip initial '#' */
   if (*r != '#')
@@ -2270,9 +2349,9 @@ idl_parse_line_and_file(char *buf)
       for (i = 0, j = 0; h[j] != '\0'; i++, j++)
         {
           if (h[j] == '\\' && h[j + 1] == '\\')
-	    j++;
+            j++;
 
-	  h[i] = h[j];
+          h[i] = h[j];
         }
       h[i] = '\0';
       idl_global->set_filename(new String(h));
@@ -2307,7 +2386,7 @@ idl_store_pragma(char *buf)
       while (*sp != '\n')
         {
           *tp = *sp;
-	  ++tp; ++sp;
+          ++tp; ++sp;
         }
     }
 
@@ -2338,32 +2417,32 @@ idl_store_pragma(char *buf)
 static long
 idl_atoi(char *s, long b)
 {
-	long	r = 0;
-	long	negative = 0;
-
-	if (*s == '-') {
-	  negative = 1;
-	  s++;
-	}
-	if (b == 8 && *s == '0')
-	  s++;
-	else if (b == 16 && *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
-	  s += 2;
-
-	for (; *s; s++)
-	  if (*s <= '9' && *s >= '0')
-	    r = (r * b) + (*s - '0');
-	  else if (b > 10 && *s <= 'f' && *s >= 'a')
-	    r = (r * b) + (*s - 'a' + 10);
-	  else if (b > 10 && *s <= 'F' && *s >= 'A')
-	    r = (r * b) + (*s - 'A' + 10);
-	  else
-	    break;
-
-	if (negative)
-	  r *= -1;
-
-	return r;
+        long    r = 0;
+        long    negative = 0;
+
+        if (*s == '-') {
+          negative = 1;
+          s++;
+        }
+        if (b == 8 && *s == '0')
+          s++;
+        else if (b == 16 && *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
+          s += 2;
+
+        for (; *s; s++)
+          if (*s <= '9' && *s >= '0')
+            r = (r * b) + (*s - '0');
+          else if (b > 10 && *s <= 'f' && *s >= 'a')
+            r = (r * b) + (*s - 'a' + 10);
+          else if (b > 10 && *s <= 'F' && *s >= 'A')
+            r = (r * b) + (*s - 'A' + 10);
+          else
+            break;
+
+        if (negative)
+          r *= -1;
+
+        return r;
 }
 
 /*
@@ -2372,56 +2451,56 @@ idl_atoi(char *s, long b)
 static double
 idl_atof(char *s)
 {
-	char    *h = s;
-	double	d = 0.0;
-	double	f = 0.0;
-	double	e, k;
-	long	neg = 0, negexp = 0;
-
-	ACE_UNUSED_ARG (f);
-	ACE_UNUSED_ARG (h);
-
-	if (*s == '-') {
-	  neg = 1;
-	  s++;
-	}
-	while (*s >= '0' && *s <= '9') {
-		d = (d * 10) + *s - '0';
-		s++;
-	}
-	if (*s == '.') {
-		s++;
-		e = 10;
-		while (*s >= '0' && *s <= '9') {
-			d += (*s - '0') / (e * 1.0);
-			e *= 10;
-			s++;
-		}
-	}
-	if (*s == 'e' || *s == 'E') {
-		s++;
-		if (*s == '-') {
-			negexp = 1;
-			s++;
-		} else if (*s == '+')
-			s++;
-		e = 0;
-		while (*s >= '0' && *s <= '9') {
-			e = (e * 10) + *s - '0';
-			s++;
-		}
-		if (e > 0) {
-			for (k = 1; e > 0; k *= 10, e--);
-			if (negexp)
-				d /= k;
-			else
-				d *= k;
-		}
-	}
-
-	if (neg) d *= -1.0;
-
-	return d;
+        char    *h = s;
+        double  d = 0.0;
+        double  f = 0.0;
+        double  e, k;
+        long    neg = 0, negexp = 0;
+
+        ACE_UNUSED_ARG (f);
+        ACE_UNUSED_ARG (h);
+
+        if (*s == '-') {
+          neg = 1;
+          s++;
+        }
+        while (*s >= '0' && *s <= '9') {
+                d = (d * 10) + *s - '0';
+                s++;
+        }
+        if (*s == '.') {
+                s++;
+                e = 10;
+                while (*s >= '0' && *s <= '9') {
+                        d += (*s - '0') / (e * 1.0);
+                        e *= 10;
+                        s++;
+                }
+        }
+        if (*s == 'e' || *s == 'E') {
+                s++;
+                if (*s == '-') {
+                        negexp = 1;
+                        s++;
+                } else if (*s == '+')
+                        s++;
+                e = 0;
+                while (*s >= '0' && *s <= '9') {
+                        e = (e * 10) + *s - '0';
+                        s++;
+                }
+                if (e > 0) {
+                        for (k = 1; e > 0; k *= 10, e--);
+                        if (negexp)
+                                d /= k;
+                        else
+                                d *= k;
+                }
+        }
+
+        if (neg) d *= -1.0;
+
+        return d;
 }
 
 /*
@@ -2433,61 +2512,61 @@ idl_escape_reader(
 )
 {
     if (str[0] != '\\') {
-	return str[0];
+        return str[0];
     }
 
     switch (str[1]) {
       case 'n':
-	return '\n';
+        return '\n';
       case 't':
-	return '\t';
+        return '\t';
       case 'v':
-	return '\v';
+        return '\v';
       case 'b':
-	return '\b';
+        return '\b';
       case 'r':
-	return '\r';
+        return '\r';
       case 'f':
-	return '\f';
+        return '\f';
       case 'a':
-	return '\a';
+        return '\a';
       case '\\':
-	return '\\';
+        return '\\';
       case '\?':
-	return '?';
+        return '?';
       case '\'':
-	return '\'';
+        return '\'';
       case '"':
-	return '"';
+        return '"';
       case 'x':
-	{
-	    int i;
-	    // hex value
-	    for (i = 2; str[i] != '\0' && isxdigit(str[i]); i++) {
-		continue;
-	    }
-	    char save = str[i];
-	    str[i] = '\0';
-	    char out = (char)idl_atoi(&str[2], 16);
-	    str[i] = save;
-	    return out;
-	}
-        TAO_YY_BREAK;
+        {
+            int i;
+            // hex value
+            for (i = 2; str[i] != '\0' && isxdigit(str[i]); i++) {
+                continue;
+            }
+            char save = str[i];
+            str[i] = '\0';
+            char out = (char)idl_atoi(&str[2], 16);
+            str[i] = save;
+            return out;
+        }
+        break;
       default:
-	// check for octal value
-	if (str[1] >= '0' && str[1] <= '7') {
- 	    int i;
-	    for (i = 1; str[i] >= '0' && str[i] <= '7'; i++) {
-		continue;
-	    }
-	    char save = str[i];
-	    str[i] = '\0';
-	    char out = (char)idl_atoi(&str[1], 8);
-	    str[i] = save;
-	    return out;
-	} else {
-	  return str[1] - 'a';
-	}
-	TAO_YY_BREAK;
+        // check for octal value
+        if (str[1] >= '0' && str[1] <= '7') {
+            int i;
+            for (i = 1; str[i] >= '0' && str[i] <= '7'; i++) {
+                continue;
+            }
+            char save = str[i];
+            str[i] = '\0';
+            char out = (char)idl_atoi(&str[1], 8);
+            str[i] = save;
+            return out;
+        } else {
+          return str[1] - 'a';
+        }
+        break;
     }
 }
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 5240ad07aef..9272762ed31 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -1,6 +1,6 @@
 // $Id$
 #ifndef lint
-char tao_yysccsid[] = "@(#)yaccpar	1.4 (Berkeley) 02/25/90 \n\
+char tao_yysccsid[] = "@(#)yaccpar      1.4 (Berkeley) 02/25/90 \n\
  Modified 5/2/90 by J. Roskind to support graphic debugging modes";
 #endif
 #line 74 "fe/idl.tao_yy"
@@ -10,8 +10,8 @@ char tao_yysccsid[] = "@(#)yaccpar	1.4 (Berkeley) 02/25/90 \n\
 #include <stdio.h>
 
 #if (defined(apollo) || defined(hpux)) && defined(__cplusplus)
-extern	"C" int tao_yywrap();
-#endif	/* (defined(apollo) || defined(hpux)) && defined(__cplusplus)*/
+extern  "C" int tao_yywrap();
+#endif  /* (defined(apollo) || defined(hpux)) && defined(__cplusplus)*/
 
 void tao_yyerror (const char *);
 int tao_yylex (void);
@@ -23,32 +23,34 @@ extern int tao_yyleng;
 #define TAO_YYDEBUG 1
 #line 97 "fe/idl.tao_yy"
 typedef union {
-  AST_Decl		*dcval;		/* Decl value		*/
-  UTL_StrList		*slval;		/* String list		*/
-  UTL_NameList		*nlval;		/* Name list		*/
-  UTL_ExprList		*elval;		/* Expression list	*/
-  UTL_LabelList		*llval;		/* Label list		*/
-  UTL_DeclList		*dlval;		/* Declaration list	*/
-  FE_InterfaceHeader	*ihval;		/* Interface header	*/
-  AST_Expression	*exval;		/* Expression value	*/
-  AST_UnionLabel	*ulval;		/* Union label		*/
-  AST_Field		*ffval;		/* Field value		*/
-  AST_Expression::ExprType etval;	/* Expression type	*/
-  AST_Argument::Direction dival;	/* Argument direction	*/
-  AST_Operation::Flags	ofval;		/* Operation flags	*/
-  FE_Declarator		*deval;		/* Declarator value	*/
-  idl_bool		bval;		/* Boolean value	*/
-  long			ival;		/* Long value		*/
-  double		dval;		/* Double value		*/
-  float			fval;		/* Float value		*/
-  char			cval;		/* Char value		*/
+  AST_Decl              *dcval;         /* Decl value           */
+  UTL_StrList           *slval;         /* String list          */
+  UTL_NameList          *nlval;         /* Name list            */
+  UTL_ExprList          *elval;         /* Expression list      */
+  UTL_LabelList         *llval;         /* Label list           */
+  UTL_DeclList          *dlval;         /* Declaration list     */
+  FE_InterfaceHeader    *ihval;         /* Interface header     */
+  FE_obv_header         *vhval;         /* Valuetype header     */
+  AST_Expression        *exval;         /* Expression value     */
+  AST_UnionLabel        *ulval;         /* Union label          */
+  AST_Field             *ffval;         /* Field value          */
+  AST_Field::Visibility  vival;         /* N/A, pub or priv     */
+  AST_Expression::ExprType etval;       /* Expression type      */
+  AST_Argument::Direction dival;        /* Argument direction   */
+  AST_Operation::Flags  ofval;          /* Operation flags      */
+  FE_Declarator         *deval;         /* Declarator value     */
+  idl_bool              bval;           /* Boolean value        */
+  long                  ival;           /* Long value           */
+  double                dval;           /* Double value         */
+  float                 fval;           /* Float value          */
+  char                  cval;           /* Char value           */
 
-  String		*sval;		/* String value		*/
-  char			*strval;	/* char * value		*/
-  Identifier		*idval;		/* Identifier		*/
-  UTL_IdList		*idlist;	/* Identifier list	*/
+  String                *sval;          /* String value         */
+  char                  *strval;        /* char * value         */
+  Identifier            *idval;         /* Identifier           */
+  UTL_IdList            *idlist;        /* Identifier list      */
 } TAO_YYSTYPE;
-#line 51 "y.tab.cpp"
+#line 53 "y.tab.cpp"
 #define IDENTIFIER 257
 #define IDL_CONST 258
 #define IDL_MODULE 259
@@ -85,382 +87,459 @@ typedef union {
 #define IDL_RAISES 290
 #define IDL_CONTEXT 291
 #define IDL_NATIVE 292
-#define IDL_INTEGER_LITERAL 293
-#define IDL_STRING_LITERAL 294
-#define IDL_CHARACTER_LITERAL 295
-#define IDL_FLOATING_PT_LITERAL 296
-#define IDL_TRUETOK 297
-#define IDL_FALSETOK 298
-#define IDL_SCOPE_DELIMITOR 299
-#define IDL_LEFT_SHIFT 300
-#define IDL_RIGHT_SHIFT 301
+#define IDL_ABSTRACT 293
+#define IDL_CUSTOM 294
+#define IDL_INIT 295
+#define IDL_PRIVATE 296
+#define IDL_PUBLIC 297
+#define IDL_SUPPORTS 298
+#define IDL_TRUNCATABLE 299
+#define IDL_VALUETYPE 300
+#define IDL_INTEGER_LITERAL 301
+#define IDL_STRING_LITERAL 302
+#define IDL_CHARACTER_LITERAL 303
+#define IDL_FLOATING_PT_LITERAL 304
+#define IDL_TRUETOK 305
+#define IDL_FALSETOK 306
+#define IDL_SCOPE_DELIMITOR 307
+#define IDL_LEFT_SHIFT 308
+#define IDL_RIGHT_SHIFT 309
 #define TAO_YYERRCODE 256
 short tao_yylhs[] = {                                        -1,
-    0,   67,   67,   69,   68,   71,   68,   73,   68,   75,
-   68,   77,   68,   78,   68,   79,   80,   81,   82,   76,
-   74,   74,   85,   87,   88,   83,   89,   64,   32,   90,
-   22,   22,   86,   86,   92,   91,   93,   91,   94,   91,
-   96,   91,   98,   91,   99,   91,   20,  100,   21,   21,
-   16,  101,   16,  102,   16,   65,   84,  103,  104,  105,
-  106,   70,   48,   48,   48,   48,   48,   48,   48,   48,
-   33,   34,   35,   35,   36,   36,   37,   37,   38,   38,
-   38,   39,   39,   39,   40,   40,   40,   40,   41,   41,
-   41,   41,   42,   42,   42,   43,   43,   43,   43,   43,
-   43,   44,  108,   66,   66,   66,   66,   66,  109,  107,
-    1,    1,    2,    2,    2,   56,   56,   56,   56,   56,
-   56,    4,    4,    4,    3,    3,    3,   28,  110,   29,
-   29,   60,   60,   30,  111,   31,   31,   61,   62,   49,
-   49,   54,   54,   54,   55,   55,   55,   52,   52,   52,
-   50,   50,   57,   51,   53,  112,  113,  115,  116,    7,
-  114,  118,  118,  119,  120,  117,  121,  117,  122,  123,
-  124,  125,  126,  127,  129,  130,   10,    9,    9,    9,
-    9,    9,    9,  128,  132,  132,  133,  134,  131,  135,
-  131,   26,   27,   27,  136,   46,  137,  138,   46,  139,
-   47,  140,  141,  143,  144,    8,  142,  147,  146,  146,
-  145,  148,  149,    5,    5,  150,  151,   13,  153,  154,
-    6,    6,  152,  156,  157,   14,   14,  155,  158,   11,
-   24,   25,   25,  159,  160,   45,  161,  162,   95,   63,
-   63,  163,  164,  165,  166,   72,  167,  169,  170,  171,
-   97,   59,   59,   59,   12,   12,  172,  168,  174,  168,
-  173,  177,  176,  176,  178,  179,  175,   15,   15,   15,
-   58,   58,   58,  180,  181,   23,   23,  182,  183,   17,
-   17,   18,  184,   19,   19,
+    0,   71,   71,   73,   72,   75,   72,   77,   72,   79,
+   72,   81,   72,   83,   72,   84,   72,   85,   86,   87,
+   88,   80,   78,   78,   91,   93,   94,   89,   95,   67,
+   33,   96,   22,   22,   82,   82,   82,   82,   97,   97,
+  102,  104,  105,  101,  106,  107,  108,   98,   34,  109,
+   68,   66,   66,   24,   24,   99,   99,  100,  103,  103,
+  110,  110,  110,  115,  111,  116,  111,   92,   92,  117,
+  112,  118,  112,  119,  112,  121,  112,  123,  112,  124,
+  112,   20,  125,   21,   21,   16,  126,   16,  127,   16,
+   69,   90,  128,  129,  130,  131,   74,   50,   50,   50,
+   50,   50,   50,   50,   50,   35,   36,   37,   37,   38,
+   38,   39,   39,   40,   40,   40,   41,   41,   41,   42,
+   42,   42,   42,   43,   43,   43,   43,   44,   44,   44,
+   45,   45,   45,   45,   45,   45,   46,  133,   70,   70,
+   70,   70,   70,  134,  132,    1,    1,    2,    2,    2,
+   58,   58,   58,   58,   58,   58,    4,    4,    4,    3,
+    3,    3,   29,  135,   30,   30,   62,   62,   31,  136,
+   32,   32,   63,   64,   51,   51,   56,   56,   56,   57,
+   57,   57,   54,   54,   54,   52,   52,   59,   53,   55,
+  137,  138,  140,  141,    7,  139,  143,  143,  144,  142,
+  145,  146,  114,  147,  114,  148,  149,  150,  151,  152,
+  153,  155,  156,   10,    9,    9,    9,    9,    9,    9,
+  154,  158,  158,  159,  160,  157,  161,  157,   27,   28,
+   28,  162,   48,  163,  164,   48,  165,   49,  166,  167,
+  169,  170,    8,  168,  173,  172,  172,  171,  174,  175,
+    5,    5,  176,  177,   13,  179,  180,    6,    6,  178,
+  182,  183,   14,   14,  181,  184,   11,   25,   26,   26,
+  185,  186,   47,  187,  188,  120,   65,   65,  189,  190,
+  191,  192,   76,  193,  195,  196,  197,  122,   61,   61,
+   61,   12,   12,  113,  198,  194,  200,  194,  199,  203,
+  202,  202,  204,  205,  201,   15,   15,   15,   60,   60,
+   60,  206,  207,   23,   23,  208,  209,   17,   17,   18,
+  210,   19,   19,
 };
 short tao_yylen[] = {                                         2,
     1,    2,    0,    0,    3,    0,    3,    0,    3,    0,
-    3,    0,    3,    0,    3,    0,    0,    0,    0,    9,
-    1,    1,    0,    0,    0,    7,    0,    3,    2,    0,
-    3,    0,    2,    0,    0,    3,    0,    3,    0,    3,
-    0,    3,    0,    3,    0,    3,    2,    0,    4,    0,
-    1,    0,    3,    0,    4,    1,    1,    0,    0,    0,
-    0,    9,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    3,    1,    3,    1,    3,    1,    3,
-    3,    1,    3,    3,    1,    3,    3,    3,    1,    2,
-    2,    2,    1,    1,    3,    1,    1,    1,    1,    1,
-    1,    1,    0,    3,    1,    1,    1,    2,    0,    3,
+    3,    0,    3,    0,    3,    0,    3,    0,    0,    0,
+    0,    9,    1,    1,    0,    0,    0,    7,    0,    3,
+    2,    0,    3,    0,    1,    1,    1,    1,    2,    1,
+    0,    0,    0,    7,    0,    0,    0,    8,    4,    0,
+    3,    1,    0,    2,    0,    2,    1,    2,    2,    0,
+    1,    1,    1,    0,    3,    0,    3,    2,    0,    0,
+    3,    0,    3,    0,    3,    0,    3,    0,    3,    0,
+    3,    2,    0,    4,    0,    1,    0,    3,    0,    4,
+    1,    1,    0,    0,    0,    0,    9,    1,    1,    1,
+    1,    1,    1,    1,    1,    1,    1,    1,    3,    1,
+    3,    1,    3,    1,    3,    3,    1,    3,    3,    1,
+    3,    3,    3,    1,    2,    2,    2,    1,    1,    3,
+    1,    1,    1,    1,    1,    1,    1,    0,    3,    1,
+    1,    1,    2,    0,    3,    1,    1,    1,    1,    1,
     1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    2,    0,    4,
-    0,    1,    1,    2,    0,    4,    0,    1,    1,    1,
-    1,    1,    2,    1,    2,    3,    2,    1,    1,    2,
-    1,    1,    1,    1,    1,    0,    0,    0,    0,    9,
-    2,    2,    0,    0,    0,    5,    0,    3,    0,    0,
-    0,    0,    0,    0,    0,    0,   17,    1,    1,    1,
-    1,    1,    1,    2,    2,    0,    0,    0,    5,    0,
-    3,    2,    2,    0,    0,    3,    0,    0,    5,    0,
-    3,    0,    0,    0,    0,    9,    2,    0,    4,    0,
-    1,    0,    0,    6,    2,    0,    0,    5,    0,    0,
-    6,    1,    1,    0,    0,    6,    1,    1,    0,    3,
-    2,    2,    0,    0,    0,    5,    0,    0,    6,    1,
-    0,    0,    0,    0,    0,    9,    0,    0,    0,    0,
-   10,    1,    1,    0,    1,    1,    0,    3,    0,    4,
-    2,    0,    4,    0,    0,    0,    5,    1,    1,    1,
-    1,    1,    1,    0,    0,    6,    0,    0,    0,    6,
-    0,    2,    0,    4,    0,
+    1,    1,    2,    0,    4,    0,    1,    1,    2,    0,
+    4,    0,    1,    1,    1,    1,    1,    2,    1,    2,
+    3,    2,    1,    1,    2,    1,    1,    1,    1,    1,
+    0,    0,    0,    0,    9,    2,    2,    0,    0,    2,
+    0,    0,    5,    0,    3,    0,    0,    0,    0,    0,
+    0,    0,    0,   17,    1,    1,    1,    1,    1,    1,
+    2,    2,    0,    0,    0,    5,    0,    3,    2,    2,
+    0,    0,    3,    0,    0,    5,    0,    3,    0,    0,
+    0,    0,    9,    2,    0,    4,    0,    1,    0,    0,
+    6,    2,    0,    0,    5,    0,    0,    6,    1,    1,
+    0,    0,    6,    1,    1,    0,    3,    2,    2,    0,
+    0,    0,    5,    0,    0,    6,    1,    0,    0,    0,
+    0,    0,    9,    0,    0,    0,    0,   10,    1,    1,
+    0,    1,    1,    1,    0,    3,    0,    4,    2,    0,
+    4,    0,    0,    0,    5,    1,    1,    1,    1,    1,
+    1,    0,    0,    6,    0,    0,    0,    6,    0,    2,
+    0,    4,    0,
 };
 short tao_yydefred[] = {                                      0,
-   14,   58,   16,   27,  103,  156,  169,  202,  242,    0,
-    0,  105,  107,  106,   23,    0,    4,    1,    0,    6,
-    8,   10,   12,   21,   22,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   56,  108,  138,    0,   30,   29,
-    0,    2,    0,    0,    0,    0,   15,    0,  144,    0,
-  148,  149,  151,  152,  153,  154,  223,  228,   52,   68,
-   69,    0,   59,   63,   64,   66,   67,  140,  141,   65,
-   51,    0,    0,   17,   28,  155,  216,  109,  111,  112,
-  114,  122,  123,  125,  127,  126,    0,  124,    0,  116,
-  118,  119,  117,  121,  113,  120,  104,  157,  170,  203,
-  243,   24,    0,    5,    7,    9,   11,   13,  143,  150,
-    0,  147,    0,   54,    0,  219,  224,    0,    0,    0,
-  212,  215,    0,    0,    0,    0,   34,    0,   31,  146,
-   53,    0,   60,    0,    0,   18,  217,  139,  110,  131,
-  132,  133,    0,    0,  158,  171,  204,  244,    0,    0,
-   55,    0,   96,   97,   98,   99,  100,  101,    0,    0,
-    0,    0,    0,  102,    0,    0,    0,    0,    0,    0,
-   85,   89,   94,  220,  225,    0,    0,    0,    0,  213,
-    0,    0,    0,  163,   45,  240,  252,  253,    0,    0,
-   35,   37,   39,    0,   33,   41,   43,   48,   61,   90,
-   91,   92,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   19,  218,  129,  234,  230,
-  233,    0,  167,  164,  159,  163,  172,  211,  205,  210,
-    0,    0,  256,  269,  247,  255,    0,  268,  237,    0,
-    0,    0,   26,    0,    0,    0,    0,   95,    0,    0,
-    0,    0,    0,    0,    0,   86,   87,   88,  221,  226,
-    0,    0,    0,    0,  214,    0,    0,    0,    0,    0,
-    0,    0,  162,    0,   46,    0,    0,   36,   38,   40,
-   42,   44,    0,   62,   71,   20,  130,  235,  232,  168,
-  165,  160,    0,  182,  173,    0,  178,  179,  181,  180,
-  206,  208,  246,  248,  238,    0,    0,    0,    0,    0,
-    0,  236,  166,  174,  209,    0,  249,  239,  137,    0,
-    0,    0,    0,    0,  175,  258,  271,  272,  273,  265,
-    0,  264,  274,  250,  135,    0,    0,  260,    0,    0,
-    0,    0,  190,  197,  195,  187,  194,  176,  186,  266,
-  262,  275,  278,  251,  136,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  191,  198,  196,  200,
-  188,  193,  177,  185,  267,  263,    0,  279,    0,    0,
-    0,  276,    0,  199,  201,  189,  285,    0,    0,  280,
-  283,    0,  284,
+   16,   93,   18,   29,  138,  191,  206,  239,  279,    0,
+    0,    0,   50,    0,  140,  142,  141,   25,   41,    0,
+    0,    4,    1,    0,    6,    8,   10,   12,   14,   23,
+   24,   35,   36,   37,   38,   40,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   91,  143,  173,   45,    0,
+    0,   39,    0,    0,    0,   32,   31,    0,  179,    0,
+  183,  184,  186,  187,  188,  189,  190,  253,  260,  265,
+   52,   87,   58,  146,  147,  149,  157,  158,  160,  162,
+  161,    0,  159,    0,  151,  153,  154,  152,  156,  175,
+  176,  148,  155,    0,   86,    0,    0,    0,    2,    0,
+    0,    0,    0,    0,   17,  103,  104,    0,   94,   98,
+   99,  101,  102,  100,   19,   30,  144,  139,  192,  207,
+  240,  280,    0,   51,   26,   42,    0,  178,  185,    0,
+  182,    0,    0,  249,  252,   89,    0,  256,  261,    5,
+    7,    9,   11,   13,   15,    0,    0,    0,    0,    0,
+    0,    0,   46,   69,   60,    0,   33,  181,  254,   88,
+    0,    0,    0,   49,    0,    0,   95,   20,  174,  145,
+  166,  167,  168,    0,  193,  208,  241,  281,   69,    0,
+    0,    0,    0,  131,  132,  133,  134,  135,  136,    0,
+    0,    0,    0,    0,  137,    0,    0,    0,    0,    0,
+    0,  120,  124,  129,  250,   90,    0,  257,  262,    0,
+    0,    0,    0,  199,    0,    0,  198,    0,   80,  277,
+  289,  290,    0,    0,   70,   72,   74,    0,   68,   76,
+   78,  294,   66,   64,    0,   59,   61,   62,   63,   83,
+  255,  125,  126,  127,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   96,   21,
+  164,  271,  267,  270,  194,  198,    0,  209,  248,  242,
+  247,    0,    0,    0,  293,  307,  284,  292,    0,  306,
+  274,    0,    0,    0,   28,    0,    0,    0,    0,   44,
+    0,  130,    0,    0,    0,    0,    0,    0,    0,  121,
+  122,  123,  251,  258,  263,    0,    0,    0,    0,    0,
+    0,    0,  204,  201,  200,    0,    0,    0,  197,    0,
+   48,   81,    0,    0,   71,   73,   75,   77,   79,   67,
+   65,    0,   97,  106,   22,  165,  272,  269,  195,    0,
+    0,    0,  219,  210,    0,  215,  216,  218,  217,  243,
+  245,  283,  285,  275,    0,  205,  202,    0,    0,    0,
+    0,  273,    0,  211,  246,    0,  286,  276,  172,  203,
+    0,    0,    0,    0,    0,  212,  296,  309,  310,  311,
+  303,    0,  302,  312,  287,  170,    0,    0,  298,    0,
+    0,    0,    0,  227,  234,  232,  224,  231,  213,  223,
+  304,  300,  313,  316,  288,  171,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  228,  235,  233,
+  237,  225,  230,  214,  222,  305,  301,    0,  317,    0,
+    0,    0,  314,    0,  236,  238,  226,  323,    0,    0,
+  318,  321,    0,  322,
 };
-short tao_yydgoto[] = {                                      11,
-  224,   79,   80,   81,   82,   83,   84,   85,  295,   86,
-  138,  235,   87,   88,  236,  163,  354,  388,  389,  129,
-  150,   40,  334,  220,  264,  346,  360,  139,  178,  318,
-  324,   15,  284,  164,  165,  166,  167,  168,  169,  170,
-  171,  172,  173,  174,  221,  347,  371,   63,   90,   91,
-   92,   93,   94,   68,   69,   95,   96,  330,  189,  140,
-  141,  142,  190,   16,   71,   17,   18,   19,   41,   20,
-   43,   21,   44,   22,   45,   23,   46,   26,   28,  118,
-  176,  261,   24,   25,   38,  149,  127,  194,   29,  103,
-  195,  240,  241,  242,  196,  244,  197,  245,  232,  246,
-  113,  132,   27,  115,  152,  247,   97,   30,  120,  262,
-  342,   31,  123,  225,  181,  268,  273,  231,  267,  307,
-  266,   32,  124,  182,  270,  308,  320,  348,  336,  361,
-  349,  362,  359,  381,  356,  358,  357,  379,  380,   33,
-  125,  229,  183,  271,  230,  272,  309,  144,  222,  119,
-  177,   72,  134,  214,   73,  135,  215,  179,  263,  306,
-  277,  311,   34,  126,  184,  274,  276,  317,  310,  323,
-  341,  321,  331,  322,  332,  339,  364,  337,  363,  340,
-  365,  366,  383,  392,
+short tao_yydgoto[] = {                                      14,
+  314,   74,   75,   76,   77,   78,   15,   16,  344,   17,
+  169,  277,   82,   83,  278,  194,  405,  439,  440,  157,
+  182,   57,  385,  164,  263,  310,  397,  411,  170,  212,
+  368,  375,   18,   19,  333,  195,  196,  197,  198,  199,
+  200,  201,  202,  203,  204,  205,  264,  398,  422,  109,
+   85,   86,   87,   88,   89,   90,   91,   92,   93,  381,
+  223,  171,  172,  173,  224,   94,   20,   21,   95,   22,
+   23,   24,   98,   25,  100,   26,  101,   27,  102,   28,
+  103,   29,  104,   37,   39,  147,  211,  307,   30,   31,
+   54,  180,  154,  228,   40,  127,   32,   33,   34,   35,
+   36,   55,  181,  155,  235,  123,  179,  273,   53,  236,
+  237,  229,  239,  315,  289,  288,  282,  283,  284,  230,
+  286,  231,  287,  274,  291,  133,  162,   38,  146,  210,
+  306,  118,   41,  148,  308,  393,   42,  149,  265,  214,
+  311,  319,  272,  267,  341,  363,  340,   43,  150,  215,
+  316,  358,  371,  399,  387,  412,  400,  413,  410,  432,
+  407,  409,  408,  430,  431,   44,  151,  270,  216,  317,
+  271,  318,  359,  161,  256,  132,  183,   96,  165,  257,
+   97,  166,  258,  213,  309,  355,  324,  361,   45,  152,
+  217,  320,  323,  367,  360,  374,  392,  372,  382,  373,
+  383,  390,  415,  388,  414,  391,  416,  417,  434,  443,
 };
-short tao_yysindex[] = {                                    333,
-    0,    0,    0,    0,    0,    0,    0,    0,    0, -194,
-    0,    0,    0,    0,    0,   10,    0,    0,  333,    0,
-    0,    0,    0,    0,    0,   25,  254, -177, -194,  162,
- -194, -194, -194, -194,    0,    0,    0,  -34,    0,    0,
-   47,    0,   52,   61,   78,  103,    0,  -54,    0, -187,
+short tao_yysindex[] = {                                    493,
+    0,    0,    0,    0,    0,    0,    0,    0,    0, -234,
+ -269, -269,    0,    0,    0,    0,    0,    0,    0,   -3,
+  312,    0,    0,  493,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   17,  440, -198, -234,
+  358, -234, -234, -234, -234,    0,    0,    0,    0, -208,
+ -208,    0, -234,  -21,    5,    0,    0,  -92,    0, -154,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, -131,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  126,  150,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   77,    0, -131,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0, -183,    0,    0,    0,    0,    0,    0,    0,
-  -90,    0, -194,    0, -194,    0,    0,   72,  152, -194,
-    0,    0,   95,  -53,  119,  122,    0, -131,    0,    0,
-    0, -194,    0,   26,   26,    0,    0,    0,    0,    0,
-    0,    0,    0,   26,    0,    0,    0,    0,  303,  212,
-    0,  209,    0,    0,    0,    0,    0,    0,  -30,  -30,
-  -30,   26, -131,    0,  156,  182,  246, -154,  159,   89,
-    0,    0,    0,    0,    0,  333,  211,  242,  196,    0,
-  137,  248,   32,    0,    0,    0,    0,    0,  228,   13,
-    0,    0,    0,  165,    0,    0,    0,    0,    0,    0,
-    0,    0,  250,   26,   26,   26,   26,   26,   26,   26,
-   26,   26,   26,  230,  235,    0,    0,    0,    0,    0,
-    0,  236,    0,    0,    0,    0,    0,    0,    0,    0,
-  137,  243,    0,    0,    0,    0, -131,    0,    0,  245,
-  247,  249,    0,  251,  253, -183,   26,    0,  182,  246,
- -154,  159,  159,   89,   89,    0,    0,    0,    0,    0,
-  180, -194,   26,  196,    0,  257, -194,  188,  137,  287,
-  192,  263,    0,  193,    0,   71,  271,    0,    0,    0,
-    0,    0, -131,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   67,    0,    0, -131,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  238,  277,  296,   32,  298,
- -194,    0,    0,    0,    0,    0,    0,    0,    0,  219,
-  302,  -63,   55,  300,    0,    0,    0,    0,    0,    0,
-  305,    0,    0,    0,    0,  -74,  271,    0,  304,  307,
-   58, -194,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  293,   26,  297,  162, -102,
-  229,  -74, -194,  -63, -183,  318,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  319,    0,  301, -194,
-  306,    0,   69,    0,    0,    0,    0,  323,  324,    0,
-    0,   79,    0,
+    0,   69,    0, -191,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   -3,    0,   74,   81,   88,    0,  123,
+  128,  135,  150,  157,    0,    0,    0, -191,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  101,    0,    0,    0, -215,    0,    0,   -6,
+    0,  182, -234,    0,    0,    0,  -52,    0,    0,    0,
+    0,    0,    0,    0,    0, -234,  129, -234,  144,   29,
+  156,  195,    0,    0,    0, -191,    0,    0,    0,    0,
+   72, -234, -215,    0,   72,   72,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  547,
+  517,  246,  392,    0,    0,    0,    0,    0,    0,   20,
+   20,   20,   72, -191,    0,  181,  234,  292, -119,   43,
+  196,    0,    0,    0,    0,    0, -191,    0,    0,  274,
+  493,  293,  245,    0,  298,   82,    0,  547,    0,    0,
+    0,    0,  409,   57,    0,    0,    0,  217,    0,    0,
+    0,    0,    0,    0,  218,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  305,   72,   72,   72,   72,   72,
+   72,   72,   72,   72,   72,  285,  286,  288,    0,    0,
+    0,    0,    0,    0,    0,    0,  287,    0,    0,    0,
+    0,    0,  224,  294,    0,    0,    0,    0, -191,    0,
+    0,  296,  299,  300,    0,  303,  306,  287,  287,    0,
+ -215,    0,  234,  292, -119,   43,   43,  196,  196,    0,
+    0,    0,    0,    0,    0,   72,  227, -234,   72,  245,
+  241,    0,    0,    0,    0,  473,  242,  325,    0,  255,
+    0,    0,  124,  457,    0,    0,    0,    0,    0,    0,
+    0, -191,    0,    0,    0,    0,    0,    0,    0,  323,
+ -234,  125,    0,    0, -191,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  295,    0,    0,  344,   82,  349,
+ -234,    0,  333,    0,    0,    0,    0,    0,    0,    0,
+  270,  354,  -67,  108,  355,    0,    0,    0,    0,    0,
+    0,  359,    0,    0,    0,    0, -155,  457,    0,  357,
+  362,  112, -234,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  347,   72,  351,  358,
+  -84,  289, -155, -234,  -67, -215,  370,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  371,    0,  353,
+ -234,  356,    0,  111,    0,    0,    0,    0,  378,  372,
+    0,    0,  118,    0,
 };
-short tao_yyrindex[] = {                                    371,
+short tao_yyrindex[] = {                                    422,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   16,
+  -45,    0,    0,   39,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   -1,
+  -43,    0,    0,    0,    0,    0,    0,    9,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  -27,    0,    0,   17,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  106,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  -94,    0,  107,  115,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  178,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  -19,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   23,
+    0,    0,    0,    0,    0,    0,  319,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  115,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   28,   38,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   57,    0,
+    0,    0,    0,    0,    0,  -24,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  158,    0,    0,    0,    0,    0,  207,
+  232,   10,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    3,    0,  248,  126,  113,  167,   25,
+   11,    0,    0,    0,    0,    0,  320,    0,    0,    0,
+  338,  385,    0,    0,    0,    0,    0,  259,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    4,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   94,    0,    0,    0,    0,    0,  112,    9,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  -29,    0,   99,  129,  155,  107,   50,   -7,
-    0,    0,    0,    0,    0,  259,    0,  326,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  161,    0,    0,    0,    0,    0,    0,  188,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  177,  121,  479,   52,   62,   36,   99,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  258,
+    0,  184,    0,    0,    0,    0,    0,  340,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  -17,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  417,    0,    0,  425,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  261,    0,    0,    0,    0,    0,  130,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  157,  268,
-  135,   56,   66,   -1,   40,    0,    0,    0,    0,    0,
-    0,    0,    0,  140,    0,    0,    0,    0,  265,    0,
-    0,  266,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   18,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  347,    0,    0,  355,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  -30,    0,    0,    0,    0,
+    0,    0,    0,  -47,  408,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  438,
+    0,  421,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  -14,    0,    0,    0,    0,
-    0,    0,  -56,  338,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  375,    0,
-  251,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  187,
-    0,  292,    0,    0,    0,    0,    0,    0,    0,    0,
+  375,    0,  360,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  377,    0,
-    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  441,
+    0,    0,    0,    0,
 };
 short tao_yygindex[] = {                                      0,
-  -24,  244,    0,    0,    0,  -22,   54,    7,    0,   60,
-    0,    0,    0,  393, -207,  -26,    0,    0,    0,   76,
-    0,    0,    0,    0,    0,    0,    0,  175,    0,    0,
-    0,    0,    0, -134,    0,  218,  240,  217,   39,   51,
-   21,   80,    0,  -88,  179,   86,    0,    0,  -16,  -12,
-    8,  420,    0,    0,    0, -148,   12,    0,    0, -209,
-   -8,    0,    0,    0,  -10,  299,    1,    0,    0,  317,
-    0,  320,    0,    0,    0,    0,    0,    0,    0,    0,
+  -19,  304,    0,    0,    0,  -32,  -13,  -16,    0,   -5,
+    0,    0,    0,  443, -235,  -20,    0,    0,    0,   67,
+    0,  394,    0,    0,    0,    0,    0,    0,  145,    0,
+    0,    0,    0,  481,    0, -174,    0,  260,  257,  262,
+  -49,   12,  -23,  103,    0, -128,  197,   94,    0,    0,
+  -34,  -31,  -29,  470,    0,    0,    0, -176,  -28,    0,
+    0, -236,   -7,    0,    0,    0,    0,  302,  -10,   30,
+    2,    0,    0,   47,    0,   60,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  332,    0,    0,    0,    0,    0,    0,    0,    0,
+  500,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  350,    0,   27,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  286,  258,    0,    0,
+    0,  318,  247,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  120,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  108,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  163,    0,    0,    0,    0,    0,
+  160,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  136,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,
+  119,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 };
-#define TAO_YYTABLESIZE 625
-short tao_yytable[] = {                                      37,
-   62,   36,  277,   89,   60,   78,   13,   93,   93,  162,
-   64,   93,   93,   93,   65,   93,    3,   93,   75,   42,
-   98,   99,  100,  101,  142,   13,  257,  203,   93,   93,
-   82,   57,   93,   82,   66,   82,   83,   82,   70,   83,
-  238,   83,  142,   83,   50,  145,  175,   50,  145,   47,
-   82,   82,  287,   12,   82,  180,   83,   83,   49,   14,
-   83,   49,   35,   93,   93,  162,  145,   39,  159,  305,
-  160,  222,   12,   35,  111,  112,  128,   84,   14,   74,
-   84,  227,   84,   47,   84,   82,   82,   79,  102,  222,
-   79,   83,   83,   80,   93,   32,   80,   84,   84,  227,
-  115,   84,  131,   81,  133,  104,   81,   79,   79,  143,
-  105,   79,  285,   80,   80,   59,   82,   80,  115,  106,
-  121,  151,   83,   81,   81,  213,   50,   81,  238,  350,
-  211,   47,   84,   84,  138,  212,  107,  138,  122,   72,
-   49,    3,   79,   79,   77,  207,  208,   77,   80,   80,
-   89,  161,  138,  375,   89,   13,   72,   72,   81,   81,
-   72,  108,  237,   84,   77,   77,  234,  114,   77,   73,
-  385,  130,   78,   79,  288,   78,  216,  344,  345,   80,
-  231,  343,   13,  231,  229,  116,   73,   73,  238,   81,
-   73,   72,   78,   78,  136,   75,   78,   74,  231,   77,
-   77,  209,   12,  210,   89,  344,  345,  109,   14,  117,
-  110,  137,   75,   75,   74,   74,   75,  145,   74,  283,
-  146,   73,  368,  327,  328,  329,   35,   78,   78,   12,
-   77,  256,  257,  258,  277,   14,   25,  142,  200,  201,
-  202,  147,   89,  296,  148,  252,  253,   75,   75,   74,
-  237,  143,   73,  297,  234,  198,  143,  298,   78,  254,
-  255,  145,  153,  154,  155,  156,  157,  158,   59,  199,
-   93,   93,  259,  259,  259,  205,  294,  299,   75,  204,
-   74,  300,   35,  206,  222,  218,  219,  227,  228,  243,
-  248,  259,   82,   82,  227,  239,  260,  265,   83,   83,
-   37,  275,  319,  278,  286,  279,  302,  280,   76,  281,
-  237,  282,  292,  115,  234,  290,  301,  303,  153,  154,
-  155,  156,  157,  158,   59,   76,   76,  304,  109,   76,
-  312,   37,   89,  355,  370,  313,  314,  316,  128,   84,
-   84,  325,  326,  335,  333,  338,  352,  351,  353,   79,
-   79,  367,  143,  373,  369,   80,   80,  378,  384,  382,
-   76,   76,  387,  390,  386,   81,   81,  391,  254,  143,
-    3,   70,  393,  254,  254,  254,  254,  254,  254,  254,
-  254,  254,  254,    3,  128,  245,  270,  142,  254,  161,
-  207,   76,  223,   35,  241,  183,  134,  254,   48,   49,
-   50,   51,   52,   53,   54,   55,   56,   76,    6,    7,
-  254,    8,   77,   57,   58,  261,  184,  282,   35,   61,
-  217,  249,  251,   48,   49,   50,   51,   52,   53,   54,
-   55,   56,   76,    6,    7,   59,    8,   77,   57,   58,
-  377,  291,  289,  192,  250,  372,   67,  191,  192,  192,
-  192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
-   59,  192,  192,  192,  192,  192,  226,   35,  193,  374,
-    0,  315,   48,   49,   50,   51,   52,   53,   54,   55,
-   56,   76,    0,  269,   35,  192,   77,   57,   58,   48,
-   49,   50,   51,   52,   53,   54,   55,   56,   76,  376,
-    0,    0,    0,    0,   57,    0,    0,    0,    0,   59,
-   35,    0,    0,  233,    0,   48,   49,   50,   51,   52,
-   53,   54,   55,   56,    0,    0,   59,   35,    0,    0,
-   57,   58,   48,   49,   50,   51,   52,   53,   54,   55,
-   56,   76,    0,   35,    0,    0,    0,   57,  293,   49,
-   50,    0,   59,   53,   54,   55,   56,    0,  185,    0,
-    2,    8,    0,    5,    0,    0,    0,    0,    0,   59,
-    0,    0,    0,    0,    6,    7,    0,    8,    0,    0,
-    0,    9,    0,    0,  186,   59,  187,  188,    1,    0,
-    2,    3,    4,    5,   10,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    6,    7,    0,    8,    0,    0,
-    0,    9,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   10,
+#define TAO_YYTABLESIZE 839
+short tao_yytable[] = {                                      48,
+   84,   73,   47,  110,   80,  106,  111,   79,  112,  114,
+  295,  315,   53,   57,   53,   81,   85,  108,  245,   85,
+   84,  117,   46,   84,   80,   99,   84,   79,   34,  116,
+   13,  119,  120,  121,  122,   81,  208,  209,    3,  128,
+  128,   46,  124,  128,  128,  128,  280,  128,  117,  128,
+   82,  117,  177,  117,   56,  117,   53,   56,  115,  193,
+  128,  128,  114,  180,  128,  114,  180,  177,  117,  117,
+  177,  336,  117,  118,   92,  105,  118,   53,  118,   53,
+  118,  180,  114,  114,  180,  251,  114,  252,  354,  115,
+   71,   72,  115,  118,  118,  128,  128,  118,   85,  116,
+  394,  125,  116,  117,  117,   84,  156,  130,  131,  115,
+  115,  193,  134,  115,  190,  136,  191,  114,  114,  116,
+  116,   53,  160,  116,  395,  396,  128,  126,  118,  118,
+  135,  334,   82,  138,  117,  167,  119,  174,   34,  119,
+  139,  119,  207,  119,  115,  115,  140,  280,  114,  150,
+  259,  206,  401,  110,  116,  116,  119,  119,  264,  118,
+  119,  111,   84,    3,  150,  259,  108,  150,  259,  128,
+  110,  110,  129,  264,  110,  115,  264,  426,  111,  111,
+  337,  141,  111,  108,  108,  116,  142,  108,  249,  250,
+  276,  119,  119,  143,  436,  395,  396,  192,  173,  296,
+  297,  173,  279,   34,  112,  110,  110,  112,  144,  225,
+  225,  280,  260,  111,  111,  145,  173,  109,  108,  378,
+  379,  380,  119,  153,  112,  112,  226,  226,  112,  300,
+  301,  302,  255,  419,  109,  109,  110,  253,  109,  227,
+  227,  159,  254,  315,  111,  163,   84,  225,  266,  108,
+   80,  168,   53,   79,   53,  158,  297,  297,  297,  112,
+  112,   81,  298,  299,  226,  177,  175,   84,   84,  109,
+  332,   80,   80,   85,   79,   79,   46,  227,  177,  180,
+   84,  346,   81,   81,  347,  282,  348,  349,  107,  240,
+  112,  276,  242,  243,  244,  345,   53,  174,  268,  343,
+  109,  268,  176,  279,  246,  107,  107,   82,  196,  107,
+  128,  128,   50,   51,  330,  331,  268,  178,  117,  117,
+  184,  185,  186,  187,  188,  189,   72,  247,   46,  248,
+  174,   27,  114,  114,  259,  262,  261,  268,  269,  281,
+  107,  285,  290,  118,  118,  292,  303,  304,  321,  305,
+   48,  335,  322,  369,  325,  276,   43,  326,  327,  115,
+  115,  328,  150,  259,  329,  339,  350,  279,  351,  116,
+  116,  264,  184,  185,  186,  187,  188,  189,   72,  352,
+  353,  356,   48,   47,  364,  406,  128,  362,  366,   84,
+  421,  370,  376,   80,  377,  156,   79,  384,  386,  389,
+  402,  403,  404,  174,   81,  418,  119,  119,  420,  429,
+  435,  433,  438,  424,  437,  442,  199,  199,  441,  444,
+  174,    3,  199,  199,  199,  199,  199,  199,  199,  199,
+  199,  199,  199,  199,  105,  199,  199,  199,  199,  199,
+  199,   55,   54,  163,  308,  199,  199,  199,  199,  199,
+  199,  199,  199,  199,  199,  199,  199,  177,  199,  199,
+  199,  199,    3,  291,  244,  220,  169,  199,  291,  291,
+  291,  291,  291,  291,  291,  291,  291,  291,  299,  319,
+  107,  320,  428,  291,  221,  357,  241,  137,  291,  278,
+  199,   49,  291,  291,  291,  291,  291,  291,  291,  291,
+  291,  291,  291,  294,  423,  293,  338,  113,  291,  295,
+  218,   52,  312,  291,  278,  291,  113,  291,  365,  113,
+  291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
+  238,  266,  425,  427,    0,  291,  113,  113,  291,    0,
+  113,  278,  313,   46,  291,    0,    0,    0,   58,   59,
+   60,   61,   62,   63,   64,   65,   66,   67,    6,    7,
+    0,    8,   68,   69,   70,  291,    0,    0,   46,    0,
+    0,  113,  113,   58,   59,   60,   61,   62,   63,   64,
+   65,   66,   67,    6,    7,    0,    8,   68,   69,   70,
+    0,    0,    0,   72,    0,    0,    0,    0,    0,    0,
+    0,    0,  113,    0,    0,    0,    0,    0,    0,    0,
+   71,    0,    0,    0,   46,    0,    0,    0,   72,   58,
+   59,   60,   61,   62,   63,   64,   65,   66,   67,    6,
+    7,  229,    8,   68,   69,   70,  229,  229,  229,  229,
+  229,  229,  229,  229,  229,  229,  229,  229,   46,  229,
+  229,  229,  229,   58,   59,   60,   61,   62,   63,   64,
+   65,   66,   67,    0,   72,   46,    0,   68,   69,   70,
+   58,   59,   60,   61,   62,   63,   64,   65,   66,   67,
+    0,  229,    0,    0,    0,   69,    0,    0,    0,    0,
+    0,    0,    0,    0,  275,    0,   46,    0,   72,    0,
+    0,   58,   59,   60,   61,   62,   63,   64,   65,   66,
+    0,    0,    0,   46,    0,   72,   69,   70,   58,   59,
+   60,   61,   62,   63,   64,   65,   66,   67,    0,   46,
+    0,    0,    0,   69,  342,   59,   60,    0,    0,   63,
+   64,   65,   66,    0,    0,    0,   72,    8,    1,    0,
+    2,    3,    4,    5,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   72,    6,    7,    0,    8,    0,    0,
+    0,    9,  219,    0,    2,    0,    0,    5,    0,   72,
+    0,    0,    0,    0,   10,   11,   12,    0,    6,    7,
+    0,    8,   13,    0,    0,    9,    0,    0,  220,    0,
+  221,  222,  219,    0,    2,    0,    0,    5,   10,    0,
+    0,  232,  233,  234,    0,    0,    0,    0,    6,    7,
+    0,    8,    0,    0,    0,    9,    0,    0,  220,    0,
+  221,  222,    0,    0,    0,    0,    0,    0,   10,
 };
 short tao_yycheck[] = {                                      10,
-   27,   10,   59,   30,   27,   30,    0,   37,   38,   40,
-   27,   41,   42,   43,   27,   45,    0,   47,   29,   19,
-   31,   32,   33,   34,   44,   19,   41,  162,   58,   59,
-   38,   59,   62,   41,   27,   43,   38,   45,   27,   41,
-  189,   43,   62,   45,   41,   41,  135,   44,   44,   41,
-   58,   59,  262,    0,   62,  144,   58,   59,   41,    0,
-   62,   44,  257,   93,   94,   40,   62,   58,   43,  277,
-   45,   44,   19,  257,  262,  263,  103,   38,   19,  257,
-   41,   44,   43,   59,   45,   93,   94,   38,  123,   62,
-   41,   93,   94,   38,  124,  123,   41,   58,   59,   62,
-   44,   62,  113,   38,  115,   59,   41,   58,   59,  120,
-   59,   62,  247,   58,   59,  299,  124,   62,   62,   59,
-   44,  132,  124,   58,   59,   37,  123,   62,  277,  337,
-   42,  123,   93,   94,   41,   47,   59,   44,   62,   41,
-  123,  125,   93,   94,   38,  300,  301,   41,   93,   94,
-  177,  126,   59,  363,  181,  149,   58,   59,   93,   94,
-   62,   59,  189,  124,   58,   59,  189,  299,   62,   41,
-  380,  262,   38,  124,  263,   41,  176,  280,  281,  124,
-   41,  256,  176,   44,   91,   60,   58,   59,  337,  124,
-   62,   93,   58,   59,  123,   41,   62,   41,   59,   93,
-   94,   43,  149,   45,  231,  280,  281,  262,  149,   60,
-  265,   60,   58,   59,   58,   59,   62,  123,   62,  246,
-  274,   93,  357,  287,  288,  289,  257,   93,   94,  176,
-  124,  211,  212,  213,  291,  176,  125,  257,  159,  160,
-  161,  123,  269,  270,  123,  207,  208,   93,   94,   93,
-  277,  262,  124,  270,  277,   44,  267,  270,  124,  209,
-  210,  257,  293,  294,  295,  296,  297,  298,  299,   61,
-  300,  301,  287,  288,  289,   94,  270,  270,  124,  124,
-  124,  270,  257,   38,  257,   44,   91,   40,  257,  125,
-   41,   62,  300,  301,  257,  283,   62,   62,  300,  301,
-  311,   59,  311,   59,  125,   59,   44,   59,   41,   59,
-  337,   59,  125,  257,  337,   59,  125,  125,  293,  294,
-  295,  296,  297,  298,  299,   58,   59,  257,  262,   62,
-   93,  342,  359,  342,  359,   59,   41,   40,  365,  300,
-  301,  123,   41,   44,  290,   41,   40,   44,  291,  300,
-  301,   59,  363,  125,   58,  300,  301,   40,   58,   41,
-   93,   94,  294,   41,   59,  300,  301,   44,  257,  380,
-    0,  257,  294,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,  125,   59,  125,  257,   41,  277,  125,
-  125,  124,  256,  257,  283,   41,   59,  286,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  299,  275,  276,  277,  278,   41,  125,   41,  257,   27,
-  177,  204,  206,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,  272,  273,  299,  275,  276,  277,  278,
-  365,  267,  264,  257,  205,  360,   27,  149,  262,  263,
+   21,   21,   10,   38,   21,   38,   38,   21,   38,   38,
+   41,   59,   58,   59,   58,   21,   41,   38,  193,   44,
+   41,   41,  257,   41,   41,   24,   44,   41,  123,   40,
+  300,   42,   43,   44,   45,   41,  165,  166,    0,   37,
+   38,  257,   53,   41,   42,   43,  223,   45,   38,   47,
+   41,   41,   44,   43,   58,   45,   58,   59,  257,   40,
+   58,   59,   38,   41,   62,   41,   44,   59,   58,   59,
+   62,  308,   62,   38,   59,   59,   41,  123,   43,  123,
+   45,   59,   58,   59,   62,   43,   62,   45,  324,   38,
+  299,  307,   41,   58,   59,   93,   94,   62,  123,   38,
+  256,  123,   41,   93,   94,  123,  127,  262,  263,   58,
+   59,   40,   44,   62,   43,  307,   45,   93,   94,   58,
+   59,  123,  133,   62,  280,  281,  124,  123,   93,   94,
+   62,  306,  123,   60,  124,  146,   38,  148,  123,   41,
+   60,   43,  163,   45,   93,   94,   59,  324,  124,   44,
+   44,  162,  388,   41,   93,   94,   58,   59,   44,  124,
+   62,   41,  183,  125,   59,   59,   41,   62,   62,  262,
+   58,   59,  265,   59,   62,  124,   62,  414,   58,   59,
+  309,   59,   62,   58,   59,  124,   59,   62,  308,  309,
+  223,   93,   94,   59,  431,  280,  281,  126,   41,  249,
+  250,   44,  223,  298,   38,   93,   94,   41,   59,  180,
+  181,  388,  211,   93,   94,   59,   59,   41,   93,  287,
+  288,  289,  124,  123,   58,   59,  180,  181,   62,  253,
+  254,  255,   37,  408,   58,   59,  124,   42,   62,  180,
+  181,   60,   47,  291,  124,  298,  267,  218,   91,  124,
+  267,  123,  298,  267,  298,  262,  287,  288,  289,   93,
+   94,  267,  251,  252,  218,  257,  123,  288,  289,   93,
+  291,  288,  289,  298,  288,  289,  257,  218,  123,  257,
+  298,  316,  288,  289,  316,  125,  316,  316,   41,   44,
+  124,  324,  190,  191,  192,  316,  298,  308,   41,  316,
+  124,   44,  274,  324,  124,   58,   59,  298,  125,   62,
+  308,  309,   11,   12,  288,  289,   59,  123,  308,  309,
+  301,  302,  303,  304,  305,  306,  307,   94,  257,   38,
+  341,  125,  308,  309,   61,   91,   44,   40,  257,  283,
+   93,  125,  125,  308,  309,   41,   62,   62,  125,   62,
+  361,  125,   59,  361,   59,  388,  125,   59,   59,  308,
+  309,   59,  257,  257,   59,  125,  125,  388,   44,  308,
+  309,  257,  301,  302,  303,  304,  305,  306,  307,  125,
+  257,   59,  393,  125,   41,  393,  262,   93,   40,  410,
+  410,   59,  123,  410,   41,  416,  410,  290,   44,   41,
+   44,   40,  291,  414,  410,   59,  308,  309,   58,   40,
+   58,   41,  302,  125,   59,   44,  256,  257,   41,  302,
+  431,    0,  262,  263,  264,  265,  266,  267,  268,  269,
+  270,  271,  272,  273,  257,  275,  276,  277,  278,  256,
+  257,  123,  123,   59,  257,  262,  263,  264,  265,  266,
+  267,  268,  269,  270,  271,  272,  273,   41,  275,  276,
+  277,  278,  125,  257,  125,   41,   59,  307,  262,  263,
+  264,  265,  266,  267,  268,  269,  270,  271,   41,   59,
+   38,   41,  416,  277,  125,  341,  183,   94,  257,  283,
+  307,   11,  286,  262,  263,  264,  265,  266,  267,  268,
+  269,  270,  271,  247,  411,  246,  310,   38,  277,  248,
+  179,   12,  266,  307,  283,  257,   38,  286,  359,   41,
+  262,  263,  264,  265,  266,  267,  268,  269,  270,  271,
+  181,  214,  413,  415,   -1,  277,   58,   59,  307,   -1,
+   62,  283,  256,  257,  286,   -1,   -1,   -1,  262,  263,
   264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  299,  275,  276,  277,  278,  149,  181,  257,  149,  362,
-   -1,  309,  262,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,   -1,  226,  257,  299,  276,  277,  278,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  364,
-   -1,   -1,   -1,   -1,  277,   -1,   -1,   -1,   -1,  299,
-  257,   -1,   -1,  286,   -1,  262,  263,  264,  265,  266,
-  267,  268,  269,  270,   -1,   -1,  299,  257,   -1,   -1,
-  277,  278,  262,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,   -1,  257,   -1,   -1,   -1,  277,  262,  263,
-  264,   -1,  299,  267,  268,  269,  270,   -1,  256,   -1,
-  258,  275,   -1,  261,   -1,   -1,   -1,   -1,   -1,  299,
-   -1,   -1,   -1,   -1,  272,  273,   -1,  275,   -1,   -1,
-   -1,  279,   -1,   -1,  282,  299,  284,  285,  256,   -1,
-  258,  259,  260,  261,  292,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  272,  273,   -1,  275,   -1,   -1,
-   -1,  279,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  292,
+   -1,  275,  276,  277,  278,  307,   -1,   -1,  257,   -1,
+   -1,   93,   94,  262,  263,  264,  265,  266,  267,  268,
+  269,  270,  271,  272,  273,   -1,  275,  276,  277,  278,
+   -1,   -1,   -1,  307,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  124,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  299,   -1,   -1,   -1,  257,   -1,   -1,   -1,  307,  262,
+  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
+  273,  257,  275,  276,  277,  278,  262,  263,  264,  265,
+  266,  267,  268,  269,  270,  271,  272,  273,  257,  275,
+  276,  277,  278,  262,  263,  264,  265,  266,  267,  268,
+  269,  270,  271,   -1,  307,  257,   -1,  276,  277,  278,
+  262,  263,  264,  265,  266,  267,  268,  269,  270,  271,
+   -1,  307,   -1,   -1,   -1,  277,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  286,   -1,  257,   -1,  307,   -1,
+   -1,  262,  263,  264,  265,  266,  267,  268,  269,  270,
+   -1,   -1,   -1,  257,   -1,  307,  277,  278,  262,  263,
+  264,  265,  266,  267,  268,  269,  270,  271,   -1,  257,
+   -1,   -1,   -1,  277,  262,  263,  264,   -1,   -1,  267,
+  268,  269,  270,   -1,   -1,   -1,  307,  275,  256,   -1,
+  258,  259,  260,  261,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  307,  272,  273,   -1,  275,   -1,   -1,
+   -1,  279,  256,   -1,  258,   -1,   -1,  261,   -1,  307,
+   -1,   -1,   -1,   -1,  292,  293,  294,   -1,  272,  273,
+   -1,  275,  300,   -1,   -1,  279,   -1,   -1,  282,   -1,
+  284,  285,  256,   -1,  258,   -1,   -1,  261,  292,   -1,
+   -1,  295,  296,  297,   -1,   -1,   -1,   -1,  272,  273,
+   -1,  275,   -1,   -1,   -1,  279,   -1,   -1,  282,   -1,
+  284,  285,   -1,   -1,   -1,   -1,   -1,   -1,  292,
 };
-#define TAO_YYFINAL 11
+#define TAO_YYFINAL 14
 #ifndef TAO_YYDEBUG
 #define TAO_YYDEBUG 0
 #endif
-#define TAO_YYMAXTOKEN 301
+#define TAO_YYMAXTOKEN 309
 #if TAO_YYDEBUG
 char *tao_yyname[] = {
 "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -477,9 +556,11 @@ char *tao_yyname[] = {
 "IDL_SEQUENCE","IDL_STRING","IDL_WSTRING","IDL_EXCEPTION","IDL_CASE",
 "IDL_DEFAULT","IDL_READONLY","IDL_ATTRIBUTE","IDL_ONEWAY","IDL_IDEMPOTENT",
 "IDL_VOID","IDL_IN","IDL_OUT","IDL_INOUT","IDL_RAISES","IDL_CONTEXT",
-"IDL_NATIVE","IDL_INTEGER_LITERAL","IDL_STRING_LITERAL","IDL_CHARACTER_LITERAL",
-"IDL_FLOATING_PT_LITERAL","IDL_TRUETOK","IDL_FALSETOK","IDL_SCOPE_DELIMITOR",
-"IDL_LEFT_SHIFT","IDL_RIGHT_SHIFT",
+"IDL_NATIVE","IDL_ABSTRACT","IDL_CUSTOM","IDL_INIT","IDL_PRIVATE","IDL_PUBLIC",
+"IDL_SUPPORTS","IDL_TRUNCATABLE","IDL_VALUETYPE","IDL_INTEGER_LITERAL",
+"IDL_STRING_LITERAL","IDL_CHARACTER_LITERAL","IDL_FLOATING_PT_LITERAL",
+"IDL_TRUETOK","IDL_FALSETOK","IDL_SCOPE_DELIMITOR","IDL_LEFT_SHIFT",
+"IDL_RIGHT_SHIFT",
 };
 char *tao_yyrule[] = {
 "$accept : start",
@@ -497,54 +578,89 @@ char *tao_yyrule[] = {
 "$$5 :",
 "definition : module $$5 ';'",
 "$$6 :",
-"definition : error $$6 ';'",
+"definition : value_def $$6 ';'",
 "$$7 :",
+"definition : error $$7 ';'",
 "$$8 :",
 "$$9 :",
 "$$10 :",
-"module : IDL_MODULE $$7 IDENTIFIER $$8 '{' $$9 definitions $$10 '}'",
+"$$11 :",
+"module : IDL_MODULE $$8 IDENTIFIER $$9 '{' $$10 definitions $$11 '}'",
 "interface_def : interface",
 "interface_def : forward",
-"$$11 :",
 "$$12 :",
 "$$13 :",
-"interface : interface_header $$11 '{' $$12 exports $$13 '}'",
 "$$14 :",
-"interface_decl : IDL_INTERFACE $$14 id",
-"interface_header : interface_decl inheritance_spec",
+"interface : interface_header $$12 '{' $$13 exports $$14 '}'",
 "$$15 :",
-"inheritance_spec : ':' $$15 at_least_one_scoped_name",
-"inheritance_spec :",
-"exports : exports export",
-"exports :",
+"interface_decl : IDL_INTERFACE $$15 id",
+"interface_header : interface_decl inheritance_spec",
 "$$16 :",
-"export : type_dcl $$16 ';'",
+"inheritance_spec : ':' $$16 at_least_one_scoped_name",
+"inheritance_spec :",
+"value_def : valuetype",
+"value_def : value_abs_decl",
+"value_def : value_forward_decl",
+"value_def : value_box_decl",
+"valuetype : IDL_CUSTOM value_concrete_decl",
+"valuetype : value_concrete_decl",
 "$$17 :",
-"export : const_dcl $$17 ';'",
 "$$18 :",
-"export : exception $$18 ';'",
 "$$19 :",
-"export : attribute $$19 ';'",
+"value_concrete_decl : value_header $$17 '{' $$18 value_elements $$19 '}'",
 "$$20 :",
-"export : operation $$20 ';'",
 "$$21 :",
-"export : error $$21 ';'",
-"at_least_one_scoped_name : scoped_name scoped_names",
 "$$22 :",
-"scoped_names : scoped_names ',' $$22 scoped_name",
-"scoped_names :",
-"scoped_name : id",
+"value_abs_decl : IDL_ABSTRACT value_header $$20 '{' $$21 exports $$22 '}'",
+"value_header : value_decl opt_truncatable inheritance_spec supports_spec",
 "$$23 :",
-"scoped_name : IDL_SCOPE_DELIMITOR $$23 id",
+"value_decl : IDL_VALUETYPE $$23 id",
+"opt_truncatable : IDL_TRUNCATABLE",
+"opt_truncatable :",
+"supports_spec : IDL_SUPPORTS scoped_name",
+"supports_spec :",
+"value_forward_decl : IDL_ABSTRACT value_decl",
+"value_forward_decl : value_decl",
+"value_box_decl : value_decl type_spec",
+"value_elements : value_elements value_element",
+"value_elements :",
+"value_element : state_member",
+"value_element : export",
+"value_element : init_decl",
 "$$24 :",
-"scoped_name : scoped_name IDL_SCOPE_DELIMITOR $$24 id",
-"id : IDENTIFIER",
-"forward : interface_decl",
+"state_member : IDL_PUBLIC $$24 member_i",
 "$$25 :",
+"state_member : IDL_PRIVATE $$25 member_i",
+"exports : exports export",
+"exports :",
 "$$26 :",
+"export : type_dcl $$26 ';'",
 "$$27 :",
+"export : const_dcl $$27 ';'",
 "$$28 :",
-"const_dcl : IDL_CONST $$25 const_type $$26 id $$27 '=' $$28 expression",
+"export : exception $$28 ';'",
+"$$29 :",
+"export : attribute $$29 ';'",
+"$$30 :",
+"export : operation $$30 ';'",
+"$$31 :",
+"export : error $$31 ';'",
+"at_least_one_scoped_name : scoped_name scoped_names",
+"$$32 :",
+"scoped_names : scoped_names ',' $$32 scoped_name",
+"scoped_names :",
+"scoped_name : id",
+"$$33 :",
+"scoped_name : IDL_SCOPE_DELIMITOR $$33 id",
+"$$34 :",
+"scoped_name : scoped_name IDL_SCOPE_DELIMITOR $$34 id",
+"id : IDENTIFIER",
+"forward : interface_decl",
+"$$35 :",
+"$$36 :",
+"$$37 :",
+"$$38 :",
+"const_dcl : IDL_CONST $$35 const_type $$36 id $$37 '=' $$38 expression",
 "const_type : integer_type",
 "const_type : char_type",
 "const_type : octet_type",
@@ -585,14 +701,14 @@ char *tao_yyrule[] = {
 "literal : IDL_TRUETOK",
 "literal : IDL_FALSETOK",
 "positive_int_expr : const_expr",
-"$$29 :",
-"type_dcl : IDL_TYPEDEF $$29 type_declarator",
+"$$39 :",
+"type_dcl : IDL_TYPEDEF $$39 type_declarator",
 "type_dcl : struct_type",
 "type_dcl : union_type",
 "type_dcl : enum_type",
 "type_dcl : IDL_NATIVE simple_declarator",
-"$$30 :",
-"type_declarator : type_spec $$30 at_least_one_declarator",
+"$$40 :",
+"type_declarator : type_spec $$40 at_least_one_declarator",
 "type_spec : simple_type_spec",
 "type_spec : constructed_type_spec",
 "simple_type_spec : base_type_spec",
@@ -611,14 +727,14 @@ char *tao_yyrule[] = {
 "constructed_type_spec : union_type",
 "constructed_type_spec : enum_type",
 "at_least_one_declarator : declarator declarators",
-"$$31 :",
-"declarators : declarators ',' $$31 declarator",
+"$$41 :",
+"declarators : declarators ',' $$41 declarator",
 "declarators :",
 "declarator : simple_declarator",
 "declarator : complex_declarator",
 "at_least_one_simple_declarator : simple_declarator simple_declarators",
-"$$32 :",
-"simple_declarators : simple_declarators ',' $$32 simple_declarator",
+"$$42 :",
+"simple_declarators : simple_declarators ',' $$42 simple_declarator",
 "simple_declarators :",
 "simple_declarator : id",
 "complex_declarator : array_declarator",
@@ -638,135 +754,138 @@ char *tao_yyrule[] = {
 "octet_type : IDL_OCTET",
 "boolean_type : IDL_BOOLEAN",
 "any_type : IDL_ANY",
-"$$33 :",
-"$$34 :",
-"$$35 :",
-"$$36 :",
-"struct_type : IDL_STRUCT $$33 id $$34 '{' $$35 at_least_one_member $$36 '}'",
-"at_least_one_member : member members",
-"members : members member",
-"members :",
-"$$37 :",
-"$$38 :",
-"member : type_spec $$37 at_least_one_declarator $$38 ';'",
-"$$39 :",
-"member : error $$39 ';'",
-"$$40 :",
-"$$41 :",
-"$$42 :",
 "$$43 :",
 "$$44 :",
 "$$45 :",
 "$$46 :",
+"struct_type : IDL_STRUCT $$43 id $$44 '{' $$45 at_least_one_member $$46 '}'",
+"at_least_one_member : member members",
+"members : members member",
+"members :",
 "$$47 :",
-"union_type : IDL_UNION $$40 id $$41 IDL_SWITCH $$42 '(' $$43 switch_type_spec $$44 ')' $$45 '{' $$46 at_least_one_case_branch $$47 '}'",
-"switch_type_spec : integer_type",
-"switch_type_spec : char_type",
-"switch_type_spec : octet_type",
-"switch_type_spec : boolean_type",
-"switch_type_spec : enum_type",
-"switch_type_spec : scoped_name",
-"at_least_one_case_branch : case_branch case_branches",
-"case_branches : case_branches case_branch",
-"case_branches :",
+"member : $$47 member_i",
 "$$48 :",
 "$$49 :",
-"case_branch : at_least_one_case_label $$48 element_spec $$49 ';'",
+"member_i : type_spec $$48 at_least_one_declarator $$49 ';'",
 "$$50 :",
-"case_branch : error $$50 ';'",
-"at_least_one_case_label : case_label case_labels",
-"case_labels : case_labels case_label",
-"case_labels :",
+"member_i : error $$50 ';'",
 "$$51 :",
-"case_label : IDL_DEFAULT $$51 ':'",
 "$$52 :",
 "$$53 :",
-"case_label : IDL_CASE $$52 const_expr $$53 ':'",
 "$$54 :",
-"element_spec : type_spec $$54 declarator",
 "$$55 :",
 "$$56 :",
 "$$57 :",
 "$$58 :",
-"enum_type : IDL_ENUM $$55 id $$56 '{' $$57 at_least_one_enumerator $$58 '}'",
-"at_least_one_enumerator : enumerator enumerators",
+"union_type : IDL_UNION $$51 id $$52 IDL_SWITCH $$53 '(' $$54 switch_type_spec $$55 ')' $$56 '{' $$57 at_least_one_case_branch $$58 '}'",
+"switch_type_spec : integer_type",
+"switch_type_spec : char_type",
+"switch_type_spec : octet_type",
+"switch_type_spec : boolean_type",
+"switch_type_spec : enum_type",
+"switch_type_spec : scoped_name",
+"at_least_one_case_branch : case_branch case_branches",
+"case_branches : case_branches case_branch",
+"case_branches :",
 "$$59 :",
-"enumerators : enumerators ',' $$59 enumerator",
-"enumerators :",
-"enumerator : IDENTIFIER",
 "$$60 :",
+"case_branch : at_least_one_case_label $$59 element_spec $$60 ';'",
 "$$61 :",
-"sequence_type_spec : seq_head ',' $$60 positive_int_expr $$61 '>'",
-"sequence_type_spec : seq_head '>'",
+"case_branch : error $$61 ';'",
+"at_least_one_case_label : case_label case_labels",
+"case_labels : case_labels case_label",
+"case_labels :",
 "$$62 :",
+"case_label : IDL_DEFAULT $$62 ':'",
 "$$63 :",
-"seq_head : IDL_SEQUENCE $$62 '<' $$63 simple_type_spec",
 "$$64 :",
+"case_label : IDL_CASE $$63 const_expr $$64 ':'",
 "$$65 :",
-"string_type_spec : string_head '<' $$64 positive_int_expr $$65 '>'",
-"string_type_spec : string_head",
-"string_head : IDL_STRING",
+"element_spec : type_spec $$65 declarator",
 "$$66 :",
 "$$67 :",
-"wstring_type_spec : wstring_head '<' $$66 positive_int_expr $$67 '>'",
-"wstring_type_spec : wstring_head",
-"wstring_head : IDL_WSTRING",
 "$$68 :",
-"array_declarator : id $$68 at_least_one_array_dim",
-"at_least_one_array_dim : array_dim array_dims",
-"array_dims : array_dims array_dim",
-"array_dims :",
 "$$69 :",
+"enum_type : IDL_ENUM $$66 id $$67 '{' $$68 at_least_one_enumerator $$69 '}'",
+"at_least_one_enumerator : enumerator enumerators",
 "$$70 :",
-"array_dim : '[' $$69 positive_int_expr $$70 ']'",
+"enumerators : enumerators ',' $$70 enumerator",
+"enumerators :",
+"enumerator : IDENTIFIER",
 "$$71 :",
 "$$72 :",
-"attribute : opt_readonly IDL_ATTRIBUTE $$71 param_type_spec $$72 at_least_one_simple_declarator",
-"opt_readonly : IDL_READONLY",
-"opt_readonly :",
+"sequence_type_spec : seq_head ',' $$71 positive_int_expr $$72 '>'",
+"sequence_type_spec : seq_head '>'",
 "$$73 :",
 "$$74 :",
+"seq_head : IDL_SEQUENCE $$73 '<' $$74 simple_type_spec",
 "$$75 :",
 "$$76 :",
-"exception : IDL_EXCEPTION $$73 id $$74 '{' $$75 members $$76 '}'",
+"string_type_spec : string_head '<' $$75 positive_int_expr $$76 '>'",
+"string_type_spec : string_head",
+"string_head : IDL_STRING",
 "$$77 :",
 "$$78 :",
+"wstring_type_spec : wstring_head '<' $$77 positive_int_expr $$78 '>'",
+"wstring_type_spec : wstring_head",
+"wstring_head : IDL_WSTRING",
 "$$79 :",
+"array_declarator : id $$79 at_least_one_array_dim",
+"at_least_one_array_dim : array_dim array_dims",
+"array_dims : array_dims array_dim",
+"array_dims :",
 "$$80 :",
-"operation : opt_op_attribute op_type_spec $$77 IDENTIFIER $$78 parameter_list $$79 opt_raises $$80 opt_context",
+"$$81 :",
+"array_dim : '[' $$80 positive_int_expr $$81 ']'",
+"$$82 :",
+"$$83 :",
+"attribute : opt_readonly IDL_ATTRIBUTE $$82 param_type_spec $$83 at_least_one_simple_declarator",
+"opt_readonly : IDL_READONLY",
+"opt_readonly :",
+"$$84 :",
+"$$85 :",
+"$$86 :",
+"$$87 :",
+"exception : IDL_EXCEPTION $$84 id $$85 '{' $$86 members $$87 '}'",
+"$$88 :",
+"$$89 :",
+"$$90 :",
+"$$91 :",
+"operation : opt_op_attribute op_type_spec $$88 IDENTIFIER $$89 parameter_list $$90 opt_raises $$91 opt_context",
 "opt_op_attribute : IDL_ONEWAY",
 "opt_op_attribute : IDL_IDEMPOTENT",
 "opt_op_attribute :",
 "op_type_spec : param_type_spec",
 "op_type_spec : IDL_VOID",
-"$$81 :",
-"parameter_list : '(' $$81 ')'",
-"$$82 :",
-"parameter_list : '(' $$82 at_least_one_parameter ')'",
+"init_decl : IDL_INIT",
+"$$92 :",
+"parameter_list : '(' $$92 ')'",
+"$$93 :",
+"parameter_list : '(' $$93 at_least_one_parameter ')'",
 "at_least_one_parameter : parameter parameters",
-"$$83 :",
-"parameters : parameters ',' $$83 parameter",
+"$$94 :",
+"parameters : parameters ',' $$94 parameter",
 "parameters :",
-"$$84 :",
-"$$85 :",
-"parameter : direction $$84 param_type_spec $$85 declarator",
+"$$95 :",
+"$$96 :",
+"parameter : direction $$95 param_type_spec $$96 declarator",
 "param_type_spec : base_type_spec",
 "param_type_spec : string_type_spec",
 "param_type_spec : scoped_name",
 "direction : IDL_IN",
 "direction : IDL_OUT",
 "direction : IDL_INOUT",
-"$$86 :",
-"$$87 :",
-"opt_raises : IDL_RAISES $$86 '(' $$87 at_least_one_scoped_name ')'",
+"$$97 :",
+"$$98 :",
+"opt_raises : IDL_RAISES $$97 '(' $$98 at_least_one_scoped_name ')'",
 "opt_raises :",
-"$$88 :",
-"$$89 :",
-"opt_context : IDL_CONTEXT $$88 '(' $$89 at_least_one_string_literal ')'",
+"$$99 :",
+"$$100 :",
+"opt_context : IDL_CONTEXT $$99 '(' $$100 at_least_one_string_literal ')'",
 "opt_context :",
 "at_least_one_string_literal : IDL_STRING_LITERAL string_literals",
-"$$90 :",
-"string_literals : string_literals ',' $$90 IDL_STRING_LITERAL",
+"$$101 :",
+"string_literals : string_literals ',' $$101 IDL_STRING_LITERAL",
 "string_literals :",
 };
 #endif
@@ -790,7 +909,7 @@ TAO_YYSTYPE tao_yylval;
 #define tao_yystacksize TAO_YYSTACKSIZE
 short tao_yyss[TAO_YYSTACKSIZE];
 TAO_YYSTYPE tao_yyvs[TAO_YYSTACKSIZE];
-#line 2294 "fe/idl.tao_yy"
+#line 2521 "fe/idl.tao_yy"
 /* programs */
 
 /*
@@ -812,7 +931,7 @@ void
 tao_yyerror(const char *)
 {
 }
-#line 815 "y.tab.cpp"
+#line 934 "y.tab.cpp"
 #define TAO_YYABORT goto tao_yyabort
 #define TAO_YYACCEPT goto tao_yyaccept
 #define TAO_YYERROR goto tao_yyerrlab
@@ -1097,7 +1216,7 @@ tao_yyinrecovery:
             if (5 < tao_yydebug)
                 printf("tao_yydebug: state %d, error recovery discards token %d (%s)\n",
                     tao_yystate, tao_yychar, tao_yys);
-            else 
+            else
                 TAO_YYDEBUG_DISCARD_TOKEN(tao_yystate, tao_yychar, tao_yys, tao_yyssp-tao_yyss);
         }
 #endif
@@ -1118,2189 +1237,2386 @@ tao_yyreduce:
     switch (tao_yyn)
     {
 case 4:
-#line 240 "fe/idl.tao_yy"
+#line 253 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
         }
 break;
 case 5:
-#line 244 "fe/idl.tao_yy"
+#line 257 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         }
 break;
 case 6:
-#line 248 "fe/idl.tao_yy"
+#line 261 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
         }
 break;
 case 7:
-#line 252 "fe/idl.tao_yy"
+#line 265 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         }
 break;
 case 8:
-#line 256 "fe/idl.tao_yy"
+#line 269 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
         }
 break;
 case 9:
-#line 260 "fe/idl.tao_yy"
+#line 273 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         }
 break;
 case 10:
-#line 264 "fe/idl.tao_yy"
+#line 277 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen);
         }
 break;
 case 11:
-#line 268 "fe/idl.tao_yy"
+#line 281 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         }
 break;
 case 12:
-#line 272 "fe/idl.tao_yy"
+#line 285 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen);
         }
 break;
 case 13:
-#line 276 "fe/idl.tao_yy"
+#line 289 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         }
 break;
 case 14:
-#line 280 "fe/idl.tao_yy"
+#line 293 "fe/idl.tao_yy"
 {
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeDeclSeen);
+        }
 break;
 case 15:
-#line 284 "fe/idl.tao_yy"
+#line 297 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  tao_yyerrok;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        }
 break;
 case 16:
-#line 291 "fe/idl.tao_yy"
+#line 301 "fe/idl.tao_yy"
 {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
-	  }
+          idl_global->err()->syntax_error(idl_global->parse_state());
+        }
 break;
 case 17:
-#line 295 "fe/idl.tao_yy"
+#line 305 "fe/idl.tao_yy"
 {
-	    UTL_ScopedName 	*n =
-		new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE), NULL);
-	    AST_Module		*m = NULL;
-	    UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	    UTL_StrList		*p = idl_global->pragmas();
-
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleIDSeen);
-	    /*
-	     * Make a new module and add it to the enclosing scope
-	     */
-	    if (s != NULL) {
-	      m = idl_global->gen()->create_module(n, p);
-	      (void) s->fe_add_module(m);
-	    }
-	    /*
-	     * Push it on the stack
-	     */
-	    idl_global->scopes()->push(m);
-	  }
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          tao_yyerrok;
+        }
 break;
 case 18:
-#line 316 "fe/idl.tao_yy"
+#line 312 "fe/idl.tao_yy"
 {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
-	  }
+            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
+          }
 break;
 case 19:
-#line 320 "fe/idl.tao_yy"
+#line 316 "fe/idl.tao_yy"
 {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen);
-	  }
+            UTL_ScopedName      *n =
+                new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE), NULL);
+            AST_Module          *m = NULL;
+            UTL_Scope           *s = idl_global->scopes()->top_non_null();
+            UTL_StrList         *p = idl_global->pragmas();
+
+            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleIDSeen);
+            /*
+             * Make a new module and add it to the enclosing scope
+             */
+            if (s != NULL) {
+              m = idl_global->gen()->create_module(n, p);
+              (void) s->fe_add_module(m);
+            }
+            /*
+             * Push it on the stack
+             */
+            idl_global->scopes()->push(m);
+          }
 break;
 case 20:
-#line 324 "fe/idl.tao_yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen);
-	    /*
-	     * Finished with this module - pop it from the scope stack
-	     */
-	    UTL_Scope* s = idl_global->scopes()->top();
-	    AST_Module* m = AST_Module::narrow_from_scope (s);
-	    UTL_StrList *p = m->pragmas ();
-	    if (p != 0)
-		p = (UTL_StrList*)p->copy ();
-	    idl_global->set_pragmas (p);
-	    idl_global->scopes()->pop();
-	  }
-break;
-case 23:
-#line 346 "fe/idl.tao_yy"
-{
-	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
-	  AST_Interface *i = NULL;
-	  AST_Decl	*v = NULL;
-	  UTL_StrList   *p = idl_global->pragmas();
-	  AST_Decl	*d = NULL;
-	  AST_Interface *fd = NULL;
-
-	  ACE_UNUSED_ARG (v);
-
-	  /*
-	   * Make a new interface node and add it to its enclosing scope
-	   */
-	  if (s != NULL && tao_yyvsp[0].ihval != NULL) {
-	    i = idl_global->gen()->create_interface(tao_yyvsp[0].ihval->interface_name(),
-						    tao_yyvsp[0].ihval->inherits(),
-						    tao_yyvsp[0].ihval->n_inherits(),
-						    p);
-	    if (i != NULL &&
-		(d = s->lookup_by_name(i->name(), I_FALSE)) != NULL) {
-	      /*
-	       * See if we're defining a forward declared interface.
-	       */
-	      if (d->node_type() == AST_Decl::NT_interface) {
-		/*
-		 * Narrow to an interface
-		 */
-		fd = AST_Interface::narrow_from_decl(d);
-		/*
-		 * Successful?
-		 */
-		if (fd == NULL) {
-		  /*
-		   * Should we give an error here?
-		   */
-		}
-		/*
-		 * If it is a forward declared interface..
-		 */
-		else if (!fd->is_defined()) {
-		  /*
-		   * Check if redefining in same scope
-		   */
-		  if (fd->defined_in() != s) {
-		    idl_global->err()
-		       ->error3(UTL_Error::EIDL_SCOPE_CONFLICT,
-				i,
-				fd,
-				ScopeAsDecl(s));
-		  }
-		  /*
-		   * All OK, do the redefinition
-		   */
-		  else {
-		    fd->set_inherits(tao_yyvsp[0].ihval->inherits());
-		    fd->set_n_inherits(tao_yyvsp[0].ihval->n_inherits());
-		    /*
-		     * Update place of definition
-		     */
-		    fd->set_imported(idl_global->imported());
-		    fd->set_in_main_file(idl_global->in_main_file());
-		    fd->set_line(idl_global->lineno());
-		    fd->set_file_name(idl_global->filename());
-		    fd->add_pragmas(p);
-		    /*
-		     * Use full definition node
-		     */
-		    delete i;
-		    i = fd;
-		  }
-	        }
-	      }
-	    }
-	    /*
-	     * Add the interface to its definition scope
-	     */
-	    (void) s->fe_add_interface(i);
-	  }
-	  /*
-	   * Push it on the scope stack
-	   */
-	  idl_global->scopes()->push(i);
-        }
-break;
-case 24:
-#line 430 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
-	}
+#line 337 "fe/idl.tao_yy"
+{
+            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
+          }
+break;
+case 21:
+#line 341 "fe/idl.tao_yy"
+{
+            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen);
+          }
+break;
+case 22:
+#line 345 "fe/idl.tao_yy"
+{
+            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen);
+            /*
+             * Finished with this module - pop it from the scope stack
+             */
+            UTL_Scope* s = idl_global->scopes()->top();
+            AST_Module* m = AST_Module::narrow_from_scope (s);
+            UTL_StrList *p = m->pragmas ();
+            if (p != 0)
+                p = (UTL_StrList*)p->copy ();
+            idl_global->set_pragmas (p);
+            idl_global->scopes()->pop();
+          }
 break;
 case 25:
-#line 434 "fe/idl.tao_yy"
+#line 367 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
-	}
+          UTL_Scope     *s = idl_global->scopes()->top_non_null();
+          AST_Interface *i = NULL;
+          AST_Decl      *v = NULL;
+          UTL_StrList   *p = idl_global->pragmas();
+          ACE_UNUSED_ARG (v);
+
+          /*
+           * Make a new interface node and add it to its enclosing scope
+           */
+          if (s != NULL && tao_yyvsp[0].ihval != NULL) {
+            i = idl_global->gen()->create_interface(tao_yyvsp[0].ihval->interface_name(),
+                                                    tao_yyvsp[0].ihval->inherits(),
+                                                    tao_yyvsp[0].ihval->n_inherits(),
+                                                    p);
+            AST_Interface::fwd_redefinition_helper (i,s,p);
+            /*
+             * Add the interface to its definition scope
+             */
+            (void) s->fe_add_interface(i);
+          }
+          /*
+           * Push it on the scope stack
+           */
+          idl_global->scopes()->push(i);
+        }
 break;
 case 26:
-#line 438 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
-	  /*
-	   * Done with this interface - pop it off the scopes stack
-	   */
-	  UTL_Scope* s = idl_global->scopes()->top();
-	  AST_Interface* m = AST_Interface::narrow_from_scope (s);
-	  UTL_StrList *p = m->pragmas ();
-	  if (p != 0)
-		p = (UTL_StrList*)p->copy ();
-	  idl_global->set_pragmas (p);
-	  idl_global->scopes()->pop();
-	}
+#line 394 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
+        }
 break;
 case 27:
-#line 455 "fe/idl.tao_yy"
+#line 398 "fe/idl.tao_yy"
 {
-	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
-	 }
+          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
+        }
 break;
 case 28:
-#line 459 "fe/idl.tao_yy"
-{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
-	   tao_yyval.idval = tao_yyvsp[0].idval;
-	 }
+#line 402 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
+          /*
+           * Done with this interface - pop it off the scopes stack
+           */
+          UTL_Scope* s = idl_global->scopes()->top();
+          AST_Interface* m = AST_Interface::narrow_from_scope (s);
+          UTL_StrList *p = m->pragmas ();
+          if (p != 0)
+                p = (UTL_StrList*)p->copy ();
+          idl_global->set_pragmas (p);
+          idl_global->scopes()->pop();
+        }
 break;
 case 29:
-#line 467 "fe/idl.tao_yy"
+#line 419 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen);
-	  /*
-	   * Create an AST representation of the information in the header
-	   * part of an interface - this representation contains a computed
-	   * list of all interfaces which this interface inherits from,
-	   * recursively
-	   */
-	  tao_yyval.ihval = new FE_InterfaceHeader(new UTL_ScopedName(tao_yyvsp[-1].idval, NULL), tao_yyvsp[0].nlval);
-	}
+           idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
+         }
 break;
 case 30:
-#line 481 "fe/idl.tao_yy"
+#line 423 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
-        }
+           idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
+           tao_yyval.idval = tao_yyvsp[0].idval;
+         }
 break;
 case 31:
-#line 485 "fe/idl.tao_yy"
+#line 431 "fe/idl.tao_yy"
 {
-	  tao_yyval.nlval = tao_yyvsp[0].nlval;
-	}
-break;
-case 32:
-#line 489 "fe/idl.tao_yy"
-{
-	  tao_yyval.nlval = NULL;
-	}
-break;
-case 35:
-#line 501 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen);
+          /*
+           * Create an AST representation of the information in the header
+           * part of an interface - this representation contains a computed
+           * list of all interfaces which this interface inherits from,
+           * recursively
+           */
+          tao_yyval.ihval = new FE_InterfaceHeader(new UTL_ScopedName(tao_yyvsp[-1].idval, NULL), tao_yyvsp[0].nlval);
         }
 break;
-case 36:
-#line 505 "fe/idl.tao_yy"
+case 32:
+#line 445 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
         }
 break;
-case 37:
-#line 509 "fe/idl.tao_yy"
+case 33:
+#line 449 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
+          tao_yyval.nlval = tao_yyvsp[0].nlval;
         }
 break;
-case 38:
-#line 513 "fe/idl.tao_yy"
+case 34:
+#line 453 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          tao_yyval.nlval = NULL;
         }
 break;
 case 39:
-#line 517 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        }
-break;
-case 40:
-#line 521 "fe/idl.tao_yy"
+#line 467 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+           cerr << "error in " << idl_global->filename()->get_string()
+                << " line " << idl_global->lineno() << ":\n" ;
+           cerr << "Sorry, I (TAO_IDL) can't handle custom yet\n";
+            /* set custom (if not truncatable) */
         }
 break;
 case 41:
-#line 525 "fe/idl.tao_yy"
+#line 478 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen);
+          UTL_Scope     *s = idl_global->scopes()->top_non_null();
+          AST_Interface *i = NULL;
+          UTL_StrList   *p = idl_global->pragmas();
+
+          if (s != NULL && tao_yyvsp[0].vhval != NULL) {
+            i = idl_global->gen()->create_valuetype(tao_yyvsp[0].vhval->interface_name(),
+                                                    tao_yyvsp[0].vhval->inherits(),
+                                                    tao_yyvsp[0].vhval->n_inherits(),
+                                                    p);
+            AST_Interface::fwd_redefinition_helper (i,s,p);
+            /*
+             * Add the valuetype to its definition scope
+             */
+            (void) s->fe_add_interface(i);
+          }
+          /*
+           * Push it on the scope stack
+           */
+          idl_global->scopes()->push(i);
         }
 break;
 case 42:
-#line 529 "fe/idl.tao_yy"
+#line 500 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
         }
 break;
 case 43:
-#line 533 "fe/idl.tao_yy"
+#line 504 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
         }
 break;
 case 44:
-#line 537 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+#line 508 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
+          /*
+           * Done with this interface - pop it off the scopes stack
+           */
+          UTL_Scope* s = idl_global->scopes()->top();
+          AST_Interface* m = AST_Interface::narrow_from_scope (s);
+          UTL_StrList *p = m->pragmas ();
+          if (p != 0) p = (UTL_StrList*)p->copy ();
+          idl_global->set_pragmas (p);
+          idl_global->scopes()->pop();
         }
 break;
 case 45:
-#line 541 "fe/idl.tao_yy"
+#line 525 "fe/idl.tao_yy"
 {
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
+          UTL_Scope     *s = idl_global->scopes()->top_non_null();
+          AST_Interface *i = NULL;
+          UTL_StrList   *p = idl_global->pragmas();
+
+          if (s != NULL && tao_yyvsp[0].vhval != NULL) {
+
+            if (tao_yyvsp[0].vhval->n_concrete() > 0) {
+              idl_global->err()->abstract_inheritance_error (tao_yyvsp[0].vhval->interface_name ());
+            }
+
+            i = idl_global->gen()->create_valuetype(tao_yyvsp[0].vhval->interface_name(),
+                                                    tao_yyvsp[0].vhval->inherits(),
+                                                    tao_yyvsp[0].vhval->n_inherits(),
+                                                    p);
+            i->set_abstract_valuetype ();
+            AST_Interface::fwd_redefinition_helper (i,s,p);
+            /*
+             * Add the valuetype to its definition scope
+             */
+            (void) s->fe_add_interface(i);
+          }
+          /*
+           * Push it on the scope stack
+           */
+          idl_global->scopes()->push(i);
+        }
 break;
 case 46:
-#line 545 "fe/idl.tao_yy"
+#line 553 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  tao_yyerrok;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
+        }
 break;
 case 47:
-#line 553 "fe/idl.tao_yy"
+#line 557 "fe/idl.tao_yy"
 {
-	  tao_yyval.nlval = new UTL_NameList(tao_yyvsp[-1].idlist, tao_yyvsp[0].nlval);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
+        }
 break;
 case 48:
 #line 561 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
+          /*
+           * Done with this interface - pop it off the scopes stack
+           */
+          UTL_Scope* s = idl_global->scopes()->top();
+          AST_Interface* m = AST_Interface::narrow_from_scope (s);
+          UTL_StrList *p = m->pragmas ();
+          if (p != 0) p = (UTL_StrList*)p->copy ();
+          idl_global->set_pragmas (p);
+          idl_global->scopes()->pop();
         }
 break;
 case 49:
-#line 565 "fe/idl.tao_yy"
+#line 581 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen);
-
-	  if (tao_yyvsp[-3].nlval == NULL)
-	    tao_yyval.nlval = new UTL_NameList(tao_yyvsp[0].idlist, NULL);
-	  else {
-	    tao_yyvsp[-3].nlval->nconc(new UTL_NameList(tao_yyvsp[0].idlist, NULL));
-	    tao_yyval.nlval = tao_yyvsp[-3].nlval;
-	  }
-	}
+          tao_yyval.vhval = new FE_obv_header (new UTL_ScopedName (tao_yyvsp[-3].idval, NULL), tao_yyvsp[-1].nlval, tao_yyvsp[0].nlval);
+        }
 break;
 case 50:
-#line 576 "fe/idl.tao_yy"
+#line 588 "fe/idl.tao_yy"
 {
-	  tao_yyval.nlval = NULL;
-	}
+           idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeSeen);
+        }
 break;
 case 51:
-#line 583 "fe/idl.tao_yy"
+#line 592 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  tao_yyval.idlist = new UTL_IdList(tao_yyvsp[0].idval, NULL);
-	}
+           idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeIDSeen);
+           tao_yyval.idval = tao_yyvsp[0].idval;
+        }
 break;
 case 52:
-#line 589 "fe/idl.tao_yy"
+#line 600 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
+            cerr << "warning in " << idl_global->filename()->get_string()
+                 << " line " << idl_global->lineno() << ":\n" ;
+            cerr << "truncatable modifier not supported and is ignored\n";
+            tao_yyval.bval = I_FALSE;
+            /* $$ = I_TRUE; */
+          }
 break;
 case 53:
-#line 593 "fe/idl.tao_yy"
+#line 608 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  tao_yyval.idlist = new UTL_IdList(new Identifier(tao_yyvsp[-2].strval, 1, 0, I_FALSE),
-			      new UTL_IdList(tao_yyvsp[0].idval, NULL));
-	}
+            tao_yyval.bval = I_FALSE;
+          }
 break;
 case 54:
-#line 601 "fe/idl.tao_yy"
+#line 616 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
+              tao_yyval.nlval = new UTL_NameList(tao_yyvsp[0].idlist, NULL);
+            }
 break;
 case 55:
-#line 605 "fe/idl.tao_yy"
+#line 620 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  tao_yyvsp[-3].idlist->nconc(new UTL_IdList(tao_yyvsp[0].idval, NULL));
-	  tao_yyval.idlist = tao_yyvsp[-3].idlist;
-	}
+              tao_yyval.nlval = NULL;
+            }
 break;
 case 56:
-#line 614 "fe/idl.tao_yy"
+#line 628 "fe/idl.tao_yy"
 {
-            tao_yyval.idval = new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE);
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
+          AST_InterfaceFwd      *f = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
+
+          idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
+          /*
+           * Create a node representing a forward declaration of an
+           * valuetype. Store it in the enclosing scope
+           */
+          if (s != NULL) {
+            f = idl_global->gen()->create_valuetype_fwd(n, p);
+         /*   if ($1)*/
+            f->set_abstract_valuetype ();
+            (void) s->fe_add_interface_fwd(f);
+          }
         }
 break;
 case 57:
-#line 621 "fe/idl.tao_yy"
+#line 648 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
-	  AST_InterfaceFwd	*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
+          AST_InterfaceFwd      *f = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
-	  /*
-	   * Create a node representing a forward declaration of an
-	   * interface. Store it in the enclosing scope
-	   */
-	  if (s != NULL) {
-	    f = idl_global->gen()->create_interface_fwd(n, p);
-	    (void) s->fe_add_interface_fwd(f);
-	  }
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
+          /*
+           * Create a node representing a forward declaration of an
+           * valuetype. Store it in the enclosing scope
+           */
+          if (s != NULL) {
+            f = idl_global->gen()->create_valuetype_fwd(n, p);
+            (void) s->fe_add_interface_fwd(f);
+          }
+        }
 break;
 case 58:
-#line 641 "fe/idl.tao_yy"
+#line 669 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
+           cerr << "error in " << idl_global->filename()->get_string()
+                << " line " << idl_global->lineno() << ":\n" ;
+           cerr << "Sorry, I (TAO_IDL) can't handle boxes yet\n";
         }
 break;
-case 59:
-#line 645 "fe/idl.tao_yy"
+case 64:
+#line 689 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
-        }
+            /* is $0 to member_i */
+            tao_yyval.vival = AST_Field::vis_PUBLIC;
+          }
 break;
-case 60:
-#line 649 "fe/idl.tao_yy"
+case 66:
+#line 695 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
+            /* is $0 to member_i */
+            tao_yyval.vival = AST_Field::vis_PRIVATE;
+          }
+break;
+case 70:
+#line 709 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
         }
 break;
-case 61:
-#line 653 "fe/idl.tao_yy"
+case 71:
+#line 713 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         }
 break;
-case 62:
-#line 657 "fe/idl.tao_yy"
+case 72:
+#line 717 "fe/idl.tao_yy"
 {
-	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yyvsp[-4].idval, NULL);
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Constant		*c = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-	  ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstExprSeen);
-	  /*
-	   * Create a node representing a constant declaration. Store
-	   * it in the enclosing scope
-	   */
-	  if (tao_yyvsp[0].exval != NULL && s != NULL) {
-	    if (tao_yyvsp[0].exval->coerce(tao_yyvsp[-6].etval) == NULL)
-	      idl_global->err()->coercion_error(tao_yyvsp[0].exval, tao_yyvsp[-6].etval);
-	    else {
-	      c =
-		idl_global->gen()->create_constant(tao_yyvsp[-6].etval, tao_yyvsp[0].exval, n, p);
-	      (void) s->fe_add_constant(c);
-	    }
-	  }
-	}
-break;
-case 68:
-#line 690 "fe/idl.tao_yy"
-{
-	  tao_yyval.etval = AST_Expression::EV_string;
-	}
-break;
-case 69:
-#line 694 "fe/idl.tao_yy"
-{
-	  tao_yyval.etval = AST_Expression::EV_wstring;
+          idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
         }
 break;
-case 70:
-#line 698 "fe/idl.tao_yy"
+case 73:
+#line 721 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Decl		*d = NULL;
-	  AST_PredefinedType	*c = NULL;
-	  AST_Typedef		*t = NULL;
-
-	  /*
-	   * If the constant's type is a scoped name, it must resolve
-	   * to a scalar constant type
-	   */
-	  if (s != NULL && (d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE)) != NULL) {
-	    /*
-	     * Look through typedefs
-	     */
-	    while (d->node_type() == AST_Decl::NT_typedef) {
-	      t = AST_Typedef::narrow_from_decl(d);
-	      if (t == NULL)
-	        break;
-	      d = t->base_type();
-	    }
-	    if (d == NULL)
-	      tao_yyval.etval = AST_Expression::EV_any;
-	    else if (d->node_type() == AST_Decl::NT_pre_defined) {
-	      c = AST_PredefinedType::narrow_from_decl(d);
-	      if (c != NULL) {
-	         tao_yyval.etval = idl_global->PredefinedTypeToExprType(c->pt());
-	      } else {
-	         tao_yyval.etval = AST_Expression::EV_any;
-	      }
-	    } else if (d->node_type () == AST_Decl::NT_string) {
-                tao_yyval.etval = AST_Expression::EV_string;
-            /* @ASG@ we will need a similar one for wstring after it
-                is implemented */
-            } else            
-	      tao_yyval.etval = AST_Expression::EV_any;
-	  } else
-	    tao_yyval.etval = AST_Expression::EV_any;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        }
 break;
 case 74:
-#line 744 "fe/idl.tao_yy"
+#line 725 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
+        }
+break;
+case 75:
+#line 729 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        }
 break;
 case 76:
-#line 752 "fe/idl.tao_yy"
+#line 733 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen);
+        }
+break;
+case 77:
+#line 737 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        }
 break;
 case 78:
-#line 760 "fe/idl.tao_yy"
+#line 741 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen);
+        }
+break;
+case 79:
+#line 745 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        }
 break;
 case 80:
-#line 768 "fe/idl.tao_yy"
+#line 749 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
-	}
+          idl_global->err()->syntax_error(idl_global->parse_state());
+        }
 break;
 case 81:
-#line 772 "fe/idl.tao_yy"
+#line 753 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          tao_yyerrok;
+        }
+break;
+case 82:
+#line 761 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
-	}
+          tao_yyval.nlval = new UTL_NameList(tao_yyvsp[-1].idlist, tao_yyvsp[0].nlval);
+        }
 break;
 case 83:
-#line 780 "fe/idl.tao_yy"
+#line 769 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
+        }
 break;
 case 84:
+#line 773 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen);
+
+          if (tao_yyvsp[-3].nlval == NULL)
+            tao_yyval.nlval = new UTL_NameList(tao_yyvsp[0].idlist, NULL);
+          else {
+            tao_yyvsp[-3].nlval->nconc(new UTL_NameList(tao_yyvsp[0].idlist, NULL));
+            tao_yyval.nlval = tao_yyvsp[-3].nlval;
+          }
+        }
+break;
+case 85:
 #line 784 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
-	}
+          tao_yyval.nlval = NULL;
+        }
 break;
 case 86:
-#line 792 "fe/idl.tao_yy"
+#line 791 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
+
+          tao_yyval.idlist = new UTL_IdList(tao_yyvsp[0].idval, NULL);
+        }
 break;
 case 87:
-#line 796 "fe/idl.tao_yy"
+#line 797 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
+        }
 break;
 case 88:
-#line 800 "fe/idl.tao_yy"
+#line 801 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
+
+          tao_yyval.idlist = new UTL_IdList(new Identifier(tao_yyvsp[-2].strval, 1, 0, I_FALSE),
+                              new UTL_IdList(tao_yyvsp[0].idval, NULL));
+        }
+break;
+case 89:
+#line 809 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
+        }
 break;
 case 90:
-#line 808 "fe/idl.tao_yy"
+#line 813 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
-					      tao_yyvsp[0].exval,
-					      NULL);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
+
+          tao_yyvsp[-3].idlist->nconc(new UTL_IdList(tao_yyvsp[0].idval, NULL));
+          tao_yyval.idlist = tao_yyvsp[-3].idlist;
+        }
 break;
 case 91:
-#line 814 "fe/idl.tao_yy"
+#line 822 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
-					      tao_yyvsp[0].exval,
-					      NULL);
-	}
+            tao_yyval.idval = new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE);
+        }
 break;
 case 92:
-#line 820 "fe/idl.tao_yy"
+#line 829 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
-					      tao_yyvsp[0].exval,
-					      NULL);
-	}
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
+          AST_InterfaceFwd      *f = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
+
+          idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
+          /*
+           * Create a node representing a forward declaration of an
+           * interface. Store it in the enclosing scope
+           */
+          if (s != NULL) {
+            f = idl_global->gen()->create_interface_fwd(n, p);
+            (void) s->fe_add_interface_fwd(f);
+          }
+        }
 break;
 case 93:
-#line 829 "fe/idl.tao_yy"
+#line 849 "fe/idl.tao_yy"
 {
-	  /*
-	   * An expression which is a scoped name is not resolved now,
-	   * but only when it is evaluated (such as when it is assigned
-	   * as a constant value)
-	   */
-	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].idlist);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
+        }
+break;
+case 94:
+#line 853 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
+        }
 break;
 case 95:
-#line 839 "fe/idl.tao_yy"
+#line 857 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = tao_yyvsp[-1].exval;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
+        }
 break;
 case 96:
-#line 846 "fe/idl.tao_yy"
+#line 861 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].ival);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
+        }
 break;
 case 97:
-#line 850 "fe/idl.tao_yy"
+#line 865 "fe/idl.tao_yy"
+{
+          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[-4].idval, NULL);
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          AST_Constant          *c = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
+          AST_Decl              *v = NULL;
+
+          ACE_UNUSED_ARG (v);
+
+          idl_global->set_parse_state(IDL_GlobalData::PS_ConstExprSeen);
+          /*
+           * Create a node representing a constant declaration. Store
+           * it in the enclosing scope
+           */
+          if (tao_yyvsp[0].exval != NULL && s != NULL) {
+            if (tao_yyvsp[0].exval->coerce(tao_yyvsp[-6].etval) == NULL)
+              idl_global->err()->coercion_error(tao_yyvsp[0].exval, tao_yyvsp[-6].etval);
+            else {
+              c =
+                idl_global->gen()->create_constant(tao_yyvsp[-6].etval, tao_yyvsp[0].exval, n, p);
+              (void) s->fe_add_constant(c);
+            }
+          }
+        }
+break;
+case 103:
+#line 898 "fe/idl.tao_yy"
+{
+          tao_yyval.etval = AST_Expression::EV_string;
+        }
+break;
+case 104:
+#line 902 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].sval);
-	}
+          tao_yyval.etval = AST_Expression::EV_wstring;
+        }
 break;
-case 98:
-#line 854 "fe/idl.tao_yy"
+case 105:
+#line 906 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].cval);
-	}
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          AST_Decl              *d = NULL;
+          AST_PredefinedType    *c = NULL;
+          AST_Typedef           *t = NULL;
+
+          /*
+           * If the constant's type is a scoped name, it must resolve
+           * to a scalar constant type
+           */
+          if (s != NULL && (d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE)) != NULL) {
+            /*
+             * Look through typedefs
+             */
+            while (d->node_type() == AST_Decl::NT_typedef) {
+              t = AST_Typedef::narrow_from_decl(d);
+              if (t == NULL)
+                break;
+              d = t->base_type();
+            }
+            if (d == NULL)
+              tao_yyval.etval = AST_Expression::EV_any;
+            else if (d->node_type() == AST_Decl::NT_pre_defined) {
+              c = AST_PredefinedType::narrow_from_decl(d);
+              if (c != NULL) {
+                 tao_yyval.etval = idl_global->PredefinedTypeToExprType(c->pt());
+              } else {
+                 tao_yyval.etval = AST_Expression::EV_any;
+              }
+            } else if (d->node_type () == AST_Decl::NT_string) {
+                tao_yyval.etval = AST_Expression::EV_string;
+            /* @ASG@ we will need a similar one for wstring after it
+                is implemented */
+            } else
+              tao_yyval.etval = AST_Expression::EV_any;
+          } else
+            tao_yyval.etval = AST_Expression::EV_any;
+        }
 break;
-case 99:
-#line 858 "fe/idl.tao_yy"
+case 109:
+#line 952 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].dval);
-	}
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+        }
 break;
-case 100:
-#line 862 "fe/idl.tao_yy"
+case 111:
+#line 960 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE,
-					    AST_Expression::EV_bool);
-	}
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+        }
 break;
-case 101:
-#line 867 "fe/idl.tao_yy"
+case 113:
+#line 968 "fe/idl.tao_yy"
 {
-	  tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE,
-					    AST_Expression::EV_bool);
-	}
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+        }
 break;
-case 102:
-#line 875 "fe/idl.tao_yy"
+case 115:
+#line 976 "fe/idl.tao_yy"
 {
-	    tao_yyvsp[0].exval->evaluate(AST_Expression::EK_const);
-	    tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].exval, AST_Expression::EV_ulong);
-	}
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
+        }
 break;
-case 103:
-#line 883 "fe/idl.tao_yy"
+case 116:
+#line 980 "fe/idl.tao_yy"
 {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
-	  }
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
+        }
 break;
-case 104:
-#line 886 "fe/idl.tao_yy"
+case 118:
+#line 988 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+        }
+break;
+case 119:
+#line 992 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
+        }
+break;
+case 121:
+#line 1000 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+        }
+break;
+case 122:
+#line 1004 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+        }
+break;
+case 123:
+#line 1008 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
+        }
+break;
+case 125:
+#line 1016 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
+                                              tao_yyvsp[0].exval,
+                                              NULL);
+        }
+break;
+case 126:
+#line 1022 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
+                                              tao_yyvsp[0].exval,
+                                              NULL);
+        }
+break;
+case 127:
+#line 1028 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
+                                              tao_yyvsp[0].exval,
+                                              NULL);
+        }
+break;
+case 128:
+#line 1037 "fe/idl.tao_yy"
+{
+          /*
+           * An expression which is a scoped name is not resolved now,
+           * but only when it is evaluated (such as when it is assigned
+           * as a constant value)
+           */
+          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].idlist);
+        }
+break;
+case 130:
+#line 1047 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = tao_yyvsp[-1].exval;
+        }
+break;
+case 131:
+#line 1054 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].ival);
+        }
+break;
+case 132:
+#line 1058 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].sval);
+        }
+break;
+case 133:
+#line 1062 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].cval);
+        }
+break;
+case 134:
+#line 1066 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].dval);
+        }
+break;
+case 135:
+#line 1070 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE,
+                                            AST_Expression::EV_bool);
+        }
+break;
+case 136:
+#line 1075 "fe/idl.tao_yy"
+{
+          tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE,
+                                            AST_Expression::EV_bool);
+        }
+break;
+case 137:
+#line 1083 "fe/idl.tao_yy"
+{
+            tao_yyvsp[0].exval->evaluate(AST_Expression::EK_const);
+            tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].exval, AST_Expression::EV_ulong);
+        }
+break;
+case 138:
+#line 1091 "fe/idl.tao_yy"
+{
+            idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
+          }
+break;
+case 139:
+#line 1094 "fe/idl.tao_yy"
 {tao_yyval.ival = 0;}
 break;
-case 105:
-#line 887 "fe/idl.tao_yy"
+case 140:
+#line 1095 "fe/idl.tao_yy"
 { tao_yyval.ival = 0;}
 break;
-case 106:
-#line 888 "fe/idl.tao_yy"
+case 141:
+#line 1096 "fe/idl.tao_yy"
 { tao_yyval.ival = 0;}
 break;
-case 107:
-#line 889 "fe/idl.tao_yy"
+case 142:
+#line 1097 "fe/idl.tao_yy"
 { tao_yyval.ival = 0;}
 break;
-case 108:
-#line 891 "fe/idl.tao_yy"
+case 143:
+#line 1099 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Native		*node = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          AST_Native            *node = NULL;
+          AST_Decl              *v = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
 
           ACE_UNUSED_ARG (v);
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NativeSeen);
-	  /*
-	   * Create a node representing a Native and add it to its
-	   * enclosing scope
-	   */
-	  if (s != NULL) {
-	    node = idl_global->gen()->create_native (tao_yyvsp[0].deval->name (), p);
-	    /*
-	     * Add it to its defining scope
-	     */
-	    (void) s->fe_add_native (node);
-	  }
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_NativeSeen);
+          /*
+           * Create a node representing a Native and add it to its
+           * enclosing scope
+           */
+          if (s != NULL) {
+            node = idl_global->gen()->create_native (tao_yyvsp[0].deval->name (), p);
+            /*
+             * Add it to its defining scope
+             */
+            (void) s->fe_add_native (node);
+          }
+        }
 break;
-case 109:
-#line 916 "fe/idl.tao_yy"
+case 144:
+#line 1124 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
         }
 break;
-case 110:
-#line 920 "fe/idl.tao_yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l;
-	  FE_Declarator		*d = NULL;
-	  AST_Typedef		*t = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
+case 145:
+#line 1128 "fe/idl.tao_yy"
+{
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_DecllistActiveIterator *l;
+          FE_Declarator         *d = NULL;
+          AST_Typedef           *t = NULL;
+          AST_Decl              *v = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
 
           ACE_UNUSED_ARG (v);
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen);
-	  /*
-	   * Create a list of type renamings. Add them to the
-	   * enclosing scope
-	   */
-	  if (s != NULL && tao_yyvsp[-2].dcval != NULL && tao_yyvsp[0].dlval != NULL) {
-	    l = new UTL_DecllistActiveIterator(tao_yyvsp[0].dlval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		      continue;
+          idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen);
+          /*
+           * Create a list of type renamings. Add them to the
+           * enclosing scope
+           */
+          if (s != NULL && tao_yyvsp[-2].dcval != NULL && tao_yyvsp[0].dlval != NULL) {
+            l = new UTL_DecllistActiveIterator(tao_yyvsp[0].dlval);
+            for (;!(l->is_done()); l->next()) {
+              d = l->item();
+              if (d == NULL)
+                      continue;
               AST_Type * tp = d->compose(tao_yyvsp[-2].dcval);
               if (tp == NULL)
-		     continue;
-	      t = idl_global->gen()->create_typedef(tp, d->name(), p);
-	      (void) s->fe_add_typedef(t);
-	    }
-	    delete l;
-	  }
-	}
+                     continue;
+              t = idl_global->gen()->create_typedef(tp, d->name(), p);
+              (void) s->fe_add_typedef(t);
+            }
+            delete l;
+          }
+        }
 break;
-case 113:
-#line 959 "fe/idl.tao_yy"
+case 148:
+#line 1167 "fe/idl.tao_yy"
 {
-	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-	}
+          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
+        }
 break;
-case 115:
-#line 964 "fe/idl.tao_yy"
+case 150:
+#line 1172 "fe/idl.tao_yy"
 {
-	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
-	  AST_Decl	*d = NULL;
+          UTL_Scope     *s = idl_global->scopes()->top_non_null();
+          AST_Decl      *d = NULL;
 
-	  if (s != NULL)
-	    d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE);
-	  if (d == NULL)
-	    idl_global->err()->lookup_error(tao_yyvsp[0].idlist);
-	  tao_yyval.dcval = d;
-	}
+          if (s != NULL)
+            d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE);
+          if (d == NULL)
+            idl_global->err()->lookup_error(tao_yyvsp[0].idlist);
+          tao_yyval.dcval = d;
+        }
 break;
-case 128:
-#line 999 "fe/idl.tao_yy"
+case 163:
+#line 1207 "fe/idl.tao_yy"
 {
-	  tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval);
-	}
+          tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval);
+        }
 break;
-case 129:
-#line 1007 "fe/idl.tao_yy"
+case 164:
+#line 1215 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
         }
 break;
-case 130:
-#line 1011 "fe/idl.tao_yy"
+case 165:
+#line 1219 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
 
-	  if (tao_yyvsp[-3].dlval == NULL)
-	    tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[0].deval, NULL);
-	  else {
-	    tao_yyvsp[-3].dlval->nconc(new UTL_DeclList(tao_yyvsp[0].deval, NULL));
-	    tao_yyval.dlval = tao_yyvsp[-3].dlval;
-	  }
-	}
+          if (tao_yyvsp[-3].dlval == NULL)
+            tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[0].deval, NULL);
+          else {
+            tao_yyvsp[-3].dlval->nconc(new UTL_DeclList(tao_yyvsp[0].deval, NULL));
+            tao_yyval.dlval = tao_yyvsp[-3].dlval;
+          }
+        }
 break;
-case 131:
-#line 1022 "fe/idl.tao_yy"
+case 166:
+#line 1230 "fe/idl.tao_yy"
 {
-	  tao_yyval.dlval = NULL;
-	}
+          tao_yyval.dlval = NULL;
+        }
 break;
-case 134:
-#line 1034 "fe/idl.tao_yy"
+case 169:
+#line 1242 "fe/idl.tao_yy"
 {
-	  tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval);
-	}
+          tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval);
+        }
 break;
-case 135:
-#line 1042 "fe/idl.tao_yy"
+case 170:
+#line 1250 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
         }
 break;
-case 136:
-#line 1046 "fe/idl.tao_yy"
+case 171:
+#line 1254 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
 
-	  if (tao_yyvsp[-3].dlval == NULL)
-	    tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[0].deval, NULL);
-	  else {
-	    tao_yyvsp[-3].dlval->nconc(new UTL_DeclList(tao_yyvsp[0].deval, NULL));
-	    tao_yyval.dlval = tao_yyvsp[-3].dlval;
-	  }
-	}
+          if (tao_yyvsp[-3].dlval == NULL)
+            tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[0].deval, NULL);
+          else {
+            tao_yyvsp[-3].dlval->nconc(new UTL_DeclList(tao_yyvsp[0].deval, NULL));
+            tao_yyval.dlval = tao_yyvsp[-3].dlval;
+          }
+        }
 break;
-case 137:
-#line 1057 "fe/idl.tao_yy"
+case 172:
+#line 1265 "fe/idl.tao_yy"
 {
-	  tao_yyval.dlval = NULL;
-	}
+          tao_yyval.dlval = NULL;
+        }
 break;
-case 138:
-#line 1064 "fe/idl.tao_yy"
+case 173:
+#line 1272 "fe/idl.tao_yy"
 {
-	  tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].idval, NULL),
-				 FE_Declarator::FD_simple, NULL);
-	}
+          tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].idval, NULL),
+                                 FE_Declarator::FD_simple, NULL);
+        }
 break;
-case 139:
-#line 1072 "fe/idl.tao_yy"
+case 174:
+#line 1280 "fe/idl.tao_yy"
 {
-	  tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].dcval->local_name(), NULL),
-				 FE_Declarator::FD_complex,
-				 tao_yyvsp[0].dcval);
-	}
+          tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].dcval->local_name(), NULL),
+                                 FE_Declarator::FD_complex,
+                                 tao_yyvsp[0].dcval);
+        }
 break;
-case 142:
-#line 1086 "fe/idl.tao_yy"
+case 177:
+#line 1294 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_long;
-	}
+          tao_yyval.etval = AST_Expression::EV_long;
+        }
 break;
-case 143:
-#line 1090 "fe/idl.tao_yy"
+case 178:
+#line 1298 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_longlong;
+          tao_yyval.etval = AST_Expression::EV_longlong;
         }
 break;
-case 144:
-#line 1094 "fe/idl.tao_yy"
+case 179:
+#line 1302 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_short;
-	}
+          tao_yyval.etval = AST_Expression::EV_short;
+        }
 break;
-case 145:
-#line 1101 "fe/idl.tao_yy"
+case 180:
+#line 1309 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_ulong;
-	}
+          tao_yyval.etval = AST_Expression::EV_ulong;
+        }
 break;
-case 146:
-#line 1105 "fe/idl.tao_yy"
+case 181:
+#line 1313 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_ulonglong;
+          tao_yyval.etval = AST_Expression::EV_ulonglong;
         }
 break;
-case 147:
-#line 1109 "fe/idl.tao_yy"
+case 182:
+#line 1317 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_ushort;
-	}
+          tao_yyval.etval = AST_Expression::EV_ushort;
+        }
 break;
-case 148:
-#line 1116 "fe/idl.tao_yy"
+case 183:
+#line 1324 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_double;
-	}
+          tao_yyval.etval = AST_Expression::EV_double;
+        }
 break;
-case 149:
-#line 1120 "fe/idl.tao_yy"
+case 184:
+#line 1328 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_float;
-	}
+          tao_yyval.etval = AST_Expression::EV_float;
+        }
 break;
-case 150:
-#line 1124 "fe/idl.tao_yy"
+case 185:
+#line 1332 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_longdouble;
+          tao_yyval.etval = AST_Expression::EV_longdouble;
         }
 break;
-case 151:
-#line 1131 "fe/idl.tao_yy"
+case 186:
+#line 1339 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_char;
-	}
+          tao_yyval.etval = AST_Expression::EV_char;
+        }
 break;
-case 152:
-#line 1135 "fe/idl.tao_yy"
+case 187:
+#line 1343 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_wchar;
+          tao_yyval.etval = AST_Expression::EV_wchar;
         }
 break;
-case 153:
-#line 1142 "fe/idl.tao_yy"
+case 188:
+#line 1350 "fe/idl.tao_yy"
 {
           tao_yyval.etval = AST_Expression::EV_octet;
-	}
+        }
 break;
-case 154:
-#line 1149 "fe/idl.tao_yy"
+case 189:
+#line 1357 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_bool;
+          tao_yyval.etval = AST_Expression::EV_bool;
         }
 break;
-case 155:
-#line 1156 "fe/idl.tao_yy"
+case 190:
+#line 1364 "fe/idl.tao_yy"
 {
-	  tao_yyval.etval = AST_Expression::EV_any;
-	}
+          tao_yyval.etval = AST_Expression::EV_any;
+        }
 break;
-case 156:
-#line 1163 "fe/idl.tao_yy"
+case 191:
+#line 1371 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
         }
 break;
-case 157:
-#line 1167 "fe/idl.tao_yy"
+case 192:
+#line 1375 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
-	  AST_Structure		*d = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
+          AST_Structure         *d = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
+          AST_Decl              *v = NULL;
 
           ACE_UNUSED_ARG (v);
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructIDSeen);
-	  /*
-	   * Create a node representing a struct declaration. Add it
-	   * to the enclosing scope
-	   */
-	  if (s != NULL) {
-	    d = idl_global->gen()->create_structure(n, p);
-	    (void) s->fe_add_structure(d);
-	  }
-	  /*
-	   * Push the scope of the struct on the scopes stack
-	   */
-	  idl_global->scopes()->push(d);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_StructIDSeen);
+          /*
+           * Create a node representing a struct declaration. Add it
+           * to the enclosing scope
+           */
+          if (s != NULL) {
+            d = idl_global->gen()->create_structure(n, p);
+            (void) s->fe_add_structure(d);
+          }
+          /*
+           * Push the scope of the struct on the scopes stack
+           */
+          idl_global->scopes()->push(d);
+        }
 break;
-case 158:
-#line 1191 "fe/idl.tao_yy"
+case 193:
+#line 1399 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
         }
 break;
-case 159:
-#line 1195 "fe/idl.tao_yy"
+case 194:
+#line 1403 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
         }
 break;
-case 160:
-#line 1199 "fe/idl.tao_yy"
+case 195:
+#line 1407 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
-	  /*
-	   * Done with this struct. Pop its scope off the scopes stack
-	   */
+          idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
+          /*
+           * Done with this struct. Pop its scope off the scopes stack
+           */
           tao_yyval.dcval =
-	      AST_Structure::narrow_from_scope(
-				   idl_global->scopes()->top_non_null());
-	   UTL_StrList *p = tao_yyval.dcval->pragmas ();
-	   if (p != 0)
-	     p = (UTL_StrList*)p->copy ();
-	  idl_global->set_pragmas (p);
+              AST_Structure::narrow_from_scope(
+                                   idl_global->scopes()->top_non_null());
+           UTL_StrList *p = tao_yyval.dcval->pragmas ();
+           if (p != 0)
+             p = (UTL_StrList*)p->copy ();
+          idl_global->set_pragmas (p);
           idl_global->scopes()->pop();
-	}
+        }
 break;
-case 164:
-#line 1224 "fe/idl.tao_yy"
+case 199:
+#line 1431 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
+          /* is $0 to member_i */
+          tao_yyval.vival = AST_Field::vis_NA;
         }
 break;
-case 165:
-#line 1228 "fe/idl.tao_yy"
+case 201:
+#line 1440 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
         }
 break;
-case 166:
-#line 1232 "fe/idl.tao_yy"
+case 202:
+#line 1444 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
+        }
+break;
+case 203:
+#line 1448 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l = NULL;
-	  FE_Declarator		*d = NULL;
-	  AST_Field		*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_DecllistActiveIterator *l = NULL;
+          FE_Declarator         *d = NULL;
+          AST_Field             *f = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsCompleted);
-	  /*
-	   * Check for illegal recursive use of type
-	   */
-	  if (tao_yyvsp[-4].dcval != NULL && AST_illegal_recursive_type(tao_yyvsp[-4].dcval))
-	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, tao_yyvsp[-4].dcval);
-	  /*
-	   * Create a node representing a struct or exception member
-	   * Add it to the enclosing scope
-	   */
-	  else if (s != NULL && tao_yyvsp[-4].dcval != NULL && tao_yyvsp[-2].dlval != NULL) {
-	    l = new UTL_DecllistActiveIterator(tao_yyvsp[-2].dlval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
- 	      AST_Type *tp = d->compose(tao_yyvsp[-4].dcval);
-	      if (tp == NULL)
-		continue;
-	      f = idl_global->gen()->create_field(tp, d->name(), p);
-	      (void) s->fe_add_field(f);
-	    }
-	    delete l;
-	  }
-	}
-break;
-case 167:
-#line 1265 "fe/idl.tao_yy"
+          idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsCompleted);
+          /*
+           * Check for illegal recursive use of type
+           */
+          if (tao_yyvsp[-4].dcval != NULL && AST_illegal_recursive_type(tao_yyvsp[-4].dcval))
+            idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, tao_yyvsp[-4].dcval);
+          /*
+           * Create a node representing a struct or exception member
+           * Add it to the enclosing scope
+           */
+          else if (s != NULL && tao_yyvsp[-4].dcval != NULL && tao_yyvsp[-2].dlval != NULL) {
+            l = new UTL_DecllistActiveIterator(tao_yyvsp[-2].dlval);
+            for (;!(l->is_done()); l->next()) {
+              d = l->item();
+              if (d == NULL)
+                continue;
+              AST_Type *tp = d->compose(tao_yyvsp[-4].dcval);
+              if (tp == NULL)
+                continue;
+              /* $0 denotes Visibility, must be on yacc reduction stack */
+              f = idl_global->gen()->create_field(tp, d->name(), p, tao_yyvsp[-5].vival);
+              (void) s->fe_add_field(f);
+            }
+            delete l;
+          }
+        }
+break;
+case 204:
+#line 1482 "fe/idl.tao_yy"
 {
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
+          idl_global->err()->syntax_error(idl_global->parse_state());
+        }
 break;
-case 168:
-#line 1269 "fe/idl.tao_yy"
+case 205:
+#line 1486 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  tao_yyerrok;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          tao_yyerrok;
+        }
 break;
-case 169:
-#line 1277 "fe/idl.tao_yy"
+case 206:
+#line 1494 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
         }
 break;
-case 170:
-#line 1281 "fe/idl.tao_yy"
+case 207:
+#line 1498 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
         }
 break;
-case 171:
-#line 1285 "fe/idl.tao_yy"
+case 208:
+#line 1502 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
         }
 break;
-case 172:
-#line 1289 "fe/idl.tao_yy"
+case 209:
+#line 1506 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
         }
 break;
-case 173:
-#line 1293 "fe/idl.tao_yy"
+case 210:
+#line 1510 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
         }
 break;
-case 174:
-#line 1297 "fe/idl.tao_yy"
+case 211:
+#line 1514 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yyvsp[-8].idval, NULL);
-	  AST_Union		*u = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[-8].idval, NULL);
+          AST_Union             *u = NULL;
+          AST_Decl              *v = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
 
           ACE_UNUSED_ARG (v);
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchCloseParSeen);
-	  /*
-	   * Create a node representing a union. Add it to its enclosing
-	   * scope
-	   */
-	  if (tao_yyvsp[-2].dcval != NULL && s != NULL) {
- 	    AST_ConcreteType    *tp = AST_ConcreteType::narrow_from_decl(tao_yyvsp[-2].dcval);
+          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchCloseParSeen);
+          /*
+           * Create a node representing a union. Add it to its enclosing
+           * scope
+           */
+          if (tao_yyvsp[-2].dcval != NULL && s != NULL) {
+            AST_ConcreteType    *tp = AST_ConcreteType::narrow_from_decl(tao_yyvsp[-2].dcval);
             if (tp == NULL) {
               idl_global->err()->not_a_type(tao_yyvsp[-2].dcval);
             } else {
-	      u = idl_global->gen()->create_union(tp, n, p);
-	      (void) s->fe_add_union(u);
- 	    }
-	  }
-	  /*
-	   * Push the scope of the union on the scopes stack
-	   */
-	  idl_global->scopes()->push(u);
-	}
+              u = idl_global->gen()->create_union(tp, n, p);
+              (void) s->fe_add_union(u);
+            }
+          }
+          /*
+           * Push the scope of the union on the scopes stack
+           */
+          idl_global->scopes()->push(u);
+        }
 break;
-case 175:
-#line 1326 "fe/idl.tao_yy"
+case 212:
+#line 1543 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
         }
 break;
-case 176:
-#line 1330 "fe/idl.tao_yy"
+case 213:
+#line 1547 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
         }
 break;
-case 177:
-#line 1334 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen);
-	  /*
-	   * Done with this union. Pop its scope from the scopes stack
-	   */
-	  tao_yyval.dcval =
-	     AST_Union::narrow_from_scope(
-				idl_global->scopes()->top_non_null());
-	  UTL_StrList *p = tao_yyval.dcval->pragmas ();
-	  if (p != 0)
-	     p = (UTL_StrList*)p->copy ();
-	  idl_global->set_pragmas (p);
-	  idl_global->scopes()->pop();
-	}
+case 214:
+#line 1551 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen);
+          /*
+           * Done with this union. Pop its scope from the scopes stack
+           */
+          tao_yyval.dcval =
+             AST_Union::narrow_from_scope(
+                                idl_global->scopes()->top_non_null());
+          UTL_StrList *p = tao_yyval.dcval->pragmas ();
+          if (p != 0)
+             p = (UTL_StrList*)p->copy ();
+          idl_global->set_pragmas (p);
+          idl_global->scopes()->pop();
+        }
 break;
-case 178:
-#line 1352 "fe/idl.tao_yy"
+case 215:
+#line 1569 "fe/idl.tao_yy"
 {
-	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-	}
+          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
+        }
 break;
-case 179:
-#line 1356 "fe/idl.tao_yy"
+case 216:
+#line 1573 "fe/idl.tao_yy"
 {
-	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-	}
+          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
+        }
 break;
-case 180:
-#line 1360 "fe/idl.tao_yy"
+case 217:
+#line 1577 "fe/idl.tao_yy"
 {
           /* octets are not allowed*/
           idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
-	}
+        }
 break;
-case 181:
-#line 1365 "fe/idl.tao_yy"
+case 218:
+#line 1582 "fe/idl.tao_yy"
 {
-	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-	}
+          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
+        }
 break;
-case 183:
-#line 1370 "fe/idl.tao_yy"
+case 220:
+#line 1587 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Decl		*d = NULL;
-	  AST_PredefinedType	*p = NULL;
-	  AST_Typedef		*t = NULL;
-	  long			found = I_FALSE;
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          AST_Decl              *d = NULL;
+          AST_PredefinedType    *p = NULL;
+          AST_Typedef           *t = NULL;
+          long                  found = I_FALSE;
 
-	  /*
-	   * The discriminator is a scoped name. Try to resolve to
-	   * one of the scalar types or to an enum. Thread through
-	   * typedef's to arrive at the base type at the end of the
-	   * chain
-	   */
-	  if (s != NULL && (d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE)) != NULL) {
-	    while (!found) {
-	      switch (d->node_type()) {
-	      case AST_Decl::NT_enum:
-		tao_yyval.dcval = d;
-		found = I_TRUE;
-		break;
-	      case AST_Decl::NT_pre_defined:
-		p = AST_PredefinedType::narrow_from_decl(d);
-		if (p != NULL) {
-		  switch (p->pt()) {
-		  case AST_PredefinedType::PT_long:
-		  case AST_PredefinedType::PT_ulong:
-		  case AST_PredefinedType::PT_longlong:
-		  case AST_PredefinedType::PT_ulonglong:
-		  case AST_PredefinedType::PT_short:
-		  case AST_PredefinedType::PT_char:
-		  case AST_PredefinedType::PT_wchar:
-		  case AST_PredefinedType::PT_boolean:
-		    tao_yyval.dcval = p;
-		    found = I_TRUE;
-		    break;
-		  case AST_PredefinedType::PT_octet:
+          /*
+           * The discriminator is a scoped name. Try to resolve to
+           * one of the scalar types or to an enum. Thread through
+           * typedef's to arrive at the base type at the end of the
+           * chain
+           */
+          if (s != NULL && (d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE)) != NULL) {
+            while (!found) {
+              switch (d->node_type()) {
+              case AST_Decl::NT_enum:
+                tao_yyval.dcval = d;
+                found = I_TRUE;
+                break;
+              case AST_Decl::NT_pre_defined:
+                p = AST_PredefinedType::narrow_from_decl(d);
+                if (p != NULL) {
+                  switch (p->pt()) {
+                  case AST_PredefinedType::PT_long:
+                  case AST_PredefinedType::PT_ulong:
+                  case AST_PredefinedType::PT_longlong:
+                  case AST_PredefinedType::PT_ulonglong:
+                  case AST_PredefinedType::PT_short:
+                  case AST_PredefinedType::PT_char:
+                  case AST_PredefinedType::PT_wchar:
+                  case AST_PredefinedType::PT_boolean:
+                    tao_yyval.dcval = p;
+                    found = I_TRUE;
+                    break;
+                  case AST_PredefinedType::PT_octet:
                     /* octets are not allowed*/
                     idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
                     tao_yyval.dcval = NULL;
-		    found = I_TRUE;
-		    break;
-		  default:
-		    tao_yyval.dcval = NULL;
-		    found = I_TRUE;
-		    break;
-		  }
-		} else
+                    found = I_TRUE;
+                    break;
+                  default:
+                    tao_yyval.dcval = NULL;
+                    found = I_TRUE;
+                    break;
+                  }
+                } else
                 {
-		    tao_yyval.dcval = NULL;
-		    found = I_TRUE;
+                    tao_yyval.dcval = NULL;
+                    found = I_TRUE;
                 }
-		break;
-	      case AST_Decl::NT_typedef:
-		t = AST_Typedef::narrow_from_decl(d);
-		if (t != NULL) d = t->base_type();
-		break;
-	      default:
-		tao_yyval.dcval = NULL;
-		found = I_TRUE;
-		break;
-	      }
-	    }
-	  } else
-	    tao_yyval.dcval = NULL;
+                break;
+              case AST_Decl::NT_typedef:
+                t = AST_Typedef::narrow_from_decl(d);
+                if (t != NULL) d = t->base_type();
+                break;
+              default:
+                tao_yyval.dcval = NULL;
+                found = I_TRUE;
+                break;
+              }
+            }
+          } else
+            tao_yyval.dcval = NULL;
 
-	  if (tao_yyval.dcval == NULL)
-	    idl_global->err()->lookup_error(tao_yyvsp[0].idlist);
-	}
+          if (tao_yyval.dcval == NULL)
+            idl_global->err()->lookup_error(tao_yyvsp[0].idlist);
+        }
 break;
-case 187:
-#line 1449 "fe/idl.tao_yy"
+case 224:
+#line 1666 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
         }
 break;
-case 188:
-#line 1453 "fe/idl.tao_yy"
+case 225:
+#line 1670 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
         }
 break;
-case 189:
-#line 1457 "fe/idl.tao_yy"
+case 226:
+#line 1674 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_LabellistActiveIterator *l = NULL;
-	  AST_UnionLabel	*d = NULL;
-	  AST_UnionBranch	*b = NULL;
-	  AST_Field		*f = tao_yyvsp[-2].ffval;
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_LabellistActiveIterator *l = NULL;
+          AST_UnionLabel        *d = NULL;
+          AST_UnionBranch       *b = NULL;
+          AST_Field             *f = tao_yyvsp[-2].ffval;
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemCompleted);
-	  /*
-	   * Create several nodes representing branches of a union.
-	   * Add them to the enclosing scope (the union scope)
-	   */
-	  if (s != NULL && tao_yyvsp[-4].llval != NULL && tao_yyvsp[-2].ffval != NULL) {
-	    l = new UTL_LabellistActiveIterator(tao_yyvsp[-4].llval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
-	      b = idl_global->gen()->create_union_branch(d,
-						      f->field_type(),
-						      f->name(),
-						      f->pragmas());
-	      (void) s->fe_add_union_branch(b);
-	    }
-	    delete l;
-	  }
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemCompleted);
+          /*
+           * Create several nodes representing branches of a union.
+           * Add them to the enclosing scope (the union scope)
+           */
+          if (s != NULL && tao_yyvsp[-4].llval != NULL && tao_yyvsp[-2].ffval != NULL) {
+            l = new UTL_LabellistActiveIterator(tao_yyvsp[-4].llval);
+            for (;!(l->is_done()); l->next()) {
+              d = l->item();
+              if (d == NULL)
+                continue;
+              b = idl_global->gen()->create_union_branch(d,
+                                                      f->field_type(),
+                                                      f->name(),
+                                                      f->pragmas());
+              (void) s->fe_add_union_branch(b);
+            }
+            delete l;
+          }
+        }
 break;
-case 190:
-#line 1485 "fe/idl.tao_yy"
+case 227:
+#line 1702 "fe/idl.tao_yy"
 {
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
+          idl_global->err()->syntax_error(idl_global->parse_state());
+        }
 break;
-case 191:
-#line 1490 "fe/idl.tao_yy"
+case 228:
+#line 1707 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  tao_yyerrok;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+          tao_yyerrok;
+        }
 break;
-case 192:
-#line 1498 "fe/idl.tao_yy"
+case 229:
+#line 1715 "fe/idl.tao_yy"
 {
-	  tao_yyval.llval = new UTL_LabelList(tao_yyvsp[-1].ulval, tao_yyvsp[0].llval);
-	}
+          tao_yyval.llval = new UTL_LabelList(tao_yyvsp[-1].ulval, tao_yyvsp[0].llval);
+        }
 break;
-case 193:
-#line 1505 "fe/idl.tao_yy"
+case 230:
+#line 1722 "fe/idl.tao_yy"
 {
-	  if (tao_yyvsp[-1].llval == NULL)
-	    tao_yyval.llval = new UTL_LabelList(tao_yyvsp[0].ulval, NULL);
-	  else {
-	    tao_yyvsp[-1].llval->nconc(new UTL_LabelList(tao_yyvsp[0].ulval, NULL));
-	    tao_yyval.llval = tao_yyvsp[-1].llval;
-	  }
-	}
+          if (tao_yyvsp[-1].llval == NULL)
+            tao_yyval.llval = new UTL_LabelList(tao_yyvsp[0].ulval, NULL);
+          else {
+            tao_yyvsp[-1].llval->nconc(new UTL_LabelList(tao_yyvsp[0].ulval, NULL));
+            tao_yyval.llval = tao_yyvsp[-1].llval;
+          }
+        }
 break;
-case 194:
-#line 1514 "fe/idl.tao_yy"
+case 231:
+#line 1731 "fe/idl.tao_yy"
 {
-	  tao_yyval.llval = NULL;
-	}
+          tao_yyval.llval = NULL;
+        }
 break;
-case 195:
-#line 1521 "fe/idl.tao_yy"
+case 232:
+#line 1738 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
         }
 break;
-case 196:
-#line 1525 "fe/idl.tao_yy"
+case 233:
+#line 1742 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
 
-	  tao_yyval.ulval = idl_global->gen()->
-	            create_union_label(AST_UnionLabel::UL_default,
-				       NULL);
-	}
+          tao_yyval.ulval = idl_global->gen()->
+                    create_union_label(AST_UnionLabel::UL_default,
+                                       NULL);
+        }
 break;
-case 197:
-#line 1533 "fe/idl.tao_yy"
+case 234:
+#line 1750 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
         }
 break;
-case 198:
-#line 1537 "fe/idl.tao_yy"
+case 235:
+#line 1754 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
         }
 break;
-case 199:
-#line 1541 "fe/idl.tao_yy"
+case 236:
+#line 1758 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
 
-	  tao_yyval.ulval = idl_global->gen()->create_union_label(AST_UnionLabel::UL_label,
-						     tao_yyvsp[-2].exval);
-	}
+          tao_yyval.ulval = idl_global->gen()->create_union_label(AST_UnionLabel::UL_label,
+                                                     tao_yyvsp[-2].exval);
+        }
 break;
-case 200:
-#line 1551 "fe/idl.tao_yy"
+case 237:
+#line 1768 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
         }
 break;
-case 201:
-#line 1555 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen);
-	  /*
-	   * Check for illegal recursive use of type
-	   */
-	  if (tao_yyvsp[-2].dcval != NULL && AST_illegal_recursive_type(tao_yyvsp[-2].dcval))
-	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, tao_yyvsp[-2].dcval);
-	  /*
-	   * Create a field in a union branch
-	   */
-	  else if (tao_yyvsp[-2].dcval == NULL || tao_yyvsp[0].deval == NULL)
-	    tao_yyval.ffval = NULL;
-	  else {
-	    AST_Type *tp = tao_yyvsp[0].deval->compose(tao_yyvsp[-2].dcval);
-	    if (tp == NULL)
-	      tao_yyval.ffval = NULL;
- 	    else
-	      tao_yyval.ffval = idl_global->gen()->create_field(tp,
-			        		   tao_yyvsp[0].deval->name(),
-			        		   idl_global->pragmas());
-	  }
-	}
+case 238:
+#line 1772 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen);
+          /*
+           * Check for illegal recursive use of type
+           */
+          if (tao_yyvsp[-2].dcval != NULL && AST_illegal_recursive_type(tao_yyvsp[-2].dcval))
+            idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, tao_yyvsp[-2].dcval);
+          /*
+           * Create a field in a union branch
+           */
+          else if (tao_yyvsp[-2].dcval == NULL || tao_yyvsp[0].deval == NULL)
+            tao_yyval.ffval = NULL;
+          else {
+            AST_Type *tp = tao_yyvsp[0].deval->compose(tao_yyvsp[-2].dcval);
+            if (tp == NULL)
+              tao_yyval.ffval = NULL;
+            else
+              tao_yyval.ffval = idl_global->gen()->create_field(tp,
+                                                   tao_yyvsp[0].deval->name(),
+                                                   idl_global->pragmas());
+          }
+        }
 break;
-case 202:
-#line 1581 "fe/idl.tao_yy"
+case 239:
+#line 1798 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
         }
 break;
-case 203:
-#line 1585 "fe/idl.tao_yy"
+case 240:
+#line 1802 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
-	  AST_Enum		*e = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
+          AST_Enum              *e = NULL;
+          AST_Decl              *v = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
 
           ACE_UNUSED_ARG (v);
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumIDSeen);
-	  /*
-	   * Create a node representing an enum and add it to its
-	   * enclosing scope
-	   */
-	  if (s != NULL) {
-	    e = idl_global->gen()->create_enum(n, p);
-	    /*
-	     * Add it to its defining scope
-	     */
-	    (void) s->fe_add_enum(e);
-	  }
-	  /*
-	   * Push the enum scope on the scopes stack
-	   */
-	  idl_global->scopes()->push(e);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_EnumIDSeen);
+          /*
+           * Create a node representing an enum and add it to its
+           * enclosing scope
+           */
+          if (s != NULL) {
+            e = idl_global->gen()->create_enum(n, p);
+            /*
+             * Add it to its defining scope
+             */
+            (void) s->fe_add_enum(e);
+          }
+          /*
+           * Push the enum scope on the scopes stack
+           */
+          idl_global->scopes()->push(e);
+        }
 break;
-case 204:
-#line 1612 "fe/idl.tao_yy"
+case 241:
+#line 1829 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
         }
 break;
-case 205:
-#line 1616 "fe/idl.tao_yy"
+case 242:
+#line 1833 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
         }
 break;
-case 206:
-#line 1620 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen);
-	  /*
-	   * Done with this enum. Pop its scope from the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    tao_yyval.dcval = NULL;
-	  else {
-	    tao_yyval.dcval = AST_Enum::narrow_from_scope(idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	}
+case 243:
+#line 1837 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen);
+          /*
+           * Done with this enum. Pop its scope from the scopes stack
+           */
+          if (idl_global->scopes()->top() == NULL)
+            tao_yyval.dcval = NULL;
+          else {
+            tao_yyval.dcval = AST_Enum::narrow_from_scope(idl_global->scopes()->top_non_null());
+            idl_global->scopes()->pop();
+          }
+        }
 break;
-case 208:
-#line 1639 "fe/idl.tao_yy"
+case 245:
+#line 1856 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
         }
 break;
-case 211:
-#line 1648 "fe/idl.tao_yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n =
-		new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE), NULL);
-	  AST_EnumVal		*e = NULL;
-	  AST_Enum		*c = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
+case 248:
+#line 1865 "fe/idl.tao_yy"
+{
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_ScopedName        *n =
+                new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE), NULL);
+          AST_EnumVal           *e = NULL;
+          AST_Enum              *c = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
 
-	  /*
-	   * Create a node representing one enumerator in an enum
-	   * Add it to the enclosing scope (the enum scope)
-	   */
-	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_enum) {
-	    c = AST_Enum::narrow_from_scope(s);
-	    if (c != NULL)
-	      e = idl_global->gen()->create_enum_val(c->next_enum_val(), n, p);
-	    (void) s->fe_add_enum_val(e);
-	  }
-	}
+          /*
+           * Create a node representing one enumerator in an enum
+           * Add it to the enclosing scope (the enum scope)
+           */
+          if (s != NULL && s->scope_node_type() == AST_Decl::NT_enum) {
+            c = AST_Enum::narrow_from_scope(s);
+            if (c != NULL)
+              e = idl_global->gen()->create_enum_val(c->next_enum_val(), n, p);
+            (void) s->fe_add_enum_val(e);
+          }
+        }
 break;
-case 212:
-#line 1672 "fe/idl.tao_yy"
+case 249:
+#line 1889 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
         }
 break;
-case 213:
-#line 1676 "fe/idl.tao_yy"
+case 250:
+#line 1893 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
         }
 break;
-case 214:
-#line 1680 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-	  /*
-	   * Remove sequence marker from scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    idl_global->scopes()->pop();
-	  /*
-	   * Create a node representing a sequence
-	   */
-	  if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
-	    tao_yyval.dcval = NULL;
-	  } else if (tao_yyvsp[-5].dcval == NULL) {
-	    tao_yyval.dcval = NULL;
-	  } else {
- 	    AST_Type *tp = AST_Type::narrow_from_decl(tao_yyvsp[-5].dcval);
-	    if (tp == NULL)
-	      tao_yyval.dcval = NULL;
-	    else {
-	      tao_yyval.dcval = idl_global->gen()->create_sequence(tao_yyvsp[-2].exval, tp);
-	      /*
-	       * Add this AST_Sequence to the types defined in the global scope
-	       */
-	      (void) idl_global->root()
-		        ->fe_add_sequence(AST_Sequence::narrow_from_decl(tao_yyval.dcval));
- 	    }
-	  }
-	}
+case 251:
+#line 1897 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
+          /*
+           * Remove sequence marker from scopes stack
+           */
+          if (idl_global->scopes()->top() == NULL)
+            idl_global->scopes()->pop();
+          /*
+           * Create a node representing a sequence
+           */
+          if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
+            idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
+            tao_yyval.dcval = NULL;
+          } else if (tao_yyvsp[-5].dcval == NULL) {
+            tao_yyval.dcval = NULL;
+          } else {
+            AST_Type *tp = AST_Type::narrow_from_decl(tao_yyvsp[-5].dcval);
+            if (tp == NULL)
+              tao_yyval.dcval = NULL;
+            else {
+              tao_yyval.dcval = idl_global->gen()->create_sequence(tao_yyvsp[-2].exval, tp);
+              /*
+               * Add this AST_Sequence to the types defined in the global scope
+               */
+              (void) idl_global->root()
+                        ->fe_add_sequence(AST_Sequence::narrow_from_decl(tao_yyval.dcval));
+            }
+          }
+        }
 break;
-case 215:
-#line 1711 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-	  /*
-	   * Remove sequence marker from scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    idl_global->scopes()->pop();
-	  /*
-	   * Create a node representing a sequence
-	   */
-	  if (tao_yyvsp[-1].dcval == NULL)
-	    tao_yyval.dcval = NULL;
-	  else {
-	    AST_Type *tp = AST_Type::narrow_from_decl(tao_yyvsp[-1].dcval);
-	    if (tp == NULL)
-	      tao_yyval.dcval = NULL;
+case 252:
+#line 1928 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
+          /*
+           * Remove sequence marker from scopes stack
+           */
+          if (idl_global->scopes()->top() == NULL)
+            idl_global->scopes()->pop();
+          /*
+           * Create a node representing a sequence
+           */
+          if (tao_yyvsp[-1].dcval == NULL)
+            tao_yyval.dcval = NULL;
+          else {
+            AST_Type *tp = AST_Type::narrow_from_decl(tao_yyvsp[-1].dcval);
+            if (tp == NULL)
+              tao_yyval.dcval = NULL;
             else {
-	      tao_yyval.dcval =
-	        idl_global->gen()->create_sequence(
-		  	     idl_global->gen()->create_expr((unsigned long) 0),
-			     tp);
-	      /*
-	       * Add this AST_Sequence to the types defined in the global scope
-	       */
-	      (void) idl_global->root()
-		        ->fe_add_sequence(AST_Sequence::narrow_from_decl(tao_yyval.dcval));
-	    }
-	  }
-	}
+              tao_yyval.dcval =
+                idl_global->gen()->create_sequence(
+                             idl_global->gen()->create_expr((unsigned long) 0),
+                             tp);
+              /*
+               * Add this AST_Sequence to the types defined in the global scope
+               */
+              (void) idl_global->root()
+                        ->fe_add_sequence(AST_Sequence::narrow_from_decl(tao_yyval.dcval));
+            }
+          }
+        }
 break;
-case 216:
-#line 1744 "fe/idl.tao_yy"
+case 253:
+#line 1961 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
-	  /*
-	   * Push a sequence marker on scopes stack
-	   */
-	  idl_global->scopes()->push(NULL);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
+          /*
+           * Push a sequence marker on scopes stack
+           */
+          idl_global->scopes()->push(NULL);
+        }
 break;
-case 217:
-#line 1752 "fe/idl.tao_yy"
+case 254:
+#line 1969 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
         }
 break;
-case 218:
-#line 1756 "fe/idl.tao_yy"
+case 255:
+#line 1973 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
-	  tao_yyval.dcval = tao_yyvsp[0].dcval;
+          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
+          tao_yyval.dcval = tao_yyvsp[0].dcval;
         }
 break;
-case 219:
-#line 1765 "fe/idl.tao_yy"
+case 256:
+#line 1982 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
         }
 break;
-case 220:
-#line 1769 "fe/idl.tao_yy"
-{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        }
-break;
-case 221:
-#line 1773 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-	  /*
-	   * Create a node representing a string
-	   */
-	  if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
-	    tao_yyval.dcval = NULL;
-	  } else {
-	    tao_yyval.dcval = idl_global->gen()->create_string(tao_yyvsp[-2].exval);
-	    /*
-	     * Add this AST_String to the types defined in the global scope
-	     */
-	    (void) idl_global->root()
-		      ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
-	  }
-	}
-break;
-case 222:
-#line 1791 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-	  /*
-	   * Create a node representing a string
-	   */
-	  tao_yyval.dcval =
-	    idl_global->gen()->create_string(
-			 idl_global->gen()->create_expr((unsigned long) 0));
-	  /*
-	   * Add this AST_String to the types defined in the global scope
-	   */
-	  (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
-	}
-break;
-case 223:
-#line 1809 "fe/idl.tao_yy"
+case 257:
+#line 1986 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
+           idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
         }
 break;
-case 224:
-#line 1817 "fe/idl.tao_yy"
+case 258:
+#line 1990 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
+          /*
+           * Create a node representing a string
+           */
+          if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
+            idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
+            tao_yyval.dcval = NULL;
+          } else {
+            tao_yyval.dcval = idl_global->gen()->create_string(tao_yyvsp[-2].exval);
+            /*
+             * Add this AST_String to the types defined in the global scope
+             */
+            (void) idl_global->root()
+                      ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
+          }
+        }
+break;
+case 259:
+#line 2008 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
+          /*
+           * Create a node representing a string
+           */
+          tao_yyval.dcval =
+            idl_global->gen()->create_string(
+                         idl_global->gen()->create_expr((unsigned long) 0));
+          /*
+           * Add this AST_String to the types defined in the global scope
+           */
+          (void) idl_global->root()
+                    ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
         }
 break;
-case 225:
-#line 1821 "fe/idl.tao_yy"
+case 260:
+#line 2026 "fe/idl.tao_yy"
 {
-	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
         }
 break;
-case 226:
-#line 1825 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-	  /*
-	   * Create a node representing a string
-	   */
-	  if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
-	    tao_yyval.dcval = NULL;
-	  } else {
-	    tao_yyval.dcval = idl_global->gen()->create_wstring(tao_yyvsp[-2].exval);
-	    /*
-	     * Add this AST_String to the types defined in the global scope
-	     */
-	    (void) idl_global->root()
-		      ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
-	  }
-	}
+case 261:
+#line 2034 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
+        }
 break;
-case 227:
-#line 1843 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-	  /*
-	   * Create a node representing a string
-	   */
-	  tao_yyval.dcval =
-	    idl_global->gen()->create_wstring(
-			 idl_global->gen()->create_expr((unsigned long) 0));
-	  /*
-	   * Add this AST_String to the types defined in the global scope
-	   */
-	  (void) idl_global->root()
+case 262:
+#line 2038 "fe/idl.tao_yy"
+{
+           idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
+        }
+break;
+case 263:
+#line 2042 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
+          /*
+           * Create a node representing a string
+           */
+          if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
+            idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
+            tao_yyval.dcval = NULL;
+          } else {
+            tao_yyval.dcval = idl_global->gen()->create_wstring(tao_yyvsp[-2].exval);
+            /*
+             * Add this AST_String to the types defined in the global scope
+             */
+            (void) idl_global->root()
+                      ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
+          }
+        }
+break;
+case 264:
+#line 2060 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
+          /*
+           * Create a node representing a string
+           */
+          tao_yyval.dcval =
+            idl_global->gen()->create_wstring(
+                         idl_global->gen()->create_expr((unsigned long) 0));
+          /*
+           * Add this AST_String to the types defined in the global scope
+           */
+          (void) idl_global->root()
                     ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
-	}
+        }
 break;
-case 228:
-#line 1861 "fe/idl.tao_yy"
+case 265:
+#line 2078 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
         }
 break;
-case 229:
-#line 1868 "fe/idl.tao_yy"
+case 266:
+#line 2085 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
         }
 break;
-case 230:
-#line 1872 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted);
-	  /*
-	   * Create a node representing an array
-	   */
-	  if (tao_yyvsp[0].elval != NULL) {
-	     tao_yyval.dcval = idl_global->gen()->create_array(new UTL_ScopedName(tao_yyvsp[-2].idval, NULL),
-						  tao_yyvsp[0].elval->length(), tao_yyvsp[0].elval);
-	  }
-	}
+case 267:
+#line 2089 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted);
+          /*
+           * Create a node representing an array
+           */
+          if (tao_yyvsp[0].elval != NULL) {
+             tao_yyval.dcval = idl_global->gen()->create_array(new UTL_ScopedName(tao_yyvsp[-2].idval, NULL),
+                                                  tao_yyvsp[0].elval->length(), tao_yyvsp[0].elval);
+          }
+        }
 break;
-case 231:
-#line 1886 "fe/idl.tao_yy"
+case 268:
+#line 2103 "fe/idl.tao_yy"
 {
-	  tao_yyval.elval = new UTL_ExprList(tao_yyvsp[-1].exval, tao_yyvsp[0].elval);
-	}
+          tao_yyval.elval = new UTL_ExprList(tao_yyvsp[-1].exval, tao_yyvsp[0].elval);
+        }
 break;
-case 232:
-#line 1893 "fe/idl.tao_yy"
+case 269:
+#line 2110 "fe/idl.tao_yy"
 {
-	  if (tao_yyvsp[-1].elval == NULL)
-	    tao_yyval.elval = new UTL_ExprList(tao_yyvsp[0].exval, NULL);
-	  else {
-	    tao_yyvsp[-1].elval->nconc(new UTL_ExprList(tao_yyvsp[0].exval, NULL));
-	    tao_yyval.elval = tao_yyvsp[-1].elval;
-	  }
-	}
+          if (tao_yyvsp[-1].elval == NULL)
+            tao_yyval.elval = new UTL_ExprList(tao_yyvsp[0].exval, NULL);
+          else {
+            tao_yyvsp[-1].elval->nconc(new UTL_ExprList(tao_yyvsp[0].exval, NULL));
+            tao_yyval.elval = tao_yyvsp[-1].elval;
+          }
+        }
 break;
-case 233:
-#line 1902 "fe/idl.tao_yy"
+case 270:
+#line 2119 "fe/idl.tao_yy"
 {
-	  tao_yyval.elval = NULL;
-	}
+          tao_yyval.elval = NULL;
+        }
 break;
-case 234:
-#line 1909 "fe/idl.tao_yy"
+case 271:
+#line 2126 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
         }
 break;
-case 235:
-#line 1913 "fe/idl.tao_yy"
+case 272:
+#line 2130 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
         }
 break;
-case 236:
-#line 1917 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen);
-	  /*
-	   * Array dimensions are expressions which must be coerced to
-	   * positive integers
-	   */
-	  if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
-	    tao_yyval.exval = NULL;
-	  } else
-	    tao_yyval.exval = tao_yyvsp[-2].exval;
-	}
+case 273:
+#line 2134 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen);
+          /*
+           * Array dimensions are expressions which must be coerced to
+           * positive integers
+           */
+          if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
+            idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
+            tao_yyval.exval = NULL;
+          } else
+            tao_yyval.exval = tao_yyvsp[-2].exval;
+        }
 break;
-case 237:
-#line 1934 "fe/idl.tao_yy"
+case 274:
+#line 2151 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
         }
 break;
-case 238:
-#line 1938 "fe/idl.tao_yy"
+case 275:
+#line 2155 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
         }
 break;
-case 239:
-#line 1942 "fe/idl.tao_yy"
+case 276:
+#line 2159 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l = NULL;
-	  AST_Attribute		*a = NULL;
-	  FE_Declarator		*d = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_DecllistActiveIterator *l = NULL;
+          AST_Attribute         *a = NULL;
+          FE_Declarator         *d = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrCompleted);
-	  /*
-	   * Create nodes representing attributes and add them to the
-	   * enclosing scope
-	   */
-	  if (s != NULL && tao_yyvsp[-2].dcval != NULL && tao_yyvsp[0].dlval != NULL) {
-	    l = new UTL_DecllistActiveIterator(tao_yyvsp[0].dlval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
-	      AST_Type *tp = d->compose(tao_yyvsp[-2].dcval);
- 	      if (tp == NULL)
-	 	continue;
-	      a = idl_global->gen()->create_attribute(tao_yyvsp[-5].bval, tp, d->name(), p);
-	      /*
-	       * Add one attribute to the enclosing scope
-	       */
-	      (void) s->fe_add_attribute(a);
-	    }
-	    delete l;
-	  }
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_AttrCompleted);
+          /*
+           * Create nodes representing attributes and add them to the
+           * enclosing scope
+           */
+          if (s != NULL && tao_yyvsp[-2].dcval != NULL && tao_yyvsp[0].dlval != NULL) {
+            l = new UTL_DecllistActiveIterator(tao_yyvsp[0].dlval);
+            for (;!(l->is_done()); l->next()) {
+              d = l->item();
+              if (d == NULL)
+                continue;
+              AST_Type *tp = d->compose(tao_yyvsp[-2].dcval);
+              if (tp == NULL)
+                continue;
+              a = idl_global->gen()->create_attribute(tao_yyvsp[-5].bval, tp, d->name(), p);
+              /*
+               * Add one attribute to the enclosing scope
+               */
+              (void) s->fe_add_attribute(a);
+            }
+            delete l;
+          }
+        }
 break;
-case 240:
-#line 1976 "fe/idl.tao_yy"
+case 277:
+#line 2193 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
-	  tao_yyval.bval = I_TRUE;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
+          tao_yyval.bval = I_TRUE;
+        }
 break;
-case 241:
-#line 1981 "fe/idl.tao_yy"
+case 278:
+#line 2198 "fe/idl.tao_yy"
 {
-	  tao_yyval.bval = I_FALSE;
-	}
+          tao_yyval.bval = I_FALSE;
+        }
 break;
-case 242:
-#line 1988 "fe/idl.tao_yy"
+case 279:
+#line 2205 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
+        }
 break;
-case 243:
-#line 1992 "fe/idl.tao_yy"
+case 280:
+#line 2209 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
-	  AST_Exception		*e = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
+          AST_Exception         *e = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
+          AST_Decl              *v = NULL;
 
           ACE_UNUSED_ARG (v);
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptIDSeen);
-	  /*
-	   * Create a node representing an exception and add it to
-	   * the enclosing scope
-	   */
-	  if (s != NULL) {
-	    e = idl_global->gen()->create_exception(n, p);
-	    (void) s->fe_add_exception(e);
-	  }
-	  /*
-	   * Push the exception scope on the scope stack
-	   */
-	  idl_global->scopes()->push(e);
-	}
-break;
-case 244:
-#line 2016 "fe/idl.tao_yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptIDSeen);
+          /*
+           * Create a node representing an exception and add it to
+           * the enclosing scope
+           */
+          if (s != NULL) {
+            e = idl_global->gen()->create_exception(n, p);
+            (void) s->fe_add_exception(e);
+          }
+          /*
+           * Push the exception scope on the scope stack
+           */
+          idl_global->scopes()->push(e);
         }
 break;
-case 245:
-#line 2020 "fe/idl.tao_yy"
+case 281:
+#line 2233 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
+        }
+break;
+case 282:
+#line 2237 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
         }
 break;
-case 246:
-#line 2024 "fe/idl.tao_yy"
+case 283:
+#line 2241 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen);
-	  /*
-	   * Done with this exception. Pop its scope from the scope stack
-	   */
-	  idl_global->scopes()->pop();
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen);
+          /*
+           * Done with this exception. Pop its scope from the scope stack
+           */
+          idl_global->scopes()->pop();
+        }
 break;
-case 247:
-#line 2036 "fe/idl.tao_yy"
+case 284:
+#line 2253 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
         }
 break;
-case 248:
-#line 2040 "fe/idl.tao_yy"
+case 285:
+#line 2257 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n =
-		new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE), NULL);
-	  AST_Operation		*o = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          UTL_ScopedName        *n =
+                new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE), NULL);
+          AST_Operation         *o = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpIDSeen);
-	  /*
-	   * Create a node representing an operation on an interface
-	   * and add it to its enclosing scope
-	   */
-	  if (s != NULL && tao_yyvsp[-2].dcval != NULL) {
-	    AST_Type *tp = AST_Type::narrow_from_decl(tao_yyvsp[-2].dcval);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpIDSeen);
+          /*
+           * Create a node representing an operation on an interface
+           * and add it to its enclosing scope
+           */
+          if (s != NULL && tao_yyvsp[-2].dcval != NULL) {
+            AST_Type *tp = AST_Type::narrow_from_decl(tao_yyvsp[-2].dcval);
             if (tp == NULL) {
               idl_global->err()->not_a_type(tao_yyvsp[-2].dcval);
             } else if (tp->node_type() == AST_Decl::NT_except) {
               idl_global->err()->not_a_type(tao_yyvsp[-2].dcval);
             } else {
-	      o = idl_global->gen()->create_operation(tp, tao_yyvsp[-3].ofval, n, p);
-	      (void) s->fe_add_operation(o);
-	    }
-	  }
-	  /*
-	   * Push the operation scope onto the scopes stack
-	   */
-	  idl_global->scopes()->push(o);
-	}
+              o = idl_global->gen()->create_operation(tp, tao_yyvsp[-3].ofval, n, p);
+              (void) s->fe_add_operation(o);
+            }
+          }
+          /*
+           * Push the operation scope onto the scopes stack
+           */
+          idl_global->scopes()->push(o);
+        }
 break;
-case 249:
-#line 2069 "fe/idl.tao_yy"
+case 286:
+#line 2286 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
         }
 break;
-case 250:
-#line 2073 "fe/idl.tao_yy"
+case 287:
+#line 2290 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
         }
 break;
-case 251:
-#line 2077 "fe/idl.tao_yy"
+case 288:
+#line 2294 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Operation		*o = NULL;
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          AST_Operation         *o = NULL;
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpCompleted);
-	  /*
-	   * Add exceptions and context to the operation
-	   */
-	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_op) {
-	    o = AST_Operation::narrow_from_scope(s);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpCompleted);
+          /*
+           * Add exceptions and context to the operation
+           */
+          if (s != NULL && s->scope_node_type() == AST_Decl::NT_op) {
+            o = AST_Operation::narrow_from_scope(s);
 
-	    if (tao_yyvsp[-2].nlval != NULL && o != NULL)
-	      (void) o->fe_add_exceptions(tao_yyvsp[-2].nlval);
-	    if (tao_yyvsp[0].slval != NULL)
-	      (void) o->fe_add_context(tao_yyvsp[0].slval);
-	  }
-	  /*
-	   * Done with this operation. Pop its scope from the scopes stack
-	   */
-	  idl_global->scopes()->pop();
-	}
+            if (tao_yyvsp[-2].nlval != NULL && o != NULL)
+              (void) o->fe_add_exceptions(tao_yyvsp[-2].nlval);
+            if (tao_yyvsp[0].slval != NULL)
+              (void) o->fe_add_context(tao_yyvsp[0].slval);
+          }
+          /*
+           * Done with this operation. Pop its scope from the scopes stack
+           */
+          idl_global->scopes()->pop();
+        }
 break;
-case 252:
-#line 2102 "fe/idl.tao_yy"
+case 289:
+#line 2319 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-	  tao_yyval.ofval = AST_Operation::OP_oneway;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
+          tao_yyval.ofval = AST_Operation::OP_oneway;
+        }
 break;
-case 253:
-#line 2107 "fe/idl.tao_yy"
+case 290:
+#line 2324 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-	  tao_yyval.ofval = AST_Operation::OP_idempotent;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
+          tao_yyval.ofval = AST_Operation::OP_idempotent;
+        }
 break;
-case 254:
-#line 2112 "fe/idl.tao_yy"
+case 291:
+#line 2329 "fe/idl.tao_yy"
 {
-	  tao_yyval.ofval = AST_Operation::OP_noflags;
-	}
+          tao_yyval.ofval = AST_Operation::OP_noflags;
+        }
 break;
-case 256:
-#line 2120 "fe/idl.tao_yy"
+case 293:
+#line 2337 "fe/idl.tao_yy"
 {
-	  tao_yyval.dcval =
-	    idl_global->scopes()->bottom()
-	       ->lookup_primitive_type(AST_Expression::EV_void);
-	}
+          tao_yyval.dcval =
+            idl_global->scopes()->bottom()
+               ->lookup_primitive_type(AST_Expression::EV_void);
+        }
 break;
-case 257:
-#line 2129 "fe/idl.tao_yy"
+case 294:
+#line 2346 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
+           cerr << "error in " << idl_global->filename()->get_string()
+                << " line " << idl_global->lineno() << ":\n" ;
+           cerr << "Sorry, I (TAO_IDL) can't handle init yet\n";
         }
 break;
-case 258:
-#line 2133 "fe/idl.tao_yy"
+case 295:
+#line 2356 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
         }
 break;
-case 259:
-#line 2137 "fe/idl.tao_yy"
+case 296:
+#line 2360 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
         }
 break;
-case 260:
-#line 2142 "fe/idl.tao_yy"
+case 297:
+#line 2364 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
         }
 break;
-case 262:
-#line 2152 "fe/idl.tao_yy"
+case 298:
+#line 2369 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
         }
 break;
-case 265:
-#line 2161 "fe/idl.tao_yy"
+case 300:
+#line 2379 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
         }
 break;
-case 266:
-#line 2165 "fe/idl.tao_yy"
+case 303:
+#line 2388 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
         }
 break;
-case 267:
-#line 2169 "fe/idl.tao_yy"
+case 304:
+#line 2392 "fe/idl.tao_yy"
+{
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
+        }
+break;
+case 305:
+#line 2396 "fe/idl.tao_yy"
 {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Argument		*a = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
+          UTL_Scope             *s = idl_global->scopes()->top_non_null();
+          AST_Argument          *a = NULL;
+          UTL_StrList           *p = idl_global->pragmas();
 
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDeclSeen);
-	  /*
-	   * Create a node representing an argument to an operation
-	   * Add it to the enclosing scope (the operation scope)
-	   */
-	  if (tao_yyvsp[-2].dcval != NULL && tao_yyvsp[0].deval != NULL && s != NULL) {
-	    AST_Type *tp = tao_yyvsp[0].deval->compose(tao_yyvsp[-2].dcval);
-	    if (tp != NULL) {
-	      a = idl_global->gen()->create_argument(tao_yyvsp[-4].dival, tp, tao_yyvsp[0].deval->name(), p);
-	      (void) s->fe_add_argument(a);
-	    }
-	  }
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpParDeclSeen);
+          /*
+           * Create a node representing an argument to an operation
+           * Add it to the enclosing scope (the operation scope)
+           */
+          if (tao_yyvsp[-2].dcval != NULL && tao_yyvsp[0].deval != NULL && s != NULL) {
+            AST_Type *tp = tao_yyvsp[0].deval->compose(tao_yyvsp[-2].dcval);
+            if (tp != NULL) {
+              a = idl_global->gen()->create_argument(tao_yyvsp[-4].dival, tp, tao_yyvsp[0].deval->name(), p);
+              (void) s->fe_add_argument(a);
+            }
+          }
+        }
 break;
-case 268:
-#line 2191 "fe/idl.tao_yy"
+case 306:
+#line 2418 "fe/idl.tao_yy"
 {
-	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-	}
+          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
+        }
 break;
-case 270:
-#line 2196 "fe/idl.tao_yy"
+case 308:
+#line 2423 "fe/idl.tao_yy"
 {
-	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
-	  AST_Decl	*d = NULL;
+          UTL_Scope     *s = idl_global->scopes()->top_non_null();
+          AST_Decl      *d = NULL;
 
-	  if (s != NULL)
-	    d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE);
-	  if (d == NULL)
-	    idl_global->err()->lookup_error(tao_yyvsp[0].idlist);
-	  tao_yyval.dcval = d;
-	}
+          if (s != NULL)
+            d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE);
+          if (d == NULL)
+            idl_global->err()->lookup_error(tao_yyvsp[0].idlist);
+          tao_yyval.dcval = d;
+        }
 break;
-case 271:
-#line 2210 "fe/idl.tao_yy"
+case 309:
+#line 2437 "fe/idl.tao_yy"
 {
-	  tao_yyval.dival = AST_Argument::dir_IN;
-	}
+          tao_yyval.dival = AST_Argument::dir_IN;
+        }
 break;
-case 272:
-#line 2214 "fe/idl.tao_yy"
+case 310:
+#line 2441 "fe/idl.tao_yy"
 {
-	  tao_yyval.dival = AST_Argument::dir_OUT;
-	}
+          tao_yyval.dival = AST_Argument::dir_OUT;
+        }
 break;
-case 273:
-#line 2218 "fe/idl.tao_yy"
+case 311:
+#line 2445 "fe/idl.tao_yy"
 {
-	  tao_yyval.dival = AST_Argument::dir_INOUT;
-	}
+          tao_yyval.dival = AST_Argument::dir_INOUT;
+        }
 break;
-case 274:
-#line 2225 "fe/idl.tao_yy"
+case 312:
+#line 2452 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
         }
 break;
-case 275:
-#line 2229 "fe/idl.tao_yy"
+case 313:
+#line 2456 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
         }
 break;
-case 276:
-#line 2234 "fe/idl.tao_yy"
+case 314:
+#line 2461 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
-	  tao_yyval.nlval = tao_yyvsp[-1].nlval;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
+          tao_yyval.nlval = tao_yyvsp[-1].nlval;
+        }
 break;
-case 277:
-#line 2239 "fe/idl.tao_yy"
+case 315:
+#line 2466 "fe/idl.tao_yy"
 {
-	  tao_yyval.nlval = NULL;
-	}
+          tao_yyval.nlval = NULL;
+        }
 break;
-case 278:
-#line 2246 "fe/idl.tao_yy"
+case 316:
+#line 2473 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
         }
 break;
-case 279:
-#line 2250 "fe/idl.tao_yy"
+case 317:
+#line 2477 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
         }
 break;
-case 280:
-#line 2255 "fe/idl.tao_yy"
+case 318:
+#line 2482 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
-	  tao_yyval.slval = tao_yyvsp[-1].slval;
-	}
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
+          tao_yyval.slval = tao_yyvsp[-1].slval;
+        }
 break;
-case 281:
-#line 2260 "fe/idl.tao_yy"
+case 319:
+#line 2487 "fe/idl.tao_yy"
 {
-	  tao_yyval.slval = NULL;
-	}
+          tao_yyval.slval = NULL;
+        }
 break;
-case 282:
-#line 2267 "fe/idl.tao_yy"
+case 320:
+#line 2494 "fe/idl.tao_yy"
 {
-	  tao_yyval.slval = new UTL_StrList(tao_yyvsp[-1].sval, tao_yyvsp[0].slval);
-	}
+          tao_yyval.slval = new UTL_StrList(tao_yyvsp[-1].sval, tao_yyvsp[0].slval);
+        }
 break;
-case 283:
-#line 2275 "fe/idl.tao_yy"
+case 321:
+#line 2502 "fe/idl.tao_yy"
 {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
+          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
         }
 break;
-case 284:
-#line 2279 "fe/idl.tao_yy"
+case 322:
+#line 2506 "fe/idl.tao_yy"
 {
-	  if (tao_yyvsp[-3].slval == NULL)
-	    tao_yyval.slval = new UTL_StrList(tao_yyvsp[0].sval, NULL);
-	  else {
-	    tao_yyvsp[-3].slval->nconc(new UTL_StrList(tao_yyvsp[0].sval, NULL));
-	    tao_yyval.slval = tao_yyvsp[-3].slval;
-	  }
-	}
+          if (tao_yyvsp[-3].slval == NULL)
+            tao_yyval.slval = new UTL_StrList(tao_yyvsp[0].sval, NULL);
+          else {
+            tao_yyvsp[-3].slval->nconc(new UTL_StrList(tao_yyvsp[0].sval, NULL));
+            tao_yyval.slval = tao_yyvsp[-3].slval;
+          }
+        }
 break;
-case 285:
-#line 2288 "fe/idl.tao_yy"
+case 323:
+#line 2515 "fe/idl.tao_yy"
 {
-	  tao_yyval.slval = NULL;
-	}
+          tao_yyval.slval = NULL;
+        }
 break;
-#line 3303 "y.tab.cpp"
+#line 3619 "y.tab.cpp"
     }
     tao_yyssp -= tao_yym;
     tao_yystate = *tao_yyssp;
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index f68f2acb310..9072bf04bde 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -35,39 +35,49 @@
 #define IDL_RAISES 290
 #define IDL_CONTEXT 291
 #define IDL_NATIVE 292
-#define IDL_INTEGER_LITERAL 293
-#define IDL_STRING_LITERAL 294
-#define IDL_CHARACTER_LITERAL 295
-#define IDL_FLOATING_PT_LITERAL 296
-#define IDL_TRUETOK 297
-#define IDL_FALSETOK 298
-#define IDL_SCOPE_DELIMITOR 299
-#define IDL_LEFT_SHIFT 300
-#define IDL_RIGHT_SHIFT 301
+#define IDL_ABSTRACT 293
+#define IDL_CUSTOM 294
+#define IDL_INIT 295
+#define IDL_PRIVATE 296
+#define IDL_PUBLIC 297
+#define IDL_SUPPORTS 298
+#define IDL_TRUNCATABLE 299
+#define IDL_VALUETYPE 300
+#define IDL_INTEGER_LITERAL 301
+#define IDL_STRING_LITERAL 302
+#define IDL_CHARACTER_LITERAL 303
+#define IDL_FLOATING_PT_LITERAL 304
+#define IDL_TRUETOK 305
+#define IDL_FALSETOK 306
+#define IDL_SCOPE_DELIMITOR 307
+#define IDL_LEFT_SHIFT 308
+#define IDL_RIGHT_SHIFT 309
 typedef union {
-  AST_Decl		*dcval;		/* Decl value		*/
-  UTL_StrList		*slval;		/* String list		*/
-  UTL_NameList		*nlval;		/* Name list		*/
-  UTL_ExprList		*elval;		/* Expression list	*/
-  UTL_LabelList		*llval;		/* Label list		*/
-  UTL_DeclList		*dlval;		/* Declaration list	*/
-  FE_InterfaceHeader	*ihval;		/* Interface header	*/
-  AST_Expression	*exval;		/* Expression value	*/
-  AST_UnionLabel	*ulval;		/* Union label		*/
-  AST_Field		*ffval;		/* Field value		*/
-  AST_Expression::ExprType etval;	/* Expression type	*/
-  AST_Argument::Direction dival;	/* Argument direction	*/
-  AST_Operation::Flags	ofval;		/* Operation flags	*/
-  FE_Declarator		*deval;		/* Declarator value	*/
-  idl_bool		bval;		/* Boolean value	*/
-  long			ival;		/* Long value		*/
-  double		dval;		/* Double value		*/
-  float			fval;		/* Float value		*/
-  char			cval;		/* Char value		*/
+  AST_Decl              *dcval;         /* Decl value           */
+  UTL_StrList           *slval;         /* String list          */
+  UTL_NameList          *nlval;         /* Name list            */
+  UTL_ExprList          *elval;         /* Expression list      */
+  UTL_LabelList         *llval;         /* Label list           */
+  UTL_DeclList          *dlval;         /* Declaration list     */
+  FE_InterfaceHeader    *ihval;         /* Interface header     */
+  FE_obv_header         *vhval;         /* Valuetype header     */
+  AST_Expression        *exval;         /* Expression value     */
+  AST_UnionLabel        *ulval;         /* Union label          */
+  AST_Field             *ffval;         /* Field value          */
+  AST_Field::Visibility  vival;         /* N/A, pub or priv     */
+  AST_Expression::ExprType etval;       /* Expression type      */
+  AST_Argument::Direction dival;        /* Argument direction   */
+  AST_Operation::Flags  ofval;          /* Operation flags      */
+  FE_Declarator         *deval;         /* Declarator value     */
+  idl_bool              bval;           /* Boolean value        */
+  long                  ival;           /* Long value           */
+  double                dval;           /* Double value         */
+  float                 fval;           /* Float value          */
+  char                  cval;           /* Char value           */
 
-  String		*sval;		/* String value		*/
-  char			*strval;	/* char * value		*/
-  Identifier		*idval;		/* Identifier		*/
-  UTL_IdList		*idlist;	/* Identifier list	*/
+  String                *sval;          /* String value         */
+  char                  *strval;        /* char * value         */
+  Identifier            *idval;         /* Identifier           */
+  UTL_IdList            *idlist;        /* Identifier list      */
 } TAO_YYSTYPE;
 extern TAO_YYSTYPE tao_yylval;
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
index 20df9f68fe3..a6583ee3ec0 100644
--- a/TAO/TAO_IDL/include/ast_field.h
+++ b/TAO/TAO_IDL/include/ast_field.h
@@ -90,18 +90,20 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class   AST_Field : public virtual AST_Decl
 {
 public:
+  enum Visibility {vis_NA, vis_PUBLIC, vis_PRIVATE};
   // Operations
 
   // Constructor(s)
   AST_Field();
   AST_Field(AST_Type *field_type,
-            UTL_ScopedName *n, UTL_StrList *p);
+            UTL_ScopedName *n, UTL_StrList *p, Visibility vis = vis_NA);
   AST_Field(AST_Decl::NodeType nt, AST_Type *field_type,
-            UTL_ScopedName *n, UTL_StrList *p);
+            UTL_ScopedName *n, UTL_StrList *p, Visibility vis = vis_NA);
   virtual ~AST_Field() {}
 
   // Data Accessors
   AST_Type *field_type();
+  Visibility visibility();
 
   // Narrowing
   DEF_NARROW_METHODS1(AST_Field, AST_Decl);
@@ -113,7 +115,7 @@ public:
 private:
   // Data
   AST_Type                      *pd_field_type; // Base type for field
-
+  Visibility                    pd_visibility;
 };
 
 #endif           // _AST_FIELD_AST_FIELD_HH
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index b6a6686ffb8..cc2ce73cbe2 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -113,6 +113,16 @@ public:
   virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n,
                                                  UTL_StrList *p);
 
+  // Create a node representing an valuetype
+  virtual AST_Interface *create_valuetype(UTL_ScopedName *n,
+                                          AST_Interface **ih,
+                                          long nih,
+                                          UTL_StrList *p);
+
+  // Create a node representing a forward declaration of an valuetype
+  virtual AST_InterfaceFwd *create_valuetype_fwd(UTL_ScopedName *n,
+                                                 UTL_StrList *p);
+
   // Create a node representing an exception
   virtual AST_Exception *create_exception(UTL_ScopedName *n,
                                           UTL_StrList *p);
@@ -135,7 +145,8 @@ public:
   // union
   virtual AST_Field     *create_field(AST_Type *ft,
                                       UTL_ScopedName *n,
-                                      UTL_StrList *p);
+                                      UTL_StrList *p,
+                                      AST_Field::Visibility vis = AST_Field::vis_NA);
 
   // Create a node representing an argument to an operation
   virtual AST_Argument  *create_argument(AST_Argument::Direction d,
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index 317a181dcd0..7cf75626a5c 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -100,6 +100,10 @@ public:
   virtual ~AST_Interface() {}
 
   // Data Accessors
+  static void fwd_redefinition_helper (AST_Interface *&i,
+                                       UTL_Scope *s, UTL_StrList *p);
+
+  virtual void redefine (AST_Interface *from, UTL_StrList *p);
   AST_Interface **inherits();
   void set_inherits(AST_Interface **i);
   long n_inherits();
@@ -113,6 +117,11 @@ public:
     return (pd_n_inherits < 0) ? I_FALSE : I_TRUE;
   }
 
+  virtual idl_bool is_abstract_interface ();
+  virtual idl_bool is_valuetype ();
+  virtual idl_bool is_abstract_valuetype ();
+  virtual void set_abstract_valuetype ();
+
   // Narrowing
   DEF_NARROW_METHODS2(AST_Interface, AST_Type, UTL_Scope);
   DEF_NARROW_FROM_DECL(AST_Interface);
@@ -134,6 +143,7 @@ private:
   virtual AST_Constant          *fe_add_constant(AST_Constant   *c);
   virtual AST_Exception         *fe_add_exception(AST_Exception *e);
   virtual AST_Attribute         *fe_add_attribute(AST_Attribute *a);
+  virtual AST_Field             *fe_add_field(AST_Field *o);
   virtual AST_Operation         *fe_add_operation(AST_Operation *o);
   virtual AST_Union             *fe_add_union(AST_Union         *u);
   virtual AST_Structure         *fe_add_structure(AST_Structure *s);
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
index 49153b9da59..64a334f4223 100644
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO/TAO_IDL/include/ast_interface_fwd.h
@@ -83,13 +83,18 @@ public:
 
   // Constructor(s)
   AST_InterfaceFwd();
-  AST_InterfaceFwd(UTL_ScopedName *n, UTL_StrList *p);
+  AST_InterfaceFwd (AST_Interface *dummy, UTL_ScopedName *n, UTL_StrList *p);
   virtual ~AST_InterfaceFwd() {}
 
   // Data Accessors
   AST_Interface *full_definition();
   void set_full_definition(AST_Interface *nfd);
 
+  virtual idl_bool is_abstract_interface ();
+  virtual idl_bool is_valuetype ();
+  virtual idl_bool is_abstract_valuetype ();
+  virtual void set_abstract_valuetype ();
+
   // Narrowing
   DEF_NARROW_METHODS1(AST_InterfaceFwd, AST_Type);
   DEF_NARROW_FROM_DECL(AST_InterfaceFwd);
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index cae2cb03b3c..4cf89f0f27c 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -97,6 +97,10 @@ public:
   // AST Dumping
   virtual void                  dump(ostream &o);
 
+  // involved in OBV_ namespace generation
+  void set_has_nested_valuetype ();
+  idl_bool has_nested_valuetype ();
+
 private:
   friend void fe_populate(AST_Module *m);
   friend int tao_yyparse();
@@ -116,6 +120,7 @@ private:
   virtual AST_Typedef           *fe_add_typedef(AST_Typedef             *t);
   virtual AST_Native            *fe_add_native (AST_Native      *n);
 
+  idl_bool pd_has_nested_valuetype;
 };
 
 #endif           // _AST_MODULE_AST_MODULE_HH
diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h
index 0fe78e3e227..b427dcd2812 100644
--- a/TAO/TAO_IDL/include/fe_interface_header.h
+++ b/TAO/TAO_IDL/include/fe_interface_header.h
@@ -70,6 +70,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FE_InterfaceHeader
 //
 // Internal class for FE to describe interface headers
+//
+// FE_obv_header
+// Internal class for FE to describe valuetype headers
+//
 
 /*
 ** DEPENDENCIES: utl_scoped_name.hh, ast_interface.hh, utl_scope.hh,
@@ -84,7 +88,9 @@ public:
   // Operations
 
   // Constructor(s)
-  FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *l);
+  FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *l,
+                                        UTL_NameList *supports = 0,
+                                        idl_bool compile_now = 1);
   virtual ~FE_InterfaceHeader() {}
 
   // Data Accessors
@@ -92,9 +98,10 @@ public:
   AST_Interface **inherits();
   long n_inherits();
 
-private:
   // Data
+protected:
   UTL_ScopedName        *pd_interface_name;     // Interface name
+private:
   AST_Interface         **pd_inherits;          // Inherited interfaces
   long                  pd_n_inherits;          // How many
 
@@ -102,8 +109,46 @@ private:
 
   // Compile the flattened unique list of interfaces which this
   // interface inherits from
+protected:
+  void                  compile_inheritance(UTL_NameList *l,
+                                            UTL_NameList *supports);
+private:
   void                  compile_one_inheritance(AST_Interface *i);
-  void                  compile_inheritance(UTL_NameList *l);
+
+  // called from compile_inheritance()
+  virtual idl_bool check_first (AST_Interface *i);
+  virtual idl_bool check_further (AST_Interface *i);
+  virtual idl_bool check_supports (AST_Interface *i);
 };
 
+
+class FE_obv_header;
+
+// #ifdef IDL_HAS_VALUETYPE
+
+class FE_obv_header : public FE_InterfaceHeader
+{
+public:
+
+  // Constructor(s)
+  FE_obv_header(UTL_ScopedName *n, UTL_NameList *l, UTL_NameList *supports);
+  virtual ~FE_obv_header() {}
+
+  // Data Accessors
+  void valuetype_name (UTL_ScopedName *n);
+  long n_concrete ();
+
+ private:
+
+  // called from compile_inheritance()
+  virtual idl_bool check_first (AST_Interface *i);
+  virtual idl_bool check_further (AST_Interface *i);
+  virtual idl_bool check_supports (AST_Interface *i);
+
+  idl_bool truncatable_;  /* currently 0, ignored */
+  long n_concrete_;
+};
+
+// #endif /* IDL_HAS_VALUETYPE */
+
 #endif           // _FE_INTERFACE_HEADER_FE_INTERFACE_HH
diff --git a/TAO/TAO_IDL/include/idl.h b/TAO/TAO_IDL/include/idl.h
index 0b9161c511b..fedbd9d8b53 100644
--- a/TAO/TAO_IDL/include/idl.h
+++ b/TAO/TAO_IDL/include/idl.h
@@ -79,6 +79,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#define IDL_HAS_VALUETYPE
+
 #include        "intlmacros.h"          // Define macros for intl'ion
 
 #include        <stdlib.h>              // POSIX standard defns
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index ebc1657a4c9..c9bf29936e3 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -87,6 +87,7 @@ public:
     , PS_ExceptDeclSeen         // Seen complete exception declaration
     , PS_InterfaceDeclSeen      // Seen complete interface declaration
     , PS_ModuleDeclSeen         // Seen complete module declaration
+    , PS_ValuetypeDeclSeen      // Seen complete valuetype declaration
     , PS_AttrDeclSeen           // Seen complete attribute declaration
     , PS_OpDeclSeen             // Seen complete operation declaration
     , PS_ModuleSeen             // Seen a MODULE keyword
@@ -102,6 +103,8 @@ public:
     , PS_InterfaceQsSeen        // '}' seen for interface
     , PS_InterfaceBodySeen      // Seen an interface body
     , PS_InheritColonSeen       // Seen ':' in inheritance list
+    , PS_ValuetypeSeen          // Seen a VALUETYPE keyword
+    , PS_ValuetypeIDSeen        // Seen the valuetype ID
     , PS_SNListCommaSeen        // Seen ',' in list of scoped names
     , PS_ScopedNameSeen         // Seen a complete scoped name
     , PS_SN_IDSeen              // Seen an identifier as part of a scoped name
@@ -291,18 +294,18 @@ public:
 
   // The number of currently availabe include files.
   virtual size_t n_included_idl_files (void);
-  
+
   // Set the number of included_idl_files. Use this carefully. This
   // method is used when we validate all the #included idl files,
   // against the ones that we get after preprocessing.
   virtual void n_included_idl_files (size_t n);
 
   // Validate the included idl files, somefiles might have been
-  // ignored by the preprocessor. 
+  // ignored by the preprocessor.
   virtual void validate_included_idl_files (void);
-  
-  virtual ParseState		parse_state();		// What state we're in
-  virtual void			set_parse_state(ParseState s); // Set it
+
+  virtual ParseState            parse_state();          // What state we're in
+  virtual void                  set_parse_state(ParseState s); // Set it
 
   // Convert from a predefined type to an expression type
   virtual AST_Expression::ExprType
@@ -415,7 +418,7 @@ public:
 
   virtual void impl_class_suffix (const char* s);
   // Set the implementation class suffix.
-  
+
   virtual void implementation_skel_ending (const char* s);
   // Set the implementation_skel_ending.
 
@@ -488,10 +491,10 @@ public:
   // Get the path for the perfect hashing program (GPERF).
 
   virtual void any_support (idl_bool);
-  // enable suppressing any support
+  // enable suppressing any support    ?T.Kuepper: suppressed?
 
   virtual idl_bool any_support (void);
-  // check if Any support is suppressed
+  // check if Any support is suppressed  ? enabled ?
 
   virtual void tc_support (idl_bool);
   // enable suppressing TypeCode support
@@ -499,6 +502,17 @@ public:
   virtual idl_bool tc_support (void);
   // check if TypeCode support is suppressed
 
+#ifdef IDL_HAS_VALUETYPE
+  virtual void obv_opt_accessor (idl_bool);
+  virtual idl_bool obv_opt_accessor (void);
+
+  virtual void obv_support (idl_bool);
+  // set enable/disable OBV (Valuetype) support
+#endif /* IDL_HAS_VALUETYPE */
+
+  virtual idl_bool obv_support (void);
+  // check if OBV (Valuetype) support is enabled
+
   virtual void compiled_marshaling (idl_bool);
   // enable compiled marshaling support
 
@@ -579,7 +593,7 @@ private:
                                                         // before?
 
   String                        *pd_idl_src_file;       // IDL source file.
-  
+
   size_t  changing_standard_include_files_;
   // To switch between changing or non-changing standard include
   // files (e.g. tao/corba.h)  so that #include statements can be
@@ -605,7 +619,7 @@ private:
 
  // Implementation's skeleton file name ending. Default is "I.cpp".
   char* implementation_skel_ending_;
-  
+
   //Implementaion class prefix
   char* impl_class_prefix_;
 
@@ -637,17 +651,23 @@ private:
   // Directory where all the IDL-Compiler-Generated files are to be
   // kept. Default value is 0 for this string which means the current
   // directory from which the <tao_idl> is called.
-  
+
   char* temp_dir_;
   // Temp directory where which we can rewsolve in drv_preproc.cpp by
   // checking for  TEMP env variable otherwise we assign to /tmp/.
-  
+
   idl_bool any_support_;
   // do we support Any operators?
 
   idl_bool tc_support_;
   // do we support typecodes?
 
+  idl_bool obv_support_;
+  // do we support OBV (Valuetype)?
+
+  idl_bool obv_opt_accessor_;
+  // do we optimize valuetype accessors?
+
   idl_bool compiled_marshaling_;
   // do we support compiled marshaling
 
@@ -668,15 +688,3 @@ private:
 };
 
 #endif  //_IDL_IDL_GLOBAL_HH
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index f0d4bb86d2e..6a1b73556a6 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -144,6 +144,8 @@ public:
   // Report an attempt to inherit from something other than an interface
   void  inheritance_error(UTL_ScopedName *n, AST_Decl *d);
 
+  void  abstract_inheritance_error (UTL_ScopedName *n);
+
   // Report an error while evaluating an expression (division by zero, etc.)
   void  eval_error(AST_Expression *d);
 
diff --git a/TAO/TAO_IDL/include/utl_error.h b/TAO/TAO_IDL/include/utl_error.h
index f0d4bb86d2e..6a1b73556a6 100644
--- a/TAO/TAO_IDL/include/utl_error.h
+++ b/TAO/TAO_IDL/include/utl_error.h
@@ -144,6 +144,8 @@ public:
   // Report an attempt to inherit from something other than an interface
   void  inheritance_error(UTL_ScopedName *n, AST_Decl *d);
 
+  void  abstract_inheritance_error (UTL_ScopedName *n);
+
   // Report an error while evaluating an expression (division by zero, etc.)
   void  eval_error(AST_Expression *d);
 
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 30f9f0e51e6..326552a74aa 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -65,10 +65,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  */
 
 // utl_error.cc - Implementation of error reporting object for IDL
-//		  compiler program
+//                compiler program
 
-#include	"idl.h"
-#include	"idl_extern.h"
+#include        "idl.h"
+#include        "idl_extern.h"
 
 ACE_RCSID(util, utl_error, "$Id$")
 
@@ -114,7 +114,7 @@ error_string(UTL_Error::ErrorCode c)
   case UTL_Error::EIDL_ILLEGAL_CONTEXT:
     return GTDEVEL("error in context(..) clause, ");
   case UTL_Error::EIDL_CANT_INHERIT:
-    return GTDEVEL("cannot inherit from ");
+    return GTDEVEL("");
   case UTL_Error::EIDL_LOOKUP_ERROR:
     return GTDEVEL("error in lookup of symbol: ");
   case UTL_Error::EIDL_INHERIT_FWD_ERROR:
@@ -468,8 +468,8 @@ void
 UTL_Error::syntax_error(IDL_GlobalData::ParseState ps)
 {
   idl_error_header(EIDL_SYNTAX_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
+                   idl_global->lineno(),
+                   idl_global->filename());
   cerr << parse_state_to_error_message(ps) << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
@@ -501,9 +501,9 @@ UTL_Error::error2(UTL_Error::ErrorCode c, AST_Decl *d1, AST_Decl *d2)
 
 void
 UTL_Error::error3(UTL_Error::ErrorCode c,
-		  AST_Decl *d1,
-		  AST_Decl *d2,
-		  AST_Decl *d3)
+                  AST_Decl *d1,
+                  AST_Decl *d2,
+                  AST_Decl *d3)
 {
   idl_error_header(c, d1->line(), d1->file_name());
   d1->name()->dump(cerr); cerr << ", ";
@@ -527,8 +527,8 @@ void
 UTL_Error::lookup_error(UTL_ScopedName *n)
 {
   idl_error_header(EIDL_LOOKUP_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
+                   idl_global->lineno(),
+                   idl_global->filename());
   n->dump(cerr);
   cerr << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
@@ -552,15 +552,27 @@ UTL_Error::inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f)
 void
 UTL_Error::inheritance_error(UTL_ScopedName *n, AST_Decl *d)
 {
-  idl_error_header(EIDL_CANT_INHERIT, d->line(), d->file_name());
-  cerr << " interface ";
+  idl_error_header(EIDL_CANT_INHERIT, idl_global->lineno(), idl_global->filename());
+  /* cerr << " interface "; */
   n->dump(cerr);
   cerr << GTDEVEL(" attempts to inherit from ");
-  d->dump(cerr);
+  d->name()->dump(cerr);
   cerr << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
 
+// Report inheritance from non-abstract valuetype
+void
+UTL_Error::abstract_inheritance_error (UTL_ScopedName *n)
+{
+  idl_error_header(EIDL_CANT_INHERIT, idl_global->lineno(), idl_global->filename());
+  cerr << " abstract valuetype ";
+  n->dump(cerr);
+  cerr << GTDEVEL(" attempts to inherit from nonabstract type\n");
+  idl_global->set_err_count(idl_global->err_count() + 1);
+}
+
+
 // Report an error while evaluating an expression
 void
 UTL_Error::eval_error(AST_Expression *v)
@@ -606,8 +618,8 @@ UTL_Error::enum_val_expected(AST_Union *u, AST_UnionLabel *l)
 // the enum discriminator type
 void
 UTL_Error::enum_val_lookup_failure(AST_Union *u,
-				AST_Enum *e,
-				UTL_ScopedName *n)
+                                AST_Enum *e,
+                                UTL_ScopedName *n)
 {
   idl_error_header(EIDL_ENUM_VAL_NOT_FOUND, u->line(), u->file_name());
   cerr << " union " << u->local_name()->get_string() << ", ";
@@ -623,8 +635,8 @@ void
 UTL_Error::name_case_error(char *b, char *n)
 {
   idl_error_header(EIDL_NAME_CASE_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
+                   idl_global->lineno(),
+                   idl_global->filename());
   cerr << "\"" << b << GTDEVEL("\" and ") << "\"" << n << "\"\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
@@ -661,8 +673,8 @@ void
 UTL_Error::fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n)
 {
   idl_error_header(EIDL_FWD_DECL_LOOKUP,
-		   idl_global->lineno(),
-		   idl_global->filename());
+                   idl_global->lineno(),
+                   idl_global->filename());
   cerr << GTDEVEL("trying to look up ");
   n->dump(cerr);
   cerr << GTDEVEL(" in undefined forward declared interface ");
@@ -688,8 +700,8 @@ void
 UTL_Error::not_a_type(AST_Decl *d)
 {
   idl_error_header(EIDL_NOT_A_TYPE,
-		   idl_global->lineno(),
-		   idl_global->filename());
+                   idl_global->lineno(),
+                   idl_global->filename());
   if (d == NULL || d->name() == NULL)
     cerr << GTDEVEL("unknown symbol");
   else
diff --git a/TAO/TAO_IDL/util/utl_error.cpp b/TAO/TAO_IDL/util/utl_error.cpp
index 30f9f0e51e6..326552a74aa 100644
--- a/TAO/TAO_IDL/util/utl_error.cpp
+++ b/TAO/TAO_IDL/util/utl_error.cpp
@@ -65,10 +65,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  */
 
 // utl_error.cc - Implementation of error reporting object for IDL
-//		  compiler program
+//                compiler program
 
-#include	"idl.h"
-#include	"idl_extern.h"
+#include        "idl.h"
+#include        "idl_extern.h"
 
 ACE_RCSID(util, utl_error, "$Id$")
 
@@ -114,7 +114,7 @@ error_string(UTL_Error::ErrorCode c)
   case UTL_Error::EIDL_ILLEGAL_CONTEXT:
     return GTDEVEL("error in context(..) clause, ");
   case UTL_Error::EIDL_CANT_INHERIT:
-    return GTDEVEL("cannot inherit from ");
+    return GTDEVEL("");
   case UTL_Error::EIDL_LOOKUP_ERROR:
     return GTDEVEL("error in lookup of symbol: ");
   case UTL_Error::EIDL_INHERIT_FWD_ERROR:
@@ -468,8 +468,8 @@ void
 UTL_Error::syntax_error(IDL_GlobalData::ParseState ps)
 {
   idl_error_header(EIDL_SYNTAX_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
+                   idl_global->lineno(),
+                   idl_global->filename());
   cerr << parse_state_to_error_message(ps) << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
@@ -501,9 +501,9 @@ UTL_Error::error2(UTL_Error::ErrorCode c, AST_Decl *d1, AST_Decl *d2)
 
 void
 UTL_Error::error3(UTL_Error::ErrorCode c,
-		  AST_Decl *d1,
-		  AST_Decl *d2,
-		  AST_Decl *d3)
+                  AST_Decl *d1,
+                  AST_Decl *d2,
+                  AST_Decl *d3)
 {
   idl_error_header(c, d1->line(), d1->file_name());
   d1->name()->dump(cerr); cerr << ", ";
@@ -527,8 +527,8 @@ void
 UTL_Error::lookup_error(UTL_ScopedName *n)
 {
   idl_error_header(EIDL_LOOKUP_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
+                   idl_global->lineno(),
+                   idl_global->filename());
   n->dump(cerr);
   cerr << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
@@ -552,15 +552,27 @@ UTL_Error::inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f)
 void
 UTL_Error::inheritance_error(UTL_ScopedName *n, AST_Decl *d)
 {
-  idl_error_header(EIDL_CANT_INHERIT, d->line(), d->file_name());
-  cerr << " interface ";
+  idl_error_header(EIDL_CANT_INHERIT, idl_global->lineno(), idl_global->filename());
+  /* cerr << " interface "; */
   n->dump(cerr);
   cerr << GTDEVEL(" attempts to inherit from ");
-  d->dump(cerr);
+  d->name()->dump(cerr);
   cerr << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
 
+// Report inheritance from non-abstract valuetype
+void
+UTL_Error::abstract_inheritance_error (UTL_ScopedName *n)
+{
+  idl_error_header(EIDL_CANT_INHERIT, idl_global->lineno(), idl_global->filename());
+  cerr << " abstract valuetype ";
+  n->dump(cerr);
+  cerr << GTDEVEL(" attempts to inherit from nonabstract type\n");
+  idl_global->set_err_count(idl_global->err_count() + 1);
+}
+
+
 // Report an error while evaluating an expression
 void
 UTL_Error::eval_error(AST_Expression *v)
@@ -606,8 +618,8 @@ UTL_Error::enum_val_expected(AST_Union *u, AST_UnionLabel *l)
 // the enum discriminator type
 void
 UTL_Error::enum_val_lookup_failure(AST_Union *u,
-				AST_Enum *e,
-				UTL_ScopedName *n)
+                                AST_Enum *e,
+                                UTL_ScopedName *n)
 {
   idl_error_header(EIDL_ENUM_VAL_NOT_FOUND, u->line(), u->file_name());
   cerr << " union " << u->local_name()->get_string() << ", ";
@@ -623,8 +635,8 @@ void
 UTL_Error::name_case_error(char *b, char *n)
 {
   idl_error_header(EIDL_NAME_CASE_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
+                   idl_global->lineno(),
+                   idl_global->filename());
   cerr << "\"" << b << GTDEVEL("\" and ") << "\"" << n << "\"\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
@@ -661,8 +673,8 @@ void
 UTL_Error::fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n)
 {
   idl_error_header(EIDL_FWD_DECL_LOOKUP,
-		   idl_global->lineno(),
-		   idl_global->filename());
+                   idl_global->lineno(),
+                   idl_global->filename());
   cerr << GTDEVEL("trying to look up ");
   n->dump(cerr);
   cerr << GTDEVEL(" in undefined forward declared interface ");
@@ -688,8 +700,8 @@ void
 UTL_Error::not_a_type(AST_Decl *d)
 {
   idl_error_header(EIDL_NOT_A_TYPE,
-		   idl_global->lineno(),
-		   idl_global->filename());
+                   idl_global->lineno(),
+                   idl_global->filename());
   if (d == NULL || d->name() == NULL)
     cerr << GTDEVEL("unknown symbol");
   else
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 5404f1490a9..cc6897af78f 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -126,6 +126,12 @@ IDL_GlobalData::IDL_GlobalData (void)
       temp_dir_ (0),
       any_support_ (I_TRUE),
       tc_support_ (I_TRUE),
+#ifdef IDL_HAS_VALUETYPE
+      obv_support_ (I_FALSE), // maybe I_TRUE
+      obv_opt_accessor_ (0),
+#else
+      obv_support_ (I_FALSE), // ever
+#endif
       compiled_marshaling_ (I_TRUE),
       gen_impl_files_ (I_FALSE),
       gen_copy_ctor_ (I_FALSE),
@@ -1258,6 +1264,32 @@ IDL_GlobalData::tc_support (void)
   return this->tc_support_;
 }
 
+#ifdef IDL_HAS_VALUETYPE
+void
+IDL_GlobalData::obv_opt_accessor (idl_bool val)
+{
+  this->obv_opt_accessor_ = val;
+}
+
+idl_bool
+IDL_GlobalData::obv_opt_accessor (void)
+{
+  return this->obv_opt_accessor_;
+}
+
+void
+IDL_GlobalData::obv_support (idl_bool val)
+{
+  this->obv_support_ = val;
+}
+#endif /* IDL_HAS_VALUETYPE */
+
+idl_bool
+IDL_GlobalData::obv_support (void)
+{
+  return this->obv_support_;
+}
+
 void
 IDL_GlobalData::compiled_marshaling (idl_bool val)
 {
diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile
index 5048ac0fab0..fd4fadda73a 100644
--- a/TAO/examples/Callback_Quoter/Makefile
+++ b/TAO/examples/Callback_Quoter/Makefile
@@ -237,6 +237,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -247,8 +249,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -384,6 +384,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.h ConsumerC.i NotifierC.i NotifierS.h ConsumerS.h \
  ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS_T.h \
  NotifierS_T.i NotifierS_T.cpp NotifierS.i
@@ -504,6 +508,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -514,8 +520,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -651,6 +655,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
  NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
  NotifierS.i
@@ -771,6 +779,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -781,8 +791,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -918,6 +926,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i ConsumerS.h ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp \
  ConsumerS.i
 .obj/ConsumerS.o .obj/ConsumerS.so .shobj/ConsumerS.o .shobj/ConsumerS.so: ConsumerS.cpp ConsumerS.h ConsumerC.h \
@@ -1037,6 +1049,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1047,8 +1061,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1184,6 +1196,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i
 .obj/consumer.o .obj/consumer.so .shobj/consumer.o .shobj/consumer.so: consumer.cpp Consumer_Handler.h ConsumerC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1302,6 +1318,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1312,8 +1330,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1449,6 +1465,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \
  ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \
  NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \
@@ -1589,6 +1609,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1599,8 +1621,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1736,6 +1756,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1877,6 +1901,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1887,8 +1913,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2024,6 +2048,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -2160,6 +2188,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2170,8 +2200,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2307,6 +2335,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -2442,6 +2474,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2452,8 +2486,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2589,6 +2621,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
  NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
  NotifierS.i \
@@ -2727,6 +2763,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2737,8 +2775,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2874,6 +2910,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
  NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
  NotifierS.i \
@@ -3013,6 +3053,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3023,8 +3065,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3160,6 +3200,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
  NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
  NotifierS.i \
@@ -3281,6 +3325,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3291,8 +3337,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3428,6 +3472,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
  NotifierS.h NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i \
  NotifierS_T.cpp NotifierS.i
@@ -3550,6 +3598,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3560,8 +3610,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3697,6 +3745,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \
  ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \
  NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \
@@ -3838,6 +3890,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3848,8 +3902,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3985,6 +4037,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \
  ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \
  NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \
@@ -4125,6 +4181,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -4135,8 +4193,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4272,6 +4328,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \
  ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \
  NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \
diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile
index 4c6a063a09f..f02b09639d0 100644
--- a/TAO/examples/Event_Comm/Makefile
+++ b/TAO/examples/Event_Comm/Makefile
@@ -229,6 +229,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -239,8 +241,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -376,6 +376,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i
 .obj/Event_CommC.o .obj/Event_CommC.so .shobj/Event_CommC.o .shobj/Event_CommC.so: Event_CommC.cpp Event_CommC.h \
@@ -495,6 +499,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -505,8 +511,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -642,6 +646,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS.h Event_CommS_T.h Event_CommS_T.i \
  Event_CommS_T.cpp Event_CommS.i
 .obj/Consumer_Handler.o .obj/Consumer_Handler.so .shobj/Consumer_Handler.o .shobj/Consumer_Handler.so: Consumer_Handler.cpp Consumer_Handler.h \
@@ -766,6 +774,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -776,8 +786,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -910,6 +918,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -1050,6 +1062,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1060,8 +1074,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1194,6 +1206,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -1332,6 +1348,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1342,8 +1360,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1476,6 +1492,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i
 .obj/Notifier_Handler.o .obj/Notifier_Handler.so .shobj/Notifier_Handler.o .shobj/Notifier_Handler.so: Notifier_Handler.cpp Notifier_Handler.h \
@@ -1603,6 +1623,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1613,8 +1635,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1747,6 +1767,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -1885,6 +1909,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1895,8 +1921,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2029,6 +2053,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i Notifier_Handler.h \
  $(ACE_ROOT)/ace/CORBA_Handler.h \
@@ -2171,6 +2199,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2181,8 +2211,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2315,6 +2343,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -2454,6 +2486,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2464,8 +2498,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2598,6 +2630,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i \
  $(TAO_ROOT)/tao/TAO.h \
@@ -2742,6 +2778,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2752,8 +2790,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2886,6 +2922,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -3026,6 +3066,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3036,8 +3078,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3170,6 +3210,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i \
  $(TAO_ROOT)/tao/TAO.h \
diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile
index 0e0490bf482..d195ad5816c 100644
--- a/TAO/examples/Makefile
+++ b/TAO/examples/Makefile
@@ -14,7 +14,8 @@ DIRS  = Callback_Quoter \
         POA \
 	Quoter \
 	Simple \
-	Event_Comm
+	Event_Comm \
+	OBV
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/examples/OBV/Makefile b/TAO/examples/OBV/Makefile
new file mode 100644
index 00000000000..524e8067824
--- /dev/null
+++ b/TAO/examples/OBV/Makefile
@@ -0,0 +1,23 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#  Makefile for the TAO/OBV examples
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+DIRS  = Typed_Events
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include	$(ACE_ROOT)/include/makeinclude/macros.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
new file mode 100644
index 00000000000..93ff0c293f3
--- /dev/null
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -0,0 +1,351 @@
+//$Id$
+
+// This version of Simple_Util doesn't need to link against orbsvcs
+// On the other hand it has no naming service.
+
+#ifndef SIMPLE_UTIL_C
+#define SIMPLE_UTIL_C
+# include "Simple_util.h"
+
+// Constructor.
+
+template <class Servant>
+Server<Servant>::Server (void)
+    : ior_output_file_ (0),
+      naming_ (0),
+      ins_ (0)
+{
+  // no-op.
+}
+
+// Destructor.
+
+template <class Servant>
+Server<Servant>::~Server (void)
+{
+}
+
+// Parse the command-line arguments and set options.
+
+template <class Servant> int
+Server<Servant>::parse_args (void)
+{
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:");
+  int c = 0;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':  // debug flag.
+        TAO_debug_level++;
+        break;
+      case 'o':  // output the IOR to a file.
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
+        if (this->ior_output_file_ == 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Unable to open %s for writing: %p\n",
+                             get_opts.optarg), -1);
+        break;
+
+      case 'i': // For Testing the InterOperable Naming Service.
+        this->ins_ = CORBA::string_dup (get_opts.optarg);
+        break;
+      case '?':  // display help for use of the server.
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-d]"
+                           " [-o] <ior_output_file>"
+                           "\n",
+                           argv_ [0]),
+                          -1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+// Add the ObjectID:IOR mapping to the IOR table of
+// the ORB. Ignore this method if you are not testing for
+// the InterOperable Naming Service.
+
+template <class Servant> int
+Server<Servant>::test_for_ins (CORBA::String_var ior)
+{
+
+  CORBA::Object_ptr bank_servant =
+    this->orb_manager_.orb ()->string_to_object (ior.in());
+
+  // Add a KEY:IOR mapping to the ORB table.
+  ACE_CString object_id (this->ins_);
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "Adding (KEY:IOR) %s:%s\n",
+                object_id.c_str (),
+                ior.in ()));
+
+  if (this->orb_manager_.orb ()->_tao_add_to_IOR_table (object_id,
+                                                        bank_servant) != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Simple_Util : Unable to add IOR to table\n"),
+                      -1);
+
+  return 0;
+}
+
+// Initialize the server.
+template <class Servant> int
+Server<Servant>::init (const char *servant_name,
+                       int argc,
+                       char *argv[],
+                       CORBA::Environment &ACE_TRY_ENV)
+{
+  // Call the init of <TAO_ORB_Manager> to initialize the ORB and
+  // create a child POA under the root POA.
+  if (this->orb_manager_.init_child_poa (argc,
+                                         argv,
+                                         "child_poa",
+                                         ACE_TRY_ENV) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "init_child_poa"),
+                      -1);
+
+  ACE_CHECK_RETURN (-1);
+
+  this->argc_ = argc;
+  this->argv_ = argv;
+
+  int retval = this->parse_args ();
+
+  if (retval != 0)
+    return retval;
+
+  CORBA::ORB_var orb = this->orb_manager_.orb ();
+
+  // Stash our ORB pointer for later reference.
+  this->servant_.orb (orb.in ());
+
+  // Activate the servant in its own child POA.
+
+  // Make sure that you check for failures here via the ACE_TRY
+  // macros?!
+  ACE_TRY
+    {
+      CORBA::String_var str  =
+        this->orb_manager_.activate_under_child_poa (servant_name,
+                                                     &this->servant_,
+                                                     ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "The IOR is: <%s>\n",
+                  str.in ()));
+
+      if (this->ins_)
+        if (this->test_for_ins (str) != 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "test_for_ins (): failed\n"),
+                            -1);
+
+      if (this->ior_output_file_)
+        {
+          ACE_OS::fprintf (this->ior_output_file_,
+                           "%s",
+                           str.in ());
+          ACE_OS::fclose (this->ior_output_file_);
+        }
+
+    }
+  ACE_CATCHANY
+    {
+      ACE_TRY_ENV.print_exception ("\tException in activation of POA");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+template <class Servant>int
+Server<Servant>::run (CORBA::Environment &env)
+{
+    // Run the main event loop for the ORB.
+  if (this->orb_manager_.run (env) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Server_i::run"),
+                      -1);
+
+  return 0;
+}
+
+template <class Servant> int
+Server<Servant>::register_name (void)
+{
+  return -1;
+}
+
+// Constructor.
+
+template <class InterfaceObj, class Var>
+Client<InterfaceObj, Var>::Client (void)
+  : ior_ (0)
+{
+  //no-op
+}
+
+// Reads the Server ior from a file
+
+template <class InterfaceObj, class Var> int
+Client<InterfaceObj, Var>::read_ior (char *filename)
+{
+  // Open the file for reading.
+  ACE_HANDLE f_handle = ACE_OS::open (filename, 0);
+
+  if (f_handle == ACE_INVALID_HANDLE)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to open %s for writing: %p\n",
+                       filename),
+                      -1);
+
+  ACE_Read_Buffer ior_buffer (f_handle);
+  char *data = ior_buffer.read ();
+
+  if (data == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to read ior: %p\n"),
+                      -1);
+
+  this->ior_ = ACE_OS::strdup (data);
+  ior_buffer.alloc ()->free (data);
+
+  ACE_OS::close (f_handle);
+
+  return 0;
+}
+
+// Parses the command line arguments and returns an error status.
+
+template <class InterfaceObj, class Var> int
+Client<InterfaceObj, Var>::parse_args (void)
+{
+  ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x");
+  int c = 0;
+  int result = 0;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':  // debug flag
+        TAO_debug_level++;
+        break;
+      case 'k':  // ior provide on command line
+        this->ior_ = ACE_OS::strdup (get_opts.optarg);
+        break;
+      case 'f': // read the IOR from the file.
+        result = this->read_ior (get_opts.optarg);
+        if (result < 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Unable to read ior from %s : %p\n",
+                             get_opts.optarg),
+                            -1);
+        break;
+      case 'x': // read the flag for shutting down
+        this->shutdown_ = 1;
+        break;
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+template <class InterfaceObj, class Var>
+Client<InterfaceObj, Var>::~Client (void)
+{
+  ACE_OS::free (this->ior_);
+}
+
+template <class InterfaceObj, class Var> int
+Client<InterfaceObj, Var>::init (const char *name,
+                                 int argc,
+                                 char **argv)
+{
+  this->argc_ = argc;
+  this->argv_ = argv;
+
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
+    {
+      // Retrieve the ORB.
+      this->orb_ = CORBA::ORB_init (this->argc_,
+                                    this->argv_,
+                                    0,
+                                    ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Parse command line and verify parameters.
+      if (this->parse_args () == -1)
+        return -1;
+
+
+
+      if(this->ior_ != 0)
+        {
+          CORBA::Object_var server_object =
+            this->orb_->string_to_object (this->ior_, ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+
+          if (CORBA::is_nil (server_object.in ()))
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "invalid ior <%s>\n",
+                               this->ior_),
+                              -1);
+          this->server_ = InterfaceObj::_narrow (server_object.in (),
+                                                 ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+      else
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "no ior or naming options  specified\n"),
+                          -1);
+
+
+    }
+  ACE_CATCHANY
+    {
+      ACE_TRY_ENV.print_exception ("Client_i::init");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+
+  return 0;
+}
+
+
+template <class InterfaceObj, class Var> int
+Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &ACE_TRY_ENV)
+{
+
+  return 0;
+}
+
+template <class InterfaceObj, class Var> int
+Client<InterfaceObj, Var>::shutdown (void )
+{
+  // Returns the shutdwon flag
+  return shutdown_;
+}
+
+template <class InterfaceObj, class Var> void
+Client<InterfaceObj, Var>::shutdown (int flag)
+{
+  // Fills the flag
+  shutdown_ = flag;
+}
+
+#endif
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
new file mode 100644
index 00000000000..7620821eff5
--- /dev/null
+++ b/TAO/examples/OBV/Simple_util.h
@@ -0,0 +1,182 @@
+//$Id$
+
+// This version of Simple_Util doesn't need to link against orbsvcs
+// On the other hand it has no naming service.
+
+// ============================================================================
+//
+// = LIBRARY
+//
+//    taken from TAO/tests/Simple
+//
+// = FILENAME
+//    Simple_Util.h
+//
+// = DESCRIPTION
+//    The classe define the templates for the client and server.
+//
+// = AUTHOR
+//   Balachandran Natarajan <bala@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef TAO_UTIL_H
+#define TAO_UTIL_H
+
+#include "tao/TAO.h"
+//#include "orbsvcs/Naming/Naming_Utils.h"
+#include "ace/Get_Opt.h"
+#include "ace/Read_Buffer.h"
+
+template <class Servant>
+class Server
+{
+  // = TITLE
+  //   A set of useful class Templates for using the TAO CORBA
+  //   implementation.
+  //
+  // = DESCRIPTION
+  //   A template server definition. This template can be used by
+  //   single server/client projects for defintion of their
+  //   server/clients.  See the directories time, bank, echo for
+  //   further details of implemenatation.
+public:
+  // = Initialization and termination methods.
+
+  Server (void);
+  // Constructor.
+
+  ~Server (void);
+  // Destructor.
+
+  int init (const char *servant_name,
+            int argc,
+            char *argv[],
+            CORBA::Environment &env);
+  // Initialize the Server state - parsing arguments and waiting.
+  // interface_name is the name used to register the Servant.
+
+  int register_name (void);
+  // After calling <init>, this method will register the server with
+  // the TAO Naming Service using the servant_name passed to <init>.
+
+  int run (CORBA::Environment &env);
+  // Run the orb.
+
+  int test_for_ins (CORBA::String_var ior);
+  // Ignore this method if you are not testing the InterOperable
+  // Naming Service.
+
+protected:
+  Servant servant_;
+  // Servant class
+
+  const char *name;
+  // name of the servant to be used for TAO Naming Service
+
+  int parse_args (void);
+  // Parses the commandline arguments.
+
+  TAO_ORB_Manager orb_manager_;
+  // The ORB manager - a helper class for accessing the POA and
+  // registering objects.
+
+  // TAO_Naming_Server namingServer;
+  // helper class for getting access to Naming Service.
+
+  FILE *ior_output_file_;
+  // File where the IOR of the server object is stored.
+
+  int naming_;
+  // Flag to indicate whether naming service could be used
+
+  char * ins_;
+  // Used test the INS.
+
+  int argc_;
+  // Number of command line arguments.
+
+  char **argv_;
+  // The command line arguments.
+};
+
+template <class InterfaceObj, class Var>
+class Client
+{
+  // = TITLE
+  //   Template Client class
+  //
+  // = DESCRIPTION
+  //   A template client implementation for a single server/client
+  //   model. The example usage of these usage can be found in the
+  //   sub-directories below
+public:
+
+  // = Initialization and termination methods.
+  Client (void);
+  // Constructor.
+
+  ~Client (void);
+  // Destructor.
+
+  int init (const char *name,int argc, char *argv[]);
+  // Initialize the client communication endpoint with server.
+
+  InterfaceObj *operator-> () { return server_.in ();};
+  // Return the interface object pointer.
+
+  int shutdown (void );
+  // Returns the shutdown flag.
+
+  void shutdown (int);
+  // Fills in the shutdwon flag.
+
+  int obtain_initial_references (CORBA::Environment &);
+  // Initialize naming service
+
+protected:
+  int read_ior (char *filename);
+  // Function to read the server IOR from a file.
+
+  int parse_args (void);
+  // Parses the arguments passed on the command line.
+
+//  TAO_Naming_Client namingClient;
+  // helper class for getting access to Naming Service.
+
+  int argc_;
+  // # of arguments on the command line.
+
+  char **argv_;
+  // arguments from command line.
+
+  char *ior_;
+  // IOR of the obj ref of the server.
+
+  char *name_;
+  // Name to be usred for the naming service
+
+  CORBA::Environment env_;
+  // Environment variable.
+
+  Var server_;
+  // Server object
+
+  int naming_;
+  // Flag to use the naming service
+
+  int shutdown_;
+  // Flag for shutting down the server
+
+  CORBA::ORB_var orb_;
+  // Remember our orb.
+};
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Simple_util.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation "Simple_util.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#endif /* TAO_UTIL_H */
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
new file mode 100644
index 00000000000..45eed87883d
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -0,0 +1,124 @@
+//$Id$
+
+#include "Client_i.h"
+#include "Event_Types_impl.h"
+#include "ace/Get_Opt.h"
+
+
+int
+Checkpoint_Client_i::run (char *name,
+                    int argc,
+                    char *argv[])
+{
+  // Initialize the client (read ior...).
+  if (checkpoint.init (name,argc, argv) == -1)
+    return -1;
+
+  // Set random seed
+  ACE_Time_Value now (ACE_OS::gettimeofday ());
+  ACE_OS::srand ((unsigned int) now.sec () );
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
+    {
+      // Make factories to unmarshal OBV, when getting back a list
+      // of events which raised an alarm condition.
+
+      // TAO_OBV_REGISTER_FACTORY (Event_factory);
+      // This one not (see header file)
+
+      TAO_OBV_REGISTER_FACTORY (Temperature_factory);
+      TAO_OBV_REGISTER_FACTORY (Position_factory);
+      TAO_OBV_REGISTER_FACTORY (Log_Msg_factory);
+      TAO_OBV_REGISTER_FACTORY (Event_List_factory);
+      TAO_OBV_REGISTER_FACTORY (Event_List_Link_factory);
+
+      ACE_DEBUG ((LM_DEBUG, "Send some random events:\n"));
+
+      double temperature = random_number (29,34);
+      Temperature_var t_e (new Temperature_impl (temperature));
+      t_e->origin_id_ (KITCHEN);
+      t_e->do_print ();
+      checkpoint->put_event (t_e, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      temperature = random_number (25,30);
+      t_e = new Temperature_impl (temperature);
+      t_e->origin_id_ (BATHROOM);
+      t_e->do_print ();
+      checkpoint->put_event (t_e, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Point point = { random_number (0,4),
+                      random_number (0,4),
+                      random_number (0,4)  };
+      Position_var p_e (new Position_impl (point));
+      p_e->origin_id_ (JONAS);
+      p_e->do_print ();
+      checkpoint->put_event (p_e, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+
+      int urgent = (random_number (0,2) > 1) ? 1 : 0;
+      const char *a_text = (random_number (0,2) > 1) ? "Coffee is cold."
+                                                     : "I want pasta.";
+      Log_Msg_var l_e (new Log_Msg_impl (urgent, a_text));
+      l_e->origin_id_ (JONAS);
+      l_e->do_print ();
+      checkpoint->put_event (l_e, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+
+      ACE_DEBUG ((LM_DEBUG, "\nNow getting the alarms:\n"));
+
+      Event_List_var list (checkpoint->get_critical_events (ACE_TRY_ENV));
+      ACE_TRY_CHECK;
+
+      for (Event_List_Iterator i (list); i.next (); i.advance ())
+        {
+          i.next ()-> do_print ();
+        }
+
+      if (checkpoint.shutdown () == 1)
+        checkpoint->shutdown (ACE_TRY_ENV);
+
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\n Exception in RMI");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
+
+  return 0;
+}
+
+// Constructor.
+Checkpoint_Client_i::Checkpoint_Client_i (void)
+{
+  //no-op
+}
+
+//Destructor.
+Checkpoint_Client_i::~Checkpoint_Client_i (void)
+{
+  //no-op
+}
+
+
+// A random number in the range of min to max.
+double random_number (double min, double max)
+{
+  double range = max - min;
+  return (min + (range * ACE_OS::rand () / (RAND_MAX + 1.0)));
+}
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class Client<Checkpoint,Checkpoint_var>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate Client<Checkpoint,Checkpoint_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.h b/TAO/examples/OBV/Typed_Events/Client_i.h
new file mode 100644
index 00000000000..222c1ff5708
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/Client_i.h
@@ -0,0 +1,58 @@
+// -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/examples/OBV/Typed_Events
+//
+// = FILENAME
+//    Client_i.h
+//
+// = DESCRIPTION
+//    This class is a template for a CORBA client.
+//    run () sends some valuetypes to a server and
+//    gets back a list of valuetypes.
+//
+// = AUTHOR
+//
+//   Torsten Kuepper
+//   based on the echo example
+//   from code from Balachandran Natarajan <bala@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef ECHO_CLIENT_I_H
+#define ECHO_CLIENT_I_H
+
+#include "../Simple_util.h"
+#include "Event_TypesC.h"
+
+double random_number (double min, double max);
+
+class Checkpoint_Client_i
+{
+  // = TITLE
+  //   Checkpoint_Client interface subclass.
+  //
+  // = DESCRIPTION
+  //   This class implements the interface between the interface
+  //   objects and the client .
+public:
+  // = Initialization and termination methods.
+  Checkpoint_Client_i (void);
+  // Constructor
+
+  virtual  ~Checkpoint_Client_i (void);
+  // Destructor
+
+  virtual int run (char *,int, char** );
+  // Execute the methods
+
+private:
+  Client<Checkpoint, Checkpoint_var> checkpoint;
+  // Instantiate the checkpoint object.
+};
+
+
+#endif /* TIME_CLIENT_I_H */
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types.idl b/TAO/examples/OBV/Typed_Events/Event_Types.idl
new file mode 100644
index 00000000000..40c167d1250
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/Event_Types.idl
@@ -0,0 +1,245 @@
+// Event_Types.idl
+// Simple demonstration of typed events in a distributed system.
+//
+// Author:
+//   Torsten Kuepper
+//
+
+// $Id$
+
+// Event inheritance hierarchy  ===========================
+
+// Base class  --------------------------------------------
+
+valuetype Event
+{
+  void do_print ();
+
+  // An operation. In some implementations (e.g. operator terminal)
+  // the event should visualize itself. That is of no use at the
+  // event producing sensor. So, the declaration of do_print ()
+  // could be deferred to the implementation classes, but then you need
+  // to downcast from the pointer to the event valuetype to your
+  // implementation. Another solution is perhaps to inherit do_print ()
+  // through an additional abstract valuetype base only in that
+  // IDL that a visualizing implementation sees. But this would change
+  // the type and this is a bad thing. The cleanest thing to do may be
+  // to apply the visitor pattern. Event::accept (visitor) would be
+  // implemented as null-op in the measurement device, if you take this
+  // example.
+
+
+  public long time_;
+
+  // A state member. Don't confuse with attributes, which are
+  // ok here too, but they do only map to a pair of local operations,
+  // in opposite to (public/private) state members they haven't got no
+  // implementation for the state data and finally they are not transmitted
+  // over the wire.
+
+
+  public unsigned long origin_id_;
+
+  // This id should identify the origin (e.g. sensor) in the system.
+  // This makes an id-space beside the object references which has to be
+  // maintained. It would be useful to implement some consistency check
+  // protocol (as CORBA interfaces) to verify that the suppliers and
+  // consumers are connected (through some event channel) in the
+  // right way.
+
+};
+
+
+// Derived Events  ----------------------------------------
+
+
+valuetype Temperature : Event
+{
+  // do_print () is overridden in the implementation. We can't
+  // tell this in IDL, because operations can't be declared again.
+  // They are implicit assumed to be polymorph.
+
+  public float temperature_;
+  // Extends Event with the state member for the temperature.
+};
+
+
+typedef float Point[3];
+// (anonymous arrays are not yet working in this OBV ...%!)
+// (( BTW %! <- no emoticon, this is my to do mark))
+
+valuetype Position : Event
+{
+  attribute float x, y, z;
+  // The Position can be accessed both through the coordinates ...
+
+  public Point xyz;
+  // ... or as a whole array, which is a state member.
+};
+
+
+valuetype Log_Msg : Event
+{
+  public short  urgency;
+  public string message;
+};
+
+// (Valuetypes which hold other types as shown are not yet tested %!)
+
+// You may extend the system with aggregated events, such the status
+// message of a boiler, which has temperature and a pressure valuetype
+// as state member (recall: unshared valuetypes are well at this time.
+// But a shared valuetype splits at the receiving end of an invocation
+// in two or more instances, dependend on the number of references on it
+// (in the argument list plus in the members of compound types). This
+// misbehaviour will go away once valuetype sharing is implemented %!
+// But to do this in an efficient and thread safe manner seems a little tricky)
+
+
+// Passing back the critical events in a list  ----------------------------
+
+// This is the link, that is used internally -----
+// (should come after Event_List, but forward decl. is not yet complete %!)
+
+valuetype Event_List_Link
+{
+  Event get_event ();
+  // get the event
+
+  Event_List_Link get_next_link ();
+  // get the event
+
+  void attach_next_link (in Event_List_Link chain);
+  // Link a chain at the end.
+
+  private Event my_event;
+  // event which is held
+
+  private Event_List_Link next;
+  // link to the next event container
+};
+
+// 'private' state member are mapped to 'protected' in C++, so
+// they can be accessed from the implementation class, which should
+// be derived from OBV_Event_chain.
+
+
+// The event list uses links as declared above. But its implementation
+// could be changed 'under the hood' to use e.g. a CORBA sequence.
+// (This doesn't go yet, because valuetype is only allowed
+// as an operation argument for now. Just impl. the visitors in tao_idl %!)
+
+valuetype Event_List
+{
+  void store_event (in Event e);
+  // Attach an event at the lists's end.
+
+  public Event_List_Link first_link;
+  // Should better be private, but then the iterator can't access it.
+};
+
+
+// Interface to access the "event server" ------------------
+
+// A client (e.g. sensor) delivers the events via put_event ().
+// The server checks against alarm conditions and memorizes
+// critical events, which can be passed back
+// to a client (e.g. operator terminal) with get_critical_events ().
+
+interface Checkpoint
+{
+  void  put_event (in Event e);
+  // Put event in the server. If it exceeds an alarm criterion
+  // it will be stored.
+
+  Event_List  get_critical_events ();
+  // Ask for a list of critical events.
+
+  oneway void shutdown ();
+  // This operation will shutdown the server.
+};
+
+
+// Checkpoint server side --------------------------------------------
+// The Checkpoint should compare the incoming event against a
+// criterion for the specific event type. My approach is the following
+// (to facilitate separation of application logic and event specific
+// code): An abstract valuetype Criterion provides is_critical () to check
+// against a boundary. Concrete alarm boundaries for any existing
+// event derive from this class and perform the check. Thats's it for
+// the event type maintainer --- the customs that use this 'framework'.
+
+// The concrete criterions inherit from Event too. I wanted to reuse
+// the list which works on events. The wrapper Criterion_List makes it safe
+// that only criterions are accepted to this list. Templates would be fine,
+// but currently I have no idea how to apply them to a valuetype. Perhaps
+// there is no way to get around custom marshalling [n.y.avail.%!] in the
+// area of containers.
+// Finally the concrete criterions must have a suitable implementation for
+// is_critical ().
+
+// Now the internals of the server which shouldn't need to be touched by
+// the final implementer: The above mentioned wrapper Criterion_List
+// uses an Event_List to compare an incoming event against the
+// boundaries. In this simple example it will just apply the event to
+// is_critical () of any criterion, which origin id matches.
+// The criterion checks with
+// valuetype's _downcast () if the event matches its event type and then
+// performs the alarm check. A real world approach with many event types
+// and criterions could better use a hash map for the criterions. The
+// external map index would be the repository id of the event.
+
+abstract valuetype Criterion
+{
+  boolean is_critical (in Event e);
+  // Check against alarm boundaries.
+};
+
+
+// The specialized criterions. Note: A valuetype can only inherit
+// from one non-abstract other valuetype (which then must be the first
+// one listed). Further Criterions may only be abstract valuetypes
+// without the ability to contain state members. (The support of
+// a CORBA interface is not yet supported.)
+// P.S. Please don't bother about the class hierarchy
+// (Criterion inherits from Event _and_ has some Events as boundary values
+// aggregated). I just wanted to reuse the code for the list of events.
+// Certainly not an example of good OO design.
+
+
+valuetype Temperature_Criterion : Event, Criterion
+{
+  private Temperature meltingpoint;
+  // The boundary is stored in a state member.
+};
+
+
+valuetype Position_Criterion : Event, Criterion
+{
+  private Position leftbottom, topright;
+  // Any position should be contained in a box.
+};
+
+
+valuetype Log_Msg_Criterion : Event, Criterion
+{
+  // No state member. All Log_Msg which have urgency
+  // greater zero meet the criterion.
+};
+
+
+
+// The Criterion_List  ===========================================
+
+valuetype Criterion_List
+{
+  void store_criterion (in Criterion c);
+  // Attach an criterion at the lists's end.
+
+  boolean is_critical (in Event e);
+  // Check with the listmembers if e should raise an alarm.
+
+  public Event_List my_list;
+  // Used in the implementation. Is public for allowing
+  // access to the iterator.
+};
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
new file mode 100644
index 00000000000..0ded41de8ed
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -0,0 +1,595 @@
+// $Id$
+
+#include "Event_Types_impl.h"
+
+// Implementation of the valuetype member functions.
+
+Event_impl::Event_impl ()
+  // initializers (': foo ()') don't work for OBV state members
+  // since we should only access the state through modifier functions
+{
+  // Put a timestamp on event's birth.
+  ACE_Time_Value now (ACE_OS::gettimeofday ());
+  this->time_ (now.sec ());
+}
+
+Event_impl::~Event_impl ()
+{
+}
+
+void
+Event_impl::do_print (void)
+{
+  ACE_DEBUG((LM_DEBUG, "(time %d origin %d)  ",
+             (CORBA::ULong) this->time_(), (CORBA::ULong) this->origin_id_() ));
+}
+
+
+/* Not defined, see header
+Event_factory::~Event_factory ()
+{
+}
+
+TAO_OBV_CREATE_RETURN_TYPE (Event)
+Event_factory::create_for_unmarshal ()
+{
+  return new Event_impl;
+}
+*/
+
+// Temperature implementation  ===================================
+
+Temperature_impl::Temperature_impl ()
+{
+}
+
+Temperature_impl::Temperature_impl (CORBA::Float temp)
+{
+  this->temperature_ (temp);
+}
+
+Temperature_impl::~Temperature_impl ()
+{
+}
+
+void
+Temperature_impl::do_print (void)
+{
+  Event_impl::do_print ();
+  // The timestamp
+
+  ACE_DEBUG((LM_DEBUG, "Temperature is %f\n", this->temperature_() ));
+}
+
+Temperature_factory::~Temperature_factory ()
+{
+}
+
+TAO_OBV_CREATE_RETURN_TYPE (Temperature)
+Temperature_factory::create_for_unmarshal ()
+{
+  return new Temperature_impl;
+}
+
+
+// Position implementation  ======================================
+
+Position_impl::Position_impl ()
+{
+}
+
+Position_impl::Position_impl (Point &p)
+{
+  this->xyz (p);
+  // Does a copy of the p array
+}
+
+Position_impl::~Position_impl ()
+{
+}
+
+void
+Position_impl::do_print (void)
+{
+  Event_impl::do_print ();
+  // The timestamp
+
+  ACE_DEBUG((LM_DEBUG, "Position is (%f, %f, %f)\n",
+             this->x(), this->y(), this->z() ));
+}
+
+CORBA::Float Position_impl::x ()  { return this->xyz()[0]; }
+void Position_impl::x (CORBA::Float x)   { this->xyz()[0] = x; }
+CORBA::Float Position_impl::y ()  { return this->xyz()[1]; }
+void Position_impl::y (CORBA::Float y)   { this->xyz()[1] = y; }
+CORBA::Float Position_impl::z ()  { return this->xyz()[2]; }
+void Position_impl::z (CORBA::Float z)   { this->xyz()[2] = z; }
+
+
+Position_factory::~Position_factory ()
+{
+}
+
+TAO_OBV_CREATE_RETURN_TYPE (Position)
+Position_factory::create_for_unmarshal ()
+{
+  return new Position_impl;
+}
+
+
+// Log_Msg implementation  ===================================
+
+Log_Msg_impl::Log_Msg_impl ()
+{
+}
+
+Log_Msg_impl::Log_Msg_impl (CORBA::Short u, const char *m)
+{
+  this->urgency (u);
+  this->message (CORBA::string_dup (m));
+}
+
+Log_Msg_impl::~Log_Msg_impl ()
+{
+}
+
+void
+Log_Msg_impl::do_print (void)
+{
+  Event_impl::do_print ();
+  // The timestamp
+
+  if (this->urgency () > 0)
+    {
+      ACE_DEBUG((LM_DEBUG, "**** %s ****\n", this->message () ));
+    }
+  else
+    {
+      ACE_DEBUG((LM_DEBUG, "%s\n", this->message () ));
+    }
+}
+
+Log_Msg_factory::~Log_Msg_factory ()
+{
+}
+
+TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)
+Log_Msg_factory::create_for_unmarshal ()
+{
+  return new Log_Msg_impl;
+}
+
+
+
+// Event_List_Link implementation  ===================================
+
+Event_List_Link_impl::Event_List_Link_impl ()
+{
+  this->my_event (0);
+  this->next (0);
+}
+
+Event_List_Link_impl::Event_List_Link_impl (Event* e)
+{
+  this->my_event (e);
+  // Note that the modifier increases the reference counter of e.
+
+  this->next (0);
+}
+
+Event_List_Link_impl::~Event_List_Link_impl ()
+{
+  // Destructor does nothing explicit, because my_event and next are
+  // _var types, which destroy (decrement the reference counter of)
+  // the held event resp. the next links.
+}
+
+Event*
+Event_List_Link_impl::get_event (void)
+{
+  return this->my_event ();
+}
+
+Event_List_Link*
+Event_List_Link_impl::get_next_link (void)
+{
+  return this->next ();
+}
+
+void
+Event_List_Link_impl::attach_next_link (Event_List_Link *n)
+{
+  this->next (n);
+}
+
+Event_List_Link_factory::~Event_List_Link_factory ()
+{
+}
+
+TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)
+Event_List_Link_factory::create_for_unmarshal ()
+{
+  return new Event_List_Link_impl;
+}
+
+
+// Event_List implementation  ===================================
+
+Event_List_impl::Event_List_impl ()
+{
+  this->first_link (0);
+  last_link_cache_ = 0;
+}
+
+Event_List_impl::~Event_List_impl ()
+{
+  // Destructor does nothing explicit, because the _var types do care.
+}
+
+void
+Event_List_impl::store_event (Event* e)
+{
+  // This operation should perform atomically and should
+  // guard against the access to the list from another thread.
+  // But this is omitted in this example.
+
+   Event_List_Link_var new_link (new Event_List_Link_impl (e));
+
+   // We need a new link to store the reference to the event e.
+   // But if we'd had assigned the newly created instance directly through
+   // a modifier function to a valuetype member, it would never be released.
+   // From pointer to _var the reference count of the pointed to never
+   // increased, but the modifier does.
+
+
+  if (last_link_cache_ == 0)
+    {
+      // Search the end.
+      for (Event_List_Link *i = this->first_link ();
+           i != 0;
+           i = i->get_next_link ())
+        {
+          last_link_cache_ = i;
+        }
+    }
+
+
+  // If still null then the list is empty.
+  if (last_link_cache_ == 0)
+    {
+      this->first_link (new_link);
+    }
+  else
+    {
+      last_link_cache_->attach_next_link (new_link);
+      last_link_cache_ = new_link;
+    }
+}
+
+Event_List_factory::~Event_List_factory ()
+{
+}
+
+TAO_OBV_CREATE_RETURN_TYPE (Event_List)
+Event_List_factory::create_for_unmarshal ()
+{
+  return new Event_List_impl;
+}
+
+
+Event_List_Iterator::Event_List_Iterator (Event_List *list)
+{
+  this->init (list);
+}
+
+Event_List_Iterator::Event_List_Iterator ()
+{
+  // current_ is a _var and set itself to null.
+}
+
+Event_List_Iterator::~Event_List_Iterator ()
+{
+  // nothing
+}
+
+
+void
+Event_List_Iterator::init (Event_List *list)
+{
+  Event_List_Link *tmp = list->first_link ();
+  CORBA::add_ref (tmp);
+  current_ = tmp;
+}
+
+
+CORBA::Boolean
+Event_List_Iterator::next (Event_var &next)
+{
+  if (current_)
+    {
+      Event *e = current_->get_event ();
+      CORBA::add_ref (e);
+      next = e;
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+Event *
+Event_List_Iterator::next ()
+{
+  if (current_)
+    {
+      return current_->get_event ();
+    }
+  return 0;
+}
+
+void
+Event_List_Iterator::advance ()
+{
+  if (current_)
+    {
+      Event_List_Link *tmp = current_->get_next_link ();
+      CORBA::add_ref (tmp);
+      current_ = tmp;
+    }
+}
+
+
+
+// Checkpoint server side --------------------------------------------
+
+
+// Criterion classes implementation ----------------------------------
+
+
+
+Temperature_Criterion_impl::Temperature_Criterion_impl ()
+{
+}
+
+Temperature_Criterion_impl::
+Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp)
+{
+  this->origin_id_ (origin_id);
+  Temperature_var tmp (new Temperature_impl (temp));
+  this->meltingpoint (tmp.in ());
+}
+
+Temperature_Criterion_impl::~Temperature_Criterion_impl ()
+{
+}
+
+
+CORBA::Boolean
+Temperature_Criterion_impl::is_critical (Event* e)
+{
+  // Downcast to a temperature.
+  Temperature* t = Temperature::_downcast (e);
+  // Is Event really a Temperature ?
+  if (t)
+    {
+      // Now return the comparison with the meltingpoint.
+      return
+        (t->temperature_ () > this->meltingpoint ()->temperature_ ()) ?
+        1 : 0;
+    }
+  return 0;
+}
+
+
+void
+Temperature_Criterion_impl::do_print (void)
+{
+  ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n",
+             this->origin_id_ () ));
+  this->meltingpoint ()->do_print();
+}
+
+
+Temperature_Criterion_factory::~Temperature_Criterion_factory ()
+{
+}
+
+TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion)
+Temperature_Criterion_factory::create_for_unmarshal ()
+{
+  return new Temperature_Criterion_impl;
+}
+
+
+
+Position_Criterion_impl::Position_Criterion_impl ()
+{
+}
+
+Position_Criterion_impl::Position_Criterion_impl (CORBA::ULong origin_id,
+                                                  Position *lb,
+                                                  Position *tr)
+{
+  this->origin_id_ (origin_id);
+  this->leftbottom(lb);
+  this->topright(tr);
+}
+
+Position_Criterion_impl::~Position_Criterion_impl ()
+{
+}
+
+
+CORBA::Boolean
+Position_Criterion_impl::is_critical (Event* e)
+{
+  Position* p = Position::_downcast (e);
+  // Is Event really a Position ?
+  if (p)
+    {
+      // If the position of p is out of the box return true.
+      return (
+              (p->x () > this->leftbottom ()->x ()) &&
+              (p->y () > this->leftbottom ()->y ()) &&
+              (p->z () > this->leftbottom ()->z ()) &&
+              (p->x () < this->topright ()->x ()) &&
+              (p->y () < this->topright ()->y ()) &&
+              (p->z () < this->topright ()->z ())
+              ) ? 0 : 1;
+    }
+  return 0;
+}
+
+
+void
+Position_Criterion_impl::do_print (void)
+{
+  ACE_DEBUG((LM_DEBUG,
+             "Alarm boundary for events with origin id %d is the box\n",
+             this->origin_id_ () ));
+  this->leftbottom ()->do_print();
+  this->topright ()->do_print();
+}
+
+Position_Criterion_factory::~Position_Criterion_factory ()
+{
+}
+
+TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)
+Position_Criterion_factory::create_for_unmarshal ()
+{
+  return new Position_Criterion_impl;
+}
+
+
+
+Log_Msg_Criterion_impl::Log_Msg_Criterion_impl ()
+{
+}
+
+
+Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl ()
+{
+}
+
+
+CORBA::Boolean
+Log_Msg_Criterion_impl::is_critical (Event* e)
+{
+  Log_Msg* lm = Log_Msg::_downcast (e);
+
+  // Is Event really a Log_Msg ?
+  if (lm)
+    {
+      return (lm->urgency () ? 1 : 0);
+    }
+  return 0;
+}
+
+
+void
+Log_Msg_Criterion_impl::do_print (void)
+{
+  ACE_DEBUG((LM_DEBUG,
+             "All log messages with urgency greater zero are registered.\n" ));
+}
+
+Log_Msg_Criterion_factory::~Log_Msg_Criterion_factory ()
+{
+}
+
+TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)
+Log_Msg_Criterion_factory::create_for_unmarshal ()
+{
+  return new Log_Msg_Criterion_impl;
+}
+
+
+
+Criterion_List_impl::Criterion_List_impl ()
+{
+  this->my_list (0);
+  // We don't want create our list member here, because this constructor
+  // is called before unmarshalling too. We cant't distinguish that.
+  // If we transmit this type eventually. This is not done in this example.
+  // (That is no weakness of OBV since the instance should be created and
+  // initialized through the factory create (),
+  // which is not yet implemented %!)
+}
+
+Criterion_List_impl::~Criterion_List_impl ()
+{
+}
+
+void
+Criterion_List_impl::store_criterion (Criterion *c)
+{
+  if (!my_list ())
+    {
+      Event_List_var ev(new Event_List_impl);
+      my_list (ev);
+    }
+
+  Event *e = Event::_downcast (c);
+  my_list ()->store_event (e);
+}
+
+CORBA::Boolean
+Criterion_List_impl::is_critical (Event *e)
+{
+  // Try all criterions. Walking the list is efficient enough for
+  // demonstration.
+
+  for (Criterion_List_Iterator i (this); i.next (); i.advance ())
+    {
+      Criterion *c = i.next ();
+
+      // Let e_c point to the Event part of the Criterion.
+      // We know that c has an Event part.
+      Event *e_c = Event::_downcast (c);
+
+
+      // A criterion is applied if the origin id is matching the event.
+      // A null id flags that it should be applied to all events.
+
+      if (e->origin_id_() == e_c->origin_id_ () ||
+          e_c->origin_id_ () == 0)
+        {
+          if (c->is_critical (e))
+            return 1;
+        }
+    }
+  return 0;
+}
+
+
+Criterion_List_Iterator::Criterion_List_Iterator (Criterion_List *list)
+{
+  this->init (list);
+}
+
+Criterion_List_Iterator::~Criterion_List_Iterator ()
+{
+  // nothing
+}
+
+
+void
+Criterion_List_Iterator::init (Criterion_List *list)
+{
+  iterator_.init (list->my_list());
+}
+
+
+Criterion *
+Criterion_List_Iterator::next ()
+{
+  return (Criterion::_downcast (iterator_.next ()));
+}
+
+void
+Criterion_List_Iterator::advance ()
+{
+  return (iterator_.advance ());
+}
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
new file mode 100644
index 00000000000..7ec51fb8ac3
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -0,0 +1,415 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Event_TypesC.h"
+
+// Event hierarchy implementation classes ======================
+
+// The implementation of a valuetype in C++ needs to derive from
+// the IDL generated OBV_Event, which provides the data members
+// and their accessor/modifier.
+// In TAO it is possible to have inline instead the standard virtual
+// accessor/modifier functions. But then they can't be overridden for
+// marshalling. (doesn't yet work anyway but will come soon %!).
+//
+// The 'client' of a valuetype (client means here the parts
+// of an application which locally access the valuetype through its interface)
+// uses pointer to the 'Event' class, or better the Event_var type
+// which is similar an object reference _var.
+//
+// Specs say that the instances of Event_impl should be created by means
+// of Event_init::create (), which are equivalents to the init () operations
+// in the IDL of the valuetype --- its not yet impl. and will come later on %!
+// Today you have to declare your own create () member.
+//
+// One more step to make (far way from Event to Event_impl, isn't it?):
+// We must mix in a class to have a reference counter implementation
+// (: Sit down and type twenty times CORBA::DefaultValueRefCountBase :)
+// A plus is its on your hand to choose possibly a reference counter
+// with (like the standard supplied one) or without lock. But I hate
+// the fact that reference counting is based on virtual _add_ref ()/
+// _remove_ref () functions, which may cause substantial overhead.
+// I'm thinking of a TAO option to let tao_idl mix in the reference counter
+// previous and generate _var classes which access inline functions.
+// ... And I wonder how the OMG want to manage cyclic graphs with
+// reference counting.
+
+class Event_impl : public virtual OBV_Event,
+                   public virtual CORBA::DefaultValueRefCountBase
+{
+ public:
+  Event_impl ();
+  virtual ~Event_impl ();
+
+  virtual void do_print (void);
+  // Implementation of the do_print () operation the valuetype should have.
+  // All operations in valuetypes are virtual.
+
+  // The state member for the event time is yet implemented in OBV_Event
+  // (or in the Event class, if -Wb,obv_opt_accessor is given to tao_idl).
+};
+
+// An instance of the Event_factory class has to be registered
+// in the ORB with ORB::register_value_factory ().
+
+// Then the unmarshal engine can obtain a fresh instance of Event_impl
+// from the (user implemented) Event_factory::create_for_unmarshal ()
+// function. These should return a pointer to Event, but as long as
+// covariant return types are not commonly supported one has to
+// return a pointer to CORBA::ValueBase. This option handles the macro
+// in front of the create_for_unmarshal () declaration. Now the code
+// is compiler portable, but not ORB vendor portable ...
+
+// ... but stop a moment. We don't want an instance of Event.
+// It is only the base class for Temperature, Position and Log_Msg.
+// We didn't declared Event as abstract valuetype, cause we want to
+// store the timestamp in it. So we express that no instance can
+// exists while we don't make a factory for it (and don't register one).
+
+#ifdef is_certainly_not_defined
+class Event_factory : public Event_init
+{
+ public:
+
+  // create (...) would go here
+private:
+  virtual ~Event_factory ();
+  TAO_OBV_CREATE_RETURN_TYPE (Event)  create_for_unmarshal ();
+};
+#endif /* is not defined */
+
+
+// The procedure to register your instance is currently not much like
+// OBV specs says. This implementation has currently one
+// process-wide map for the registered factories. The specs want one
+// per ORB. To run first OBV tests, and that is what we do yet, it is
+// more practicable to have simply just one map. (%!)
+// Further on it is non-standard how the repository id of the valuetype
+// is obtained. Look at the macro TAO_OBV_REGISTER_FACTORY(your_factory_type)
+// in tao/ValueFactory.h (explained there) how it is done or just use it
+// for first experiments.
+// Exceptions are not yet implemented in this area.
+
+
+// Temperature implementation classes ===================================
+
+// The Temperature_impl should inherit its own OBV_Temperature and
+// the implementation of Event. (so-called ladder style implementation
+// inheritance, I guess.) Its yet there, but purists
+// can additionally inherit public virtual from the CORBA::DefaultVal...
+
+
+class Temperature_impl : public virtual OBV_Temperature,
+                         public virtual Event_impl
+{
+public:
+  Temperature_impl ();
+  // Constructor for the factory
+
+  Temperature_impl (CORBA::Float temp);
+  // Constructor, should regularly be a factory create () method.
+  // But it is more simple to do so here.
+
+  virtual ~Temperature_impl ();
+
+  virtual void do_print (void);
+  // Overrides Event_impl::do_print (). Note that a new declaration
+  // in IDL in a derived class is not allowed.
+};
+
+class Temperature_factory : public Temperature_init
+{
+  friend Temperature;
+ public:
+  // create (...) would go here
+private:
+  virtual ~Temperature_factory ();
+  TAO_OBV_CREATE_RETURN_TYPE (Temperature)  create_for_unmarshal ();
+};
+
+
+// Position implementation classes =====================================
+
+class Position_impl : public virtual OBV_Position,
+                      public virtual Event_impl
+{
+public:
+  Position_impl ();
+  Position_impl (Point &p);
+  virtual ~Position_impl ();
+
+  virtual CORBA::Float x ();
+  virtual void x (CORBA::Float);
+  virtual CORBA::Float y ();
+  virtual void y (CORBA::Float);
+  virtual CORBA::Float z ();
+  virtual void z (CORBA::Float);
+  //These are the attributes
+
+  virtual void do_print (void);
+};
+
+class Position_factory : public Position_init
+{
+  friend Position;
+ public:
+
+  // create (...) would go here
+private:
+  virtual ~Position_factory ();
+  TAO_OBV_CREATE_RETURN_TYPE (Position)  create_for_unmarshal ();
+};
+
+
+// Log_Msg implementation classes =====================================
+
+class Log_Msg_impl : public virtual OBV_Log_Msg,
+                     public virtual Event_impl
+{
+public:
+  Log_Msg_impl ();
+  Log_Msg_impl (CORBA::Short urgency_p, const char *message_p);
+  virtual ~Log_Msg_impl ();
+
+  virtual void do_print (void);
+};
+
+class Log_Msg_factory : public Log_Msg_init
+{
+  friend Log_Msg;
+ public:
+
+  // create (...) would go here
+private:
+  virtual ~Log_Msg_factory ();
+  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)  create_for_unmarshal ();
+};
+
+
+// Event_List_Link implementation classes =====================================
+
+class Event_List_Link_factory;
+class Event_List_Iterator;
+
+class Event_List_Link_impl : public virtual OBV_Event_List_Link,
+                         public virtual CORBA::DefaultValueRefCountBase
+{
+  friend class Event_List_Link_factory;
+  friend class Event_List;
+  friend class Event_List_Iterator;
+
+ public:
+  Event_List_Link_impl ();
+  Event_List_Link_impl (Event *e);
+  virtual ~Event_List_Link_impl ();
+
+  Event *get_event (void);
+
+ private:
+  Event_List_Link *get_next_link (void);
+
+  void attach_next_link (Event_List_Link * chain);
+  // Attach a chain at the end.
+};
+
+
+class Event_List_Link_factory : public Event_List_Link_init
+{
+  friend Event_List_Link;
+ private:
+  virtual ~Event_List_Link_factory ();
+  TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)  create_for_unmarshal ();
+};
+
+
+// The event list itself.   ----------------------------------
+
+class Event_List_impl : public virtual OBV_Event_List,
+                        public virtual CORBA::DefaultValueRefCountBase
+{
+  friend Event_List_Iterator;
+ public:
+  Event_List_impl ();
+  virtual ~Event_List_impl ();
+
+  void store_event (Event* e);
+
+  Event_List_Link *get_first_link();
+  // The iterator needs it.
+
+ private:
+  Event_List_Link *last_link_cache_;
+  // For fast attachment. Need not to be a _var cause we hold at least one
+  // reference through my_first_event_list_link which is a state member and
+  // is mapped to a _var.
+
+  // And it isn't a state member of valuetype.
+  // Currently we can't yet do this, because sharing of valuetypes is not
+  // yet impl ...%!.
+  // Without the availability to share we would get two different instances
+  // of the last list link at the receiving end of an invocation.
+};
+
+
+class Event_List_factory : public Event_List_init
+{
+  friend Event_List;
+ private:
+  virtual ~Event_List_factory ();
+  TAO_OBV_CREATE_RETURN_TYPE (Event_List)  create_for_unmarshal ();
+};
+
+
+class Event_List_Iterator
+{
+ public:
+  Event_List_Iterator (void);
+  Event_List_Iterator (Event_List *list);
+  // Construct it to point to the first list link.
+
+  virtual ~Event_List_Iterator ();
+
+  void init (Event_List *list);
+
+  Event *next ();
+  // Get pointer to the current event.
+
+  CORBA::Boolean next (Event_var &event);
+  // Sets the Event_var argument to the current event.
+  // This forces proper memory management in the user code, as the Event_var
+  // could be stored beyond the life time of the iterator.
+
+  void advance ();
+  // Walks one event ahead.
+
+ private:
+  Event_List_Link_var current_;
+};
+
+
+// Checkpoint server side --------------------------------------------
+
+
+// Criterion classes -------------------------------------------------
+
+
+// Criterion itself has no implementation since it is abstract.
+
+// It is necessary to inherit from OBV_Event (or an Event implementation)
+// for implementing the state members of Event.
+
+
+class Temperature_Criterion_impl :
+                           public virtual OBV_Temperature_Criterion,
+                           public virtual OBV_Event,
+                           public virtual CORBA::DefaultValueRefCountBase
+{
+public:
+  Temperature_Criterion_impl ();
+  Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp);
+
+  virtual ~Temperature_Criterion_impl ();
+
+  CORBA::Boolean is_critical (Event* e);
+  virtual void do_print (void);
+};
+
+class Temperature_Criterion_factory : public Temperature_Criterion_init
+{
+  friend Temperature;
+private:
+  virtual ~Temperature_Criterion_factory ();
+  TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal ();
+};
+
+
+
+class Position_Criterion_impl :
+                            public virtual OBV_Position_Criterion,
+                            public virtual OBV_Event,
+                            public virtual CORBA::DefaultValueRefCountBase
+{
+public:
+  Position_Criterion_impl ();
+  Position_Criterion_impl (CORBA::ULong origin_id,
+                           Position *lb,
+                           Position *tr);
+  virtual ~Position_Criterion_impl ();
+
+  CORBA::Boolean is_critical (Event* e);
+  virtual void do_print (void);
+};
+
+class Position_Criterion_factory : public Position_Criterion_init
+{
+  friend Position;
+private:
+  virtual ~Position_Criterion_factory ();
+  TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)  create_for_unmarshal ();
+};
+
+
+
+class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion,
+                               public virtual OBV_Event,
+                               public virtual CORBA::DefaultValueRefCountBase
+{
+public:
+  Log_Msg_Criterion_impl ();
+  virtual ~Log_Msg_Criterion_impl ();
+
+  CORBA::Boolean is_critical (Event* e);
+  virtual void do_print (void);
+};
+
+class Log_Msg_Criterion_factory : public Log_Msg_Criterion_init
+{
+  friend Log_Msg;
+private:
+  virtual ~Log_Msg_Criterion_factory ();
+  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)  create_for_unmarshal ();
+};
+
+
+class Criterion_List_impl : public virtual OBV_Criterion_List,
+                        public virtual CORBA::DefaultValueRefCountBase
+{
+ public:
+  Criterion_List_impl ();
+  virtual ~Criterion_List_impl ();
+
+  void store_criterion (Criterion *c);
+  CORBA::Boolean is_critical (Event *e);
+};
+
+
+// This is just a wrapper and it uses the Event_List_Iterator on
+// the underlaying Event_List. Better would be a template for all the
+// iterators.
+
+class Criterion_List_Iterator
+{
+ public:
+  Criterion_List_Iterator (Criterion_List *list);
+  // Construct it to point to the first list link.
+
+  virtual ~Criterion_List_Iterator ();
+
+  void init (Criterion_List *list);
+
+  Criterion *next ();
+  // Get pointer to the current Criterion.
+
+  void advance ();
+  // Walks one Criterion ahead.
+
+ private:
+  Event_List_Iterator iterator_;
+};
+
+
+// Some origin_id's
+
+#define KITCHEN 1001
+#define BATHROOM 1002
+#define JONAS 1
diff --git a/TAO/examples/OBV/Typed_Events/Makefile b/TAO/examples/OBV/Typed_Events/Makefile
new file mode 100644
index 00000000000..fca81cbd96d
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/Makefile
@@ -0,0 +1,86 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+LDLIBS = -lTAO
+
+IDL_SRC	= Event_TypesC.cpp Event_TypesS.cpp
+
+PROG_SRCS = \
+	client.cpp \
+	server.cpp \
+	Server_i.cpp \
+	Client_i.cpp \
+	Event_Types_impl.cpp \
+	../Simple_util.cpp
+
+SRC = $(IDL_SRC) $(PROG_SRCS)
+
+SIMPLE_CLT_OBJS = \
+		Event_TypesC.o \
+		Event_TypesS.o \
+	        Client_i.o \
+		Event_Types_impl.o \
+		../Simple_util.o \
+		client.o
+SIMPLE_SVR_OBJS = \
+		Event_TypesC.o \
+		Event_TypesS.o \
+		Server_i.o \
+		Event_Types_impl.o \
+		../Simple_util.o \
+		server.o
+
+BIN = server \
+      client
+
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/taoconfig.mk
+
+#----------------------------------------------------------------------------
+#	Local targets
+#----------------------------------------------------------------------------
+
+LDFLAGS +=  -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
+override TAO_IDLFLAGS += -Gc -Gv
+
+.PRECIOUS: Event_TypesC.cpp Event_TypesC.i Event_TypesC.h
+.PRECIOUS: Event_TypesS.cpp Event_TypesS.i Event_TypesS.h
+.PRECIOUS: Event_TypesS_T.cpp Event_TypesS_T.i Event_TypesS_T.h
+
+server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+realclean: clean
+	-/bin/rm -rf Event_TypesC.* Event_TypesS.* Event_TypesS_T.*
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
diff --git a/TAO/examples/OBV/Typed_Events/README b/TAO/examples/OBV/Typed_Events/README
new file mode 100644
index 00000000000..77b3950e13f
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/README
@@ -0,0 +1,31 @@
+// $Id$
+
+Typed Events
+============
+
+This is a demonstration of the CORBA 2.3 valuetype feature.
+Event_Types.idl defines a hierarchy of event classes. The common
+attributes (indeed not CORBA attributes, they're state members) 
+like creation time and id of the origin are in a base class. 
+Concrete events like Temperature, Position and Log Message are derived 
+from this class.
+
+The client sends a few random events to the server. The server has
+suitable implementations of the event classes. So it is able to
+show the incoming events by invoking the do_print () operation, which is
+declared in the Event baseclass. 
+After that the server does an "alarm" check on the event.
+For each possible origin id (KITCHEN, BATHROOM) a criterion has been
+registered. The criterion which equals the origin id of the event is
+searched and then asked with is_critical (event).
+
+Finally a list with all the events which causes an alarm is
+requested by the client.
+
+
+Start with:
+
+% ./server -o ior
+% ./client -f ior [-x]
+
+
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
new file mode 100644
index 00000000000..9d61d0c4e28
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -0,0 +1,173 @@
+// $Id$
+
+#include "Server_i.h"
+#include "Event_Types_impl.h"
+
+
+Event_List_var alarms;
+// The list of events which caused an alarm. ('Singleton')
+
+Criterion_List_var criterions;
+// Arriving events are tested against the list members.
+
+
+
+// Set the ORB pointer, register OBV factories and init the
+// lists declared above.
+
+void
+Checkpoint_i::orb (CORBA::ORB_ptr o)
+{
+  this->orb_ = CORBA::ORB::_duplicate (o);
+
+  // Make factories to unmarshal OBV. The macro TAO_OBV_REGISTER_FACTORY is defined
+  // in tao/ValueFactory.h to prevent from getting wound fingertips.
+  // Notice that the way we currently do register_factory is not OMG conform.
+
+  // TAO_OBV_REGISTER_FACTORY (Event_factory);
+  // This one not. Event behaves as an abstract base,
+  // so we should't receive it (see header file)
+
+  TAO_OBV_REGISTER_FACTORY (Temperature_factory);
+  TAO_OBV_REGISTER_FACTORY (Position_factory);
+  TAO_OBV_REGISTER_FACTORY (Log_Msg_factory);
+  TAO_OBV_REGISTER_FACTORY (Event_List_factory);
+  TAO_OBV_REGISTER_FACTORY (Event_List_Link_factory);
+
+  // This list is returned by get_critical_events ().
+  alarms = new Event_List_impl;
+
+  // Now we build the list against which the events are tested.
+  criterions = new Criterion_List_impl;
+
+  // The conditions which will raise an alarm follow.
+
+  // The first parameter is the origin_id and the second the temperature.
+  Temperature_Criterion_var tc (new Temperature_Criterion_impl (KITCHEN, 32));
+  criterions->store_criterion (tc.in ());
+
+  tc = new Temperature_Criterion_impl (BATHROOM, 27);
+  criterions->store_criterion (tc.in ());
+
+
+  // Alarm if little Jonas is not in the child's room
+
+  Point leftbottom = {1, 2, 3};
+  Position_var leftbottom_v (new Position_impl (leftbottom));
+  Point topright = {2, 3, 4};
+  Position_var topright_v (new Position_impl (topright));
+  Position_Criterion_var pc (new Position_Criterion_impl (JONAS,
+                                                          leftbottom_v,
+                                                          topright_v));
+  criterions->store_criterion (pc.in ());
+
+  // Generic criterion matches every urgent massage
+  Log_Msg_Criterion_var lc (new Log_Msg_Criterion_impl);
+  // Null id flags to handle every Log_Msg
+  lc->origin_id_ (0);
+  criterions->store_criterion (lc.in ());
+
+  ACE_DEBUG ((LM_DEBUG, "This criterions are stored:\n"));
+  for (Criterion_List_Iterator i (criterions); i.next (); i.advance ())
+    {
+      Event *e = Event::_downcast (i.next ());
+      e->do_print ();
+    }
+    ACE_DEBUG ((LM_DEBUG, "\nNow waiting for events...\n"));
+}
+
+
+// Sidebar on assignment from pointer to _var type.
+//
+//   Event_var e_var (event);
+// This is fatal because the reference counter in *event is not increased
+// when a pointer is assigned to a _var. (This happens only
+// in assignments from another Event_var;
+// But Assignment from new is fine, the referencecount is yet one.)
+//
+// ok is
+//   CORBA::add_ref (event);
+//   Event_var e_var (event);
+//
+// but possibly easier to read it a macro
+#define DUP_REF(vt_ptr) (CORBA::add_ref (vt_ptr), vt_ptr)
+//   then it reads: Event_var e_var (DUP_REF (event));
+// (But it may cause desaster if vt_ptr is a function call.)
+//
+// Be careful with assignments from T1_var to T2_var, if T1 and T2 are
+// related through inheritance. Because there are many implicit casts
+// between pointer and _var types possible, the reference counter of
+// the duplicated reference is not increased.
+//
+// Is there any general solution with faulty reference counting ?
+
+
+void
+Checkpoint_i::put_event (Event *event,
+                        CORBA::Environment &ACE_TRY_ENV)
+{
+  // In general this function would be a dispatcher which looks at the
+  // origin id and finds an event handler object for the event. The
+  // event handler then would (type-safe) downcast the event to the
+  // concrete type it can handle. Here we only apply the list of
+  // criterions to the event.
+
+
+  // Let us see what event has arrived
+  event->do_print ();
+
+  // Does it match any criterion for alarm ?
+  if (criterions->is_critical (event))
+    {
+      alarms->store_event (event);
+    }
+
+
+
+  // If we want to return the event (e.g. return type is Event *)
+  // return (DUP_REF (event));
+  // should be right.
+
+  return;
+}
+
+
+Event_List *
+Checkpoint_i::get_critical_events (CORBA::Environment &ACE_TRY_ENV)
+{
+  // The skeleton should not steal our list by decrementing
+  // the reference counter.
+
+  CORBA::add_ref (alarms.ptr ());
+
+  // alarms._retn () would reset and destroy our alarms.
+
+  return alarms.in ();
+}
+
+
+// Shutdown the server application.
+
+void
+Checkpoint_i::shutdown (CORBA::Environment &)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "\n%s\n",
+              "The Checkpoint server is shutting down"));
+
+  // Instruct the ORB to shutdown.
+  this->orb_->shutdown ();
+}
+
+
+// Constructor.
+
+Checkpoint_i::Checkpoint_i (void)
+{
+}
+
+// Destructor.
+
+Checkpoint_i::~Checkpoint_i (void)
+{
+}
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h
new file mode 100644
index 00000000000..76bfacc68c2
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/Server_i.h
@@ -0,0 +1,59 @@
+// -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/OBV/Typed_Events
+//
+// = FILENAME
+//    Server_i.h
+//
+// = DESCRIPTION
+//    This class implements the Event_Types IDL interface.
+//
+// = AUTHOR
+//    Torsten Kuepper
+//    derived from the Echo example TAO/example/Simple/echo
+//    of Kirthika Parameswaran <kirthika@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef ECHO_I_H
+#define ECHO_I_H
+
+#include "Event_TypesS.h"
+
+
+class Checkpoint_i : public POA_Checkpoint
+{
+public:
+  // = Initialization and termination methods.
+  Checkpoint_i (void);
+  // Constructor.
+
+  ~Checkpoint_i (void);
+  // Destructor.
+
+  virtual void put_event (
+        Event * e,
+        CORBA::Environment &ACE_TRY_ENV
+  );
+
+  virtual Event_List * get_critical_events (
+        CORBA::Environment &ACE_TRY_ENV
+  );
+
+  virtual void shutdown (CORBA::Environment &env);
+  // Shutdown the server.
+
+  void orb (CORBA::ORB_ptr o);
+  // Set the ORB pointer.
+
+private:
+  CORBA::ORB_var orb_;
+  // ORB pointer.
+};
+
+#endif /* ECHO_I_H */
+
diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp
new file mode 100644
index 00000000000..d4e502a26bd
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/client.cpp
@@ -0,0 +1,23 @@
+//$Id$
+
+# include "Client_i.h"
+
+// The client program for the application.
+
+int
+main (int argc, char **argv)
+{
+  Checkpoint_Client_i client;
+
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\nEvent_Types client\n\n"));
+
+  if (client.run ("Event_Types_Checkpoint",
+                  argc,
+                  argv) == -1)
+    return -1;
+  else
+    return 0;
+
+}
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
new file mode 100644
index 00000000000..076099e93c9
--- /dev/null
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -0,0 +1,52 @@
+// $Id$
+#include "../Simple_util.h"
+#include "Server_i.h"
+
+// This is the main driver program for the time and date server.
+
+int
+main (int argc, char *argv[])
+{
+  Server<Checkpoint_i> server;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n\tCheckpoint Event_Types server\n\n"));
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
+    {
+      if (server.init ("Event_Types_Checkpoint",
+                       argc,
+                       argv,
+                       ACE_TRY_ENV) == -1)
+        return 1;
+      else
+        {
+          server.run (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCH (CORBA::SystemException, sysex)
+    {
+      ACE_UNUSED_ARG (sysex);
+      ACE_TRY_ENV.print_exception ("System Exception");
+      return -1;
+    }
+  ACE_CATCH (CORBA::UserException, userex)
+    {
+      ACE_UNUSED_ARG (userex);
+      ACE_TRY_ENV.print_exception ("User Exception");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class Server<Checkpoint_i>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate Server<Checkpoint_i>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/examples/POA/Adapter_Activator/Makefile b/TAO/examples/POA/Adapter_Activator/Makefile
index 8c58563ef23..2e2eb913764 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile
+++ b/TAO/examples/POA/Adapter_Activator/Makefile
@@ -160,6 +160,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -170,8 +172,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -307,6 +307,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ../Generic_Servant/generic_servant_export.h ../Generic_Servant/FooC.i \
  ../Generic_Servant/FooS_T.h ../Generic_Servant/FooS_T.i \
  ../Generic_Servant/FooS_T.cpp ../Generic_Servant/FooS.i
diff --git a/TAO/examples/POA/DSI/Makefile b/TAO/examples/POA/DSI/Makefile
index d251551894a..055293ae36b 100644
--- a/TAO/examples/POA/DSI/Makefile
+++ b/TAO/examples/POA/DSI/Makefile
@@ -172,6 +172,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -182,8 +184,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -319,6 +319,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  DatabaseC.i DatabaseS.h DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp \
  DatabaseS.i
 .obj/DatabaseS.o .obj/DatabaseS.so .shobj/DatabaseS.o .shobj/DatabaseS.so: DatabaseS.cpp DatabaseS.h DatabaseC.h \
@@ -438,6 +442,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -448,8 +454,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -585,6 +589,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  DatabaseC.i DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp DatabaseS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Database_i.h DatabaseS.h DatabaseC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -703,6 +711,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -713,8 +723,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -850,6 +858,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  DatabaseC.i DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp DatabaseS.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
@@ -975,6 +987,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -985,8 +999,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1122,6 +1134,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  DatabaseC.i
 .obj/Database_i.o .obj/Database_i.so .shobj/Database_i.o .shobj/Database_i.so: Database_i.cpp Database_i.h DatabaseS.h DatabaseC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1240,6 +1256,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1250,8 +1268,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1387,6 +1403,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  DatabaseC.i DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp DatabaseS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Default_Servant/Makefile b/TAO/examples/POA/Default_Servant/Makefile
index 59f61591520..0c9ed583c15 100644
--- a/TAO/examples/POA/Default_Servant/Makefile
+++ b/TAO/examples/POA/Default_Servant/Makefile
@@ -172,6 +172,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -182,8 +184,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -319,6 +319,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FileC.i FileS.h FileS_T.h FileS_T.i FileS_T.cpp FileS.i
 .obj/FileS.o .obj/FileS.so .shobj/FileS.o .shobj/FileS.so: FileS.cpp FileS.h FileC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -437,6 +441,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -447,8 +453,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -584,6 +588,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FileC.i FileS_T.h FileS_T.i FileS_T.cpp FileS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/streams.h \
@@ -705,6 +713,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -715,8 +725,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -852,6 +860,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FileC.i FileS_T.h FileS_T.i FileS_T.cpp FileS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/streams.h \
@@ -975,6 +987,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -985,8 +999,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1122,6 +1134,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FileC.i
 .obj/File_i.o .obj/File_i.so .shobj/File_i.o .shobj/File_i.so: File_i.cpp File_i.h FileS.h FileC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1240,6 +1256,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1250,8 +1268,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1387,6 +1403,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FileC.i FileS_T.h FileS_T.i FileS_T.cpp FileS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Explicit_Activation/Makefile b/TAO/examples/POA/Explicit_Activation/Makefile
index f7004d85320..15f06d6b624 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile
+++ b/TAO/examples/POA/Explicit_Activation/Makefile
@@ -162,6 +162,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -172,8 +174,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -309,6 +309,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ../Generic_Servant/generic_servant_export.h ../Generic_Servant/FooC.i \
  ../Generic_Servant/FooS_T.h ../Generic_Servant/FooS_T.i \
  ../Generic_Servant/FooS_T.cpp ../Generic_Servant/FooS.i
diff --git a/TAO/examples/POA/FindPOA/Makefile b/TAO/examples/POA/FindPOA/Makefile
index e0e781c682a..4b1def52deb 100644
--- a/TAO/examples/POA/FindPOA/Makefile
+++ b/TAO/examples/POA/FindPOA/Makefile
@@ -157,6 +157,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -167,8 +169,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -303,6 +303,10 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Forwarding/Makefile b/TAO/examples/POA/Forwarding/Makefile
index 943bab5a355..b57877e191b 100644
--- a/TAO/examples/POA/Forwarding/Makefile
+++ b/TAO/examples/POA/Forwarding/Makefile
@@ -172,6 +172,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -182,8 +184,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -319,6 +319,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 .obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -437,6 +441,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -447,8 +453,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -584,6 +588,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(TAO_ROOT)/tao/corba.h \
@@ -702,6 +710,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -712,8 +722,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -849,6 +857,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -972,6 +984,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -982,8 +996,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1119,6 +1131,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -1241,6 +1257,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1251,8 +1269,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1388,6 +1404,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  MyFooServant.h FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp \
  FooS.i Servant_Locator.h
 .obj/Servant_Locator.o .obj/Servant_Locator.so .shobj/Servant_Locator.o .shobj/Servant_Locator.so: Servant_Locator.cpp Servant_Locator.h \
@@ -1507,6 +1527,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1517,8 +1539,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1654,6 +1674,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  MyFooServant.h FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp \
  FooS.i
 
diff --git a/TAO/examples/POA/Generic_Servant/Makefile b/TAO/examples/POA/Generic_Servant/Makefile
index 5daf05e3edd..75808e9a3b2 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile
+++ b/TAO/examples/POA/Generic_Servant/Makefile
@@ -186,6 +186,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -196,8 +198,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -333,6 +333,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  generic_servant_export.h FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp \
  FooS.i
 .obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h \
@@ -452,6 +456,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -462,8 +468,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -599,6 +603,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  generic_servant_export.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 .obj/MyFooServant.o .obj/MyFooServant.so .shobj/MyFooServant.o .shobj/MyFooServant.so: MyFooServant.cpp MyFooServant.h FooS.h FooC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -717,6 +725,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -727,8 +737,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -864,6 +872,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  generic_servant_export.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Identity/Makefile b/TAO/examples/POA/Identity/Makefile
index 329e7e3e7d5..d3d26677bc7 100644
--- a/TAO/examples/POA/Identity/Makefile
+++ b/TAO/examples/POA/Identity/Makefile
@@ -166,6 +166,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -176,8 +178,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -313,6 +313,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i testS.h testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -431,6 +435,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -441,8 +447,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -578,6 +582,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/Identity.o .obj/Identity.so .shobj/Identity.o .shobj/Identity.so: Identity.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -696,6 +704,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -706,8 +716,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -843,6 +851,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i testS_T.h testS_T.i testS_T.cpp testS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Loader/Makefile b/TAO/examples/POA/Loader/Makefile
index 1579a8230d9..ac116444ec1 100644
--- a/TAO/examples/POA/Loader/Makefile
+++ b/TAO/examples/POA/Loader/Makefile
@@ -4,15 +4,15 @@
 
 BIN = server
 
-MYFILES = Server_Manager Servant_Activator Servant_Locator 
+MYFILES = Server_Manager Servant_Activator Servant_Locator
 
 SRC = $(addsuffix .cpp,$(MYFILES)) $(addsuffix .cpp, $(BIN))
 OBJ = $(addsuffix .o,$(MYFILES))
 
-CPPFLAGS += -I$(TAO_ROOT) 
+CPPFLAGS += -I$(TAO_ROOT)
 
 LDLIBS = -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao 
+LDFLAGS += -L$(TAO_ROOT)/tao
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
@@ -161,6 +161,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -171,8 +173,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -308,6 +308,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(ACE_ROOT)/ace/DLL.h \
  Servant_Locator.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -429,6 +433,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -439,8 +445,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -576,6 +580,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(ACE_ROOT)/ace/DLL.h
 .obj/Servant_Locator.o .obj/Servant_Locator.so .shobj/Servant_Locator.o .shobj/Servant_Locator.so: Servant_Locator.cpp Servant_Locator.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -694,6 +702,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -704,8 +714,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -841,6 +849,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(ACE_ROOT)/ace/DLL.h
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_Manager.h \
  $(ACE_ROOT)/ace/streams.h \
@@ -960,6 +972,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -970,8 +984,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1107,6 +1119,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(ACE_ROOT)/ace/DLL.h \
  Servant_Locator.h
 
diff --git a/TAO/examples/POA/NewPOA/Makefile b/TAO/examples/POA/NewPOA/Makefile
index 5fedfad10fe..59fef08c5be 100644
--- a/TAO/examples/POA/NewPOA/Makefile
+++ b/TAO/examples/POA/NewPOA/Makefile
@@ -157,6 +157,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -167,8 +169,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -303,6 +303,10 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile b/TAO/examples/POA/On_Demand_Activation/Makefile
index db9a00edf14..91815ddc8cd 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile
@@ -160,6 +160,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -170,8 +172,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -307,6 +307,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ../Generic_Servant/MyFooServant.h ../Generic_Servant/FooS.h \
  ../Generic_Servant/FooC.h ../Generic_Servant/generic_servant_export.h \
  ../Generic_Servant/FooC.i ../Generic_Servant/FooS_T.h \
@@ -429,6 +433,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -439,8 +445,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -576,6 +580,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ../Generic_Servant/MyFooServant.h ../Generic_Servant/FooS.h \
  ../Generic_Servant/FooC.h ../Generic_Servant/generic_servant_export.h \
  ../Generic_Servant/FooC.i ../Generic_Servant/FooS_T.h \
@@ -701,6 +709,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -711,8 +721,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -848,6 +856,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Servant_Locator.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile b/TAO/examples/POA/On_Demand_Loading/Makefile
index 7baccac5969..bde0030f5fa 100644
--- a/TAO/examples/POA/On_Demand_Loading/Makefile
+++ b/TAO/examples/POA/On_Demand_Loading/Makefile
@@ -4,7 +4,7 @@
 
 BIN = server
 
-MYFILES = Server_Manager Servant_Manager Servant_Activator Servant_Locator 
+MYFILES = Server_Manager Servant_Manager Servant_Activator Servant_Locator
 
 SRC = $(addsuffix .cpp,$(MYFILES)) $(addsuffix .cpp, $(BIN))
 OBJ = $(addsuffix .o,$(MYFILES))
@@ -162,6 +162,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -172,8 +174,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -309,6 +309,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Servant_Locator.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
@@ -430,6 +434,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -440,8 +446,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -576,7 +580,11 @@ endif
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 .obj/Servant_Activator.o .obj/Servant_Activator.so .shobj/Servant_Activator.o .shobj/Servant_Activator.so: Servant_Activator.cpp Servant_Activator.h \
  Servant_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -696,6 +704,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -706,8 +716,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -842,7 +850,11 @@ endif
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 .obj/Servant_Locator.o .obj/Servant_Locator.so .shobj/Servant_Locator.o .shobj/Servant_Locator.so: Servant_Locator.cpp Servant_Locator.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -960,6 +972,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -970,8 +984,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1107,6 +1119,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(ACE_ROOT)/ace/DLL.h \
  Servant_Manager.h
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_Manager.h \
@@ -1228,6 +1244,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1238,8 +1256,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1375,6 +1391,10 @@ endif
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Servant_Locator.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile b/TAO/examples/POA/Reference_Counted_Servant/Makefile
index f90bd399da3..b1bccf3da5b 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile
+++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile
@@ -41,7 +41,8 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp $(ACE_ROOT)/ace/Get_Opt.h \
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -161,6 +162,8 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -171,8 +174,6 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -308,6 +309,10 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ../Generic_Servant/generic_servant_export.h ../Generic_Servant/FooC.i \
  ../Generic_Servant/FooS_T.h ../Generic_Servant/FooS_T.i \
  ../Generic_Servant/FooS_T.cpp ../Generic_Servant/FooS.i
diff --git a/TAO/examples/POA/RootPOA/Makefile b/TAO/examples/POA/RootPOA/Makefile
index db92487cbde..7cd8f06c4b8 100644
--- a/TAO/examples/POA/RootPOA/Makefile
+++ b/TAO/examples/POA/RootPOA/Makefile
@@ -156,6 +156,8 @@ endif
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -166,8 +168,6 @@ endif
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -302,6 +302,10 @@ endif
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/TIE/Makefile b/TAO/examples/POA/TIE/Makefile
index 6b7b41845a6..d5e00285804 100644
--- a/TAO/examples/POA/TIE/Makefile
+++ b/TAO/examples/POA/TIE/Makefile
@@ -183,6 +183,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -193,8 +195,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -330,6 +330,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 .obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -448,6 +452,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -458,8 +464,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -595,6 +599,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/streams.h \
@@ -714,6 +722,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -724,8 +734,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -861,6 +869,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/streams.h \
@@ -987,6 +999,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -997,8 +1011,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1133,6 +1145,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FooC.i
 .obj/Foo_i.o .obj/Foo_i.so .shobj/Foo_i.o .shobj/Foo_i.so: Foo_i.cpp Foo_i.h FooS.h FooC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1251,6 +1267,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1261,8 +1279,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1398,6 +1414,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile
index f1bc24569ad..4d4022692b4 100644
--- a/TAO/examples/Quoter/Makefile
+++ b/TAO/examples/Quoter/Makefile
@@ -226,6 +226,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -236,8 +238,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -373,6 +373,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
@@ -510,6 +514,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -520,8 +526,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -657,6 +661,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -790,6 +798,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -800,8 +810,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -937,6 +945,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  client.h \
@@ -1066,6 +1078,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1076,8 +1090,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1213,6 +1225,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -1354,6 +1370,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1364,8 +1382,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1501,6 +1517,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Quoter_i.h QuoterS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
@@ -1635,6 +1655,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1645,8 +1667,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1782,6 +1802,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Factory_Finder.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
@@ -1922,6 +1946,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1932,8 +1958,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2069,6 +2093,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Factory_Finder_i.h QuoterS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
@@ -2203,6 +2231,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2213,8 +2243,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2350,6 +2378,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
@@ -2492,6 +2524,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2502,8 +2536,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2639,6 +2671,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Generic_Factory_i.h QuoterS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile
index ebf7a232db7..c074abb6288 100644
--- a/TAO/examples/Simple/bank/Makefile
+++ b/TAO/examples/Simple/bank/Makefile
@@ -209,6 +209,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -219,8 +221,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -356,6 +356,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  BankC.i BankS.h BankS_T.h BankS_T.i BankS_T.cpp BankS.i
 .obj/BankS.o .obj/BankS.so .shobj/BankS.o .shobj/BankS.so: BankS.cpp BankS.h BankC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -474,6 +478,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -484,8 +490,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -621,6 +625,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  BankC.i BankS_T.h BankS_T.i BankS_T.cpp BankS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Bank_Client_i.h ../Simple_util.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -750,6 +758,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -757,8 +767,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -888,6 +896,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1035,6 +1047,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1042,8 +1056,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1173,6 +1185,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1310,6 +1326,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1320,8 +1338,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1457,6 +1473,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  BankC.i BankS_T.h BankS_T.i BankS_T.cpp BankS.i
 .obj/AccountManager_i.o .obj/AccountManager_i.so .shobj/AccountManager_i.o .shobj/AccountManager_i.so: AccountManager_i.cpp AccountManager_i.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -1586,6 +1606,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1593,8 +1615,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1724,6 +1744,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  BankC.i BankS_T.h BankS_T.i BankS_T.cpp BankS.i Account_i.h
 .obj/Bank_Client_i.o .obj/Bank_Client_i.so .shobj/Bank_Client_i.o .shobj/Bank_Client_i.so: Bank_Client_i.cpp Bank_Client_i.h ../Simple_util.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -1853,6 +1877,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1860,8 +1886,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1991,6 +2015,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -2138,6 +2166,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2145,8 +2175,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2276,6 +2304,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/examples/Simple/chat/Makefile b/TAO/examples/Simple/chat/Makefile
index 54abbd0c657..32d19afb799 100644
--- a/TAO/examples/Simple/chat/Makefile
+++ b/TAO/examples/Simple/chat/Makefile
@@ -15,6 +15,8 @@ IDL_SRC	= ReceiverC.cpp ReceiverS.cpp BroadcasterC.cpp BroadcasterS.cpp
 PROG_SRCS = \
 	Receiver_i.cpp \
 	Broadcaster_i.cpp \
+	Client_i.cpp \
+	Server_i.cpp \
 	client.cpp \
 	server.cpp
 
@@ -64,12 +66,9 @@ include $(TAO_ROOT)/taoconfig.mk
 LDFLAGS +=  -L$(TAO_ROOT)/tao
 CPPFLAGS +=
 
-.PRECIOUS: ReceiverC.cpp ReceiverC.i ReceiverC.h
-.PRECIOUS: ReceiverS.cpp  ReceiverS.i ReceiverS.h
-.PRECIOUS: ReceiverS_T.cpp ReceiverS_T.i ReceiverS_T.h
-.PRECIOUS: BroadcasterC.cpp BroadcasterC.i BroadcasterC.h
-.PRECIOUS: BroadcasterS.cpp  BroadcasterS.i BroadcasterS.h
-.PRECIOUS: BroadcasterS_T.cpp BroadcasterS_T.i BroadcasterS_T.h
+$(foreach ext, $(IDL_EXT), Broadcaster$(ext)): Receiver.idl
+
+.PRECIOUS: $(foreach file, Broadcaster Receiver, $(foreach ext, $(IDL_EXT), $(file)$(ext))))
 
 server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -83,7 +82,7 @@ realclean: clean
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/ReceiverC.o .obj/ReceiverC.so .shobj/ReceiverC.o .shobj/ReceiverC.so: ReceiverC.cpp ReceiverC.h \
+.obj/ReceiverS.o .obj/ReceiverS.so .shobj/ReceiverS.o .shobj/ReceiverS.so: ReceiverS.cpp ReceiverS.h ReceiverC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -200,6 +199,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -210,8 +211,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -347,9 +346,12 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- ReceiverC.i ReceiverS.h ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp \
- ReceiverS.i
-.obj/ReceiverS.o .obj/ReceiverS.so .shobj/ReceiverS.o .shobj/ReceiverS.so: ReceiverS.cpp ReceiverS.h ReceiverC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i
+.obj/ReceiverC.o .obj/ReceiverC.so .shobj/ReceiverC.o .shobj/ReceiverC.so: ReceiverC.cpp ReceiverC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -466,6 +468,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -476,8 +480,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -613,7 +615,12 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
- ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ ReceiverC.i ReceiverS.h ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp \
+ ReceiverS.i
 .obj/BroadcasterC.o .obj/BroadcasterC.so .shobj/BroadcasterC.o .shobj/BroadcasterC.so: BroadcasterC.cpp BroadcasterC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -731,6 +738,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -741,8 +750,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -878,6 +885,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ReceiverC.h ReceiverC.i BroadcasterC.i BroadcasterS.h ReceiverS.h \
  ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
  BroadcasterS_T.h BroadcasterS_T.i BroadcasterS_T.cpp BroadcasterS.i
@@ -999,6 +1010,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1009,8 +1022,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1146,10 +1157,15 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
  BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \
  BroadcasterS_T.cpp BroadcasterS.i
-.obj/Receiver_i.o .obj/Receiver_i.so .shobj/Receiver_i.o .shobj/Receiver_i.so: Receiver_i.cpp Receiver_i.h ReceiverS.h ReceiverC.h \
+.obj/Broadcaster_i.o .obj/Broadcaster_i.so .shobj/Broadcaster_i.o .shobj/Broadcaster_i.so: Broadcaster_i.cpp Broadcaster_i.h BroadcasterS.h \
+ ReceiverS.h ReceiverC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -1266,6 +1282,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1276,8 +1294,278 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
+ BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \
+ BroadcasterS_T.cpp BroadcasterS.i \
+ $(TAO_ROOT)/tao/TAO.h
+.obj/Receiver_i.o .obj/Receiver_i.so .shobj/Receiver_i.o .shobj/Receiver_i.so: Receiver_i.cpp Receiver_i.h ReceiverS.h ReceiverC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1413,8 +1701,12 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i
-.obj/Broadcaster_i.o .obj/Broadcaster_i.so .shobj/Broadcaster_i.o .shobj/Broadcaster_i.so: Broadcaster_i.cpp Broadcaster_i.h BroadcasterS.h \
+.obj/Server_i.o .obj/Server_i.so .shobj/Server_i.o .shobj/Server_i.so: Server_i.cpp Server_i.h Broadcaster_i.h BroadcasterS.h \
  ReceiverS.h ReceiverC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1532,6 +1824,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1542,8 +1836,281 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
+ BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \
+ BroadcasterS_T.cpp BroadcasterS.i \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_i.h Broadcaster_i.h BroadcasterS.h \
+ ReceiverS.h ReceiverC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1679,11 +2246,16 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
  BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \
  BroadcasterS_T.cpp BroadcasterS.i \
  $(TAO_ROOT)/tao/TAO.h
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Client_i.h Receiver_i.h ReceiverS.h ReceiverC.h \
+.obj/Client_i.o .obj/Client_i.so .shobj/Client_i.o .shobj/Client_i.so: Client_i.cpp Client_i.h Receiver_i.h ReceiverS.h \
+ ReceiverC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -1800,6 +2372,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1810,8 +2384,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1947,13 +2519,18 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
  BroadcasterC.h BroadcasterC.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
- $(TAO_ROOT)/tao/TAO.h
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_i.h Broadcaster_i.h BroadcasterS.h \
- ReceiverS.h ReceiverC.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Client_i.h Receiver_i.h ReceiverS.h ReceiverC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -2070,6 +2647,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2080,8 +2659,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2217,9 +2794,14 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
- BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \
- BroadcasterS_T.cpp BroadcasterS.i \
+ BroadcasterC.h BroadcasterC.i \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/tao/TAO.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile
index 414220f7b9f..eab14e1278d 100644
--- a/TAO/examples/Simple/echo/Makefile
+++ b/TAO/examples/Simple/echo/Makefile
@@ -206,6 +206,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -216,8 +218,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -353,6 +353,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  EchoC.i EchoS.h EchoS_T.h EchoS_T.i EchoS_T.cpp EchoS.i
 .obj/EchoS.o .obj/EchoS.so .shobj/EchoS.o .shobj/EchoS.so: EchoS.cpp EchoS.h EchoC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -471,6 +475,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -481,8 +487,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -618,6 +622,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  EchoC.i EchoS_T.h EchoS_T.i EchoS_T.cpp EchoS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Echo_Client_i.h ../Simple_util.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -747,6 +755,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -754,8 +764,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -885,6 +893,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1032,6 +1044,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1039,8 +1053,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1170,6 +1182,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1307,6 +1323,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1317,8 +1335,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1454,6 +1470,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  EchoC.i EchoS_T.h EchoS_T.i EchoS_T.cpp EchoS.i
 .obj/Echo_Client_i.o .obj/Echo_Client_i.so .shobj/Echo_Client_i.o .shobj/Echo_Client_i.so: Echo_Client_i.cpp Echo_Client_i.h ../Simple_util.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -1583,6 +1603,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1590,8 +1612,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1721,6 +1741,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1868,6 +1892,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1875,8 +1901,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2006,6 +2030,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile
index a2a1b1741f3..7b8a5ed792c 100644
--- a/TAO/examples/Simple/grid/Makefile
+++ b/TAO/examples/Simple/grid/Makefile
@@ -207,6 +207,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -217,8 +219,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -354,6 +354,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  GridC.i GridS.h GridS_T.h GridS_T.i GridS_T.cpp GridS.i
 .obj/GridS.o .obj/GridS.so .shobj/GridS.o .shobj/GridS.so: GridS.cpp GridS.h GridC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -472,6 +476,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -482,8 +488,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -619,6 +623,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  GridC.i GridS_T.h GridS_T.i GridS_T.cpp GridS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Grid_Client_i.h ../Simple_util.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -748,6 +756,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -755,8 +765,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -886,6 +894,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1033,6 +1045,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1040,8 +1054,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1171,6 +1183,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1308,6 +1324,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1318,8 +1336,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1455,6 +1471,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  GridC.i GridS_T.h GridS_T.i GridS_T.cpp GridS.i
 .obj/Grid_Client_i.o .obj/Grid_Client_i.so .shobj/Grid_Client_i.o .shobj/Grid_Client_i.so: Grid_Client_i.cpp Grid_Client_i.h ../Simple_util.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -1584,6 +1604,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1591,8 +1613,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1722,6 +1742,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1869,6 +1893,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1876,8 +1902,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2007,6 +2031,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile
index e2cfea8cc9a..e2aee7981b6 100644
--- a/TAO/examples/Simple/time/Makefile
+++ b/TAO/examples/Simple/time/Makefile
@@ -207,6 +207,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -217,8 +219,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -354,6 +354,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  TimeC.i TimeS.h TimeS_T.h TimeS_T.i TimeS_T.cpp TimeS.i
 .obj/TimeS.o .obj/TimeS.so .shobj/TimeS.o .shobj/TimeS.so: TimeS.cpp TimeS.h TimeC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -472,6 +476,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -482,8 +488,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -619,6 +623,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  TimeC.i TimeS_T.h TimeS_T.i TimeS_T.cpp TimeS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Time_Client_i.h ../Simple_util.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -748,6 +756,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -755,8 +765,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -886,6 +894,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1033,6 +1045,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1040,8 +1054,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1171,6 +1183,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1308,6 +1324,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1318,8 +1336,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1455,6 +1471,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  TimeC.i TimeS_T.h TimeS_T.i TimeS_T.cpp TimeS.i
 .obj/Time_Client_i.o .obj/Time_Client_i.so .shobj/Time_Client_i.o .shobj/Time_Client_i.so: Time_Client_i.cpp Time_Client_i.h ../Simple_util.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -1584,6 +1604,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1591,8 +1613,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1722,6 +1742,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1869,6 +1893,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1876,8 +1902,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2007,6 +2031,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile
index 04193584223..042282f1b87 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile
@@ -180,6 +180,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -187,8 +189,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -318,6 +318,10 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile
index 422cff16cb9..93e4e6da246 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -168,6 +168,8 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -178,8 +180,6 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -315,6 +315,10 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -429,6 +433,12 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
index d24888ab554..4286ad85d02 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile
@@ -167,6 +167,8 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -177,8 +179,6 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -314,6 +314,10 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index c6d595f9eed..a8a9c81f9c5 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -174,6 +174,8 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -184,8 +186,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -321,6 +321,10 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile
index 7c8da772bf6..a73b652a3a8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile
@@ -189,6 +189,8 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -199,8 +201,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -336,6 +336,10 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
@@ -470,6 +474,8 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -480,8 +486,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -617,6 +621,10 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile
index 223a8601c85..2203a2858fd 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile
@@ -180,6 +180,8 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -190,8 +192,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -327,6 +327,10 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  LifeCycle_Service.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
@@ -363,6 +367,20 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h \
  Criteria_Evaluator.h
 .obj/LifeCycle_Service_i.o .obj/LifeCycle_Service_i.so .shobj/LifeCycle_Service_i.o .shobj/LifeCycle_Service_i.so: LifeCycle_Service_i.cpp \
@@ -484,6 +502,8 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -494,8 +514,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -631,6 +649,10 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
@@ -663,6 +685,20 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h \
  Criteria_Evaluator.h
 .obj/Factory_Trader.o .obj/Factory_Trader.so .shobj/Factory_Trader.o .shobj/Factory_Trader.so: Factory_Trader.cpp Factory_Trader.h \
@@ -782,6 +818,8 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -792,8 +830,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -929,6 +965,10 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
@@ -938,6 +978,20 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
@@ -1061,6 +1115,8 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1071,8 +1127,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1208,6 +1262,10 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/orbsvcs/Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Makefile
index 181a9480e6f..57afb24c850 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile
+++ b/TAO/orbsvcs/Logging_Service/Makefile
@@ -186,6 +186,8 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -193,8 +195,6 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -324,6 +324,10 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -476,6 +480,8 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -483,8 +489,6 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -614,6 +618,10 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index 5b012703a66..b2b5a26373e 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -182,6 +182,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -189,8 +191,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -320,6 +320,10 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index 89b17b96ae3..ee7c3b7d17c 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -164,6 +164,8 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -174,8 +176,6 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -311,6 +311,10 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile
index fc4dbea1da0..c1bc71b5eb5 100644
--- a/TAO/orbsvcs/Time_Service/Makefile
+++ b/TAO/orbsvcs/Time_Service/Makefile
@@ -205,6 +205,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -212,8 +214,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -343,6 +343,10 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -514,6 +518,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -521,8 +527,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -652,6 +656,10 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -822,6 +830,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -829,8 +839,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -960,6 +968,10 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -1128,6 +1140,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1135,8 +1149,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1266,6 +1278,10 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -1435,6 +1451,8 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1442,8 +1460,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1573,6 +1589,10 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index 6fa8aeb78e9..31a4d2352ac 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -182,6 +182,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -189,8 +191,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -320,6 +320,10 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
@@ -333,6 +337,20 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index 1494f191b5a..8106f641dde 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -583,6 +583,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosPropertyServiceC.i CosPropertyServiceS_T.h \
  CosPropertyServiceS_T.i CosPropertyServiceS_T.cpp \
  CosPropertyServiceS.i AVStreamsC.h AVStreamsC.i AVStreamsS_T.h \
@@ -852,6 +856,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h Null_MediaCtrlC.i Null_MediaCtrlS_T.h \
  Null_MediaCtrlS_T.i Null_MediaCtrlS_T.cpp Null_MediaCtrlS.i
 .obj/sfpS.o .obj/sfpS.so .shobj/sfpS.o .shobj/sfpS.so: sfpS.cpp sfpS.h sfpC.h \
@@ -1118,6 +1126,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h sfpC.i sfpS_T.h sfpS_T.i sfpS_T.cpp sfpS.i
 .obj/CosEventCommS.o .obj/CosEventCommS.so .shobj/CosEventCommS.o .shobj/CosEventCommS.so: CosEventCommS.cpp CosEventCommS.h CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1383,6 +1395,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosEventCommC.i CosEventCommS_T.h CosEventCommS_T.i \
  CosEventCommS_T.cpp CosEventCommS.i
 .obj/CosEventChannelAdminS.o .obj/CosEventChannelAdminS.so .shobj/CosEventChannelAdminS.o .shobj/CosEventChannelAdminS.so: CosEventChannelAdminS.cpp \
@@ -1650,6 +1666,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosEventCommC.i CosEventCommS_T.h CosEventCommS_T.i \
  CosEventCommS_T.cpp CosEventCommS.i CosEventChannelAdminC.h \
  CosEventChannelAdminC.i CosEventChannelAdminS_T.h \
@@ -1927,6 +1947,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
  TimeBaseS_T.cpp TimeBaseS.i RtecEventCommC.h RtecEventCommC.i \
  RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
@@ -2204,6 +2228,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
  TimeBaseS_T.cpp TimeBaseS.i RtecEventCommC.h RtecEventCommC.i \
  RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
@@ -2485,6 +2513,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
  TimeBaseS_T.cpp TimeBaseS.i RtecEventCommC.h RtecEventCommC.i \
  RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
@@ -2762,6 +2794,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
  TimeBaseS_T.cpp TimeBaseS.i RtecSchedulerC.h RtecSchedulerC.i \
  RtecSchedulerS_T.h RtecSchedulerS_T.i RtecSchedulerS_T.cpp \
@@ -3031,6 +3067,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosNamingC.i CosNamingS_T.h CosNamingS_T.i \
  CosNamingS_T.cpp CosNamingS.i CosLifeCycleC.h CosLifeCycleC.i \
  CosLifeCycleS_T.h CosLifeCycleS_T.i CosLifeCycleS_T.cpp \
@@ -3300,6 +3340,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosNamingC.i CosNamingS_T.h CosNamingS_T.i \
  CosNamingS_T.cpp CosNamingS.i CosLifeCycleC.h CosLifeCycleC.i \
  CosLifeCycleS_T.h CosLifeCycleS_T.i CosLifeCycleS_T.cpp \
@@ -3570,6 +3614,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \
  CosTradingS_T.cpp CosTradingS.i
 .obj/CosTradingDynamicS.o .obj/CosTradingDynamicS.so .shobj/CosTradingDynamicS.o .shobj/CosTradingDynamicS.so: CosTradingDynamicS.cpp CosTradingDynamicS.h \
@@ -3837,6 +3885,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \
  CosTradingS_T.cpp CosTradingS.i CosTradingDynamicC.h \
  CosTradingDynamicC.i CosTradingDynamicS_T.h CosTradingDynamicS_T.i \
@@ -4106,6 +4158,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \
  CosTradingS_T.cpp CosTradingS.i CosTradingReposC.h CosTradingReposC.i \
  CosTradingReposS_T.h CosTradingReposS_T.i CosTradingReposS_T.cpp \
@@ -4375,6 +4431,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosPropertyServiceC.i CosPropertyServiceS_T.h \
  CosPropertyServiceS_T.i CosPropertyServiceS_T.cpp \
  CosPropertyServiceS.i
@@ -4643,6 +4703,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosConcurrencyControlC.i CosConcurrencyControlS_T.h \
  CosConcurrencyControlS_T.i CosConcurrencyControlS_T.cpp \
  CosConcurrencyControlS.i
@@ -4910,6 +4974,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h LoggerC.i LoggerS_T.h LoggerS_T.i LoggerS_T.cpp \
  LoggerS.i
 .obj/TimeBaseS.o .obj/TimeBaseS.so .shobj/TimeBaseS.o .shobj/TimeBaseS.so: TimeBaseS.cpp TimeBaseS.h \
@@ -5184,6 +5252,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
  TimeBaseS_T.cpp TimeBaseS.i
 .obj/TimeServiceS.o .obj/TimeServiceS.so .shobj/TimeServiceS.o .shobj/TimeServiceS.so: TimeServiceS.cpp TimeServiceS.h TimeBaseS.h \
@@ -5458,6 +5530,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
  TimeBaseS_T.cpp TimeBaseS.i TimeServiceC.h TimeServiceC.i \
  TimeServiceS_T.h TimeServiceS_T.i TimeServiceS_T.cpp TimeServiceS.i
@@ -5725,6 +5801,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h PingC.i PingS_T.h PingS_T.i PingS_T.cpp PingS.i
 .obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h PingS.h PingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -5990,6 +6070,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h PingC.i PingS_T.h PingS_T.i PingS_T.cpp PingS.i \
  ImplRepoC.h ImplRepoC.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp \
  ImplRepoS.i
@@ -6257,6 +6341,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosNamingC.i CosNamingS_T.h CosNamingS_T.i \
  CosNamingS_T.cpp CosNamingS.i
 .obj/AVStreamsC.o .obj/AVStreamsC.so .shobj/AVStreamsC.o .shobj/AVStreamsC.so: AVStreamsC.cpp AVStreamsC.h \
@@ -6523,6 +6611,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosPropertyServiceC.h CosPropertyServiceC.i \
  AVStreamsC.i AVStreamsS.h CosPropertyServiceS.h \
  CosPropertyServiceS_T.h CosPropertyServiceS_T.i \
@@ -6792,6 +6884,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h Null_MediaCtrlC.i Null_MediaCtrlS.h \
  Null_MediaCtrlS_T.h Null_MediaCtrlS_T.i Null_MediaCtrlS_T.cpp \
  Null_MediaCtrlS.i
@@ -7059,6 +7155,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h sfpC.i sfpS.h sfpS_T.h sfpS_T.i sfpS_T.cpp sfpS.i
 .obj/CosEventCommC.o .obj/CosEventCommC.so .shobj/CosEventCommC.o .shobj/CosEventCommC.so: CosEventCommC.cpp CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -7324,6 +7424,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosEventCommC.i CosEventCommS.h CosEventCommS_T.h \
  CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i
 .obj/CosEventChannelAdminC.o .obj/CosEventChannelAdminC.so .shobj/CosEventChannelAdminC.o .shobj/CosEventChannelAdminC.so: CosEventChannelAdminC.cpp \
@@ -7591,6 +7695,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosEventCommC.h CosEventCommC.i \
  CosEventChannelAdminC.i CosEventChannelAdminS.h CosEventCommS.h \
  CosEventCommS_T.h CosEventCommS_T.i CosEventCommS_T.cpp \
@@ -7860,6 +7968,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -8137,6 +8249,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h RtecEventCommC.h TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -8418,6 +8534,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h RtecEventCommC.h TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -8696,6 +8816,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -8972,6 +9096,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosNamingC.h CosNamingC.i CosLifeCycleC.i \
  CosLifeCycleS.h CosNamingS.h CosNamingS_T.h CosNamingS_T.i \
  CosNamingS_T.cpp CosNamingS.i CosLifeCycleS_T.h CosLifeCycleS_T.i \
@@ -9240,6 +9368,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosLifeCycleC.h CosNamingC.h CosNamingC.i \
  CosLifeCycleC.i LifeCycleServiceC.i LifeCycleServiceS.h \
  CosLifeCycleS.h CosNamingS.h CosNamingS_T.h CosNamingS_T.i \
@@ -9510,6 +9642,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosTradingC.i CosTradingS.h CosTradingS_T.h \
  CosTradingS_T.i CosTradingS_T.cpp CosTradingS.i
 .obj/CosTradingDynamicC.o .obj/CosTradingDynamicC.so .shobj/CosTradingDynamicC.o .shobj/CosTradingDynamicC.so: CosTradingDynamicC.cpp CosTradingDynamicC.h \
@@ -9776,6 +9912,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosTradingC.h CosTradingC.i CosTradingDynamicC.i \
  CosTradingDynamicS.h CosTradingS.h CosTradingS_T.h CosTradingS_T.i \
  CosTradingS_T.cpp CosTradingS.i CosTradingDynamicS_T.h \
@@ -10044,6 +10184,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosTradingC.h CosTradingC.i CosTradingReposC.i \
  CosTradingReposS.h CosTradingS.h CosTradingS_T.h CosTradingS_T.i \
  CosTradingS_T.cpp CosTradingS.i CosTradingReposS_T.h \
@@ -10312,6 +10456,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosPropertyServiceC.i CosPropertyServiceS.h \
  CosPropertyServiceS_T.h CosPropertyServiceS_T.i \
  CosPropertyServiceS_T.cpp CosPropertyServiceS.i
@@ -10580,6 +10728,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosConcurrencyControlC.i CosConcurrencyControlS.h \
  CosConcurrencyControlS_T.h CosConcurrencyControlS_T.i \
  CosConcurrencyControlS_T.cpp CosConcurrencyControlS.i
@@ -10847,6 +10999,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h LoggerC.i LoggerS.h LoggerS_T.h LoggerS_T.i \
  LoggerS_T.cpp LoggerS.i
 .obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp TimeBaseC.h \
@@ -11113,6 +11269,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -11387,6 +11547,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -11662,6 +11826,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h PingC.i PingS.h PingS_T.h PingS_T.i PingS_T.cpp \
  PingS.i
 .obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h \
@@ -11928,6 +12096,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h PingC.h PingC.i ImplRepoC.i ImplRepoS.h PingS.h \
  PingS_T.h PingS_T.i PingS_T.cpp PingS.i ImplRepoS_T.h ImplRepoS_T.i \
  ImplRepoS_T.cpp ImplRepoS.i
@@ -12195,6 +12367,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  orbsvcs_export.h CosNamingC.i CosNamingS.h CosNamingS_T.h \
  CosNamingS_T.i CosNamingS_T.cpp CosNamingS.i
 .obj/AVStreams_i.o .obj/AVStreams_i.so .shobj/AVStreams_i.o .shobj/AVStreams_i.so: AV/AVStreams_i.cpp AV/AVStreams_i.h \
@@ -12464,6 +12640,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
@@ -12787,6 +12967,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
@@ -13109,6 +13293,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
@@ -13429,6 +13617,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
@@ -13759,6 +13951,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -14077,6 +14273,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -14388,6 +14588,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -14695,6 +14899,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -15002,6 +15210,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -15299,6 +15511,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -15572,6 +15788,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -15849,6 +16069,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -16160,6 +16384,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -16433,6 +16661,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -16709,6 +16941,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -17013,6 +17249,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event/EC_Factory.i
 .obj/EC_QOS_Info.o .obj/EC_QOS_Info.so .shobj/EC_QOS_Info.o .shobj/EC_QOS_Info.so: Event/EC_QOS_Info.cpp Event/EC_QOS_Info.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
@@ -17299,6 +17539,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event/EC_Factory.i Event/EC_Null_Factory.i Event/EC_Dispatching.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -17624,6 +17868,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -17897,6 +18145,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -18170,6 +18422,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -18444,6 +18700,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -18728,6 +18988,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event/EC_Factory.i Event/EC_Basic_Factory.i Event/EC_Dispatching.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -19057,6 +19321,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event/EC_Factory.i Event/EC_Default_Factory.i \
  Event/EC_Priority_Dispatching.h Event/EC_Dispatching.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
@@ -19392,6 +19660,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -19707,6 +19979,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ProxySupplier.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
@@ -20014,6 +20290,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -20329,6 +20609,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -20642,6 +20926,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -20921,6 +21209,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -21195,6 +21487,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -21474,6 +21770,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -21779,6 +22079,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -22073,6 +22377,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -22392,6 +22700,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -22714,6 +23026,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -23036,6 +23352,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -23345,6 +23665,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -23646,6 +23970,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
@@ -23989,6 +24317,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
@@ -24338,6 +24670,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -24609,6 +24945,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -24920,6 +25260,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
@@ -25259,6 +25603,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
@@ -25604,6 +25952,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
@@ -25931,6 +26283,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
@@ -26273,6 +26629,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -26588,6 +26948,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -26902,6 +27266,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -27208,6 +27576,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -27528,6 +27900,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
@@ -27819,6 +28195,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -28113,6 +28493,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -28386,6 +28770,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -28685,6 +29073,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -28962,6 +29354,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -29240,6 +29636,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -29518,6 +29918,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -29795,6 +30199,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -30074,6 +30482,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  Trader/Constraint_Visitors.h Trader/Trader.h \
@@ -30364,6 +30776,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  Trader/Constraint_Visitors.h Trader/Trader.h \
@@ -30655,6 +31071,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
@@ -30950,6 +31370,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  Trader/Constraint_Visitors.h Trader/Trader.h \
@@ -31241,6 +31665,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  Trader/Constraint_Visitors.h Trader/Trader.h \
@@ -31532,6 +31960,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
@@ -31821,6 +32253,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
@@ -32109,6 +32545,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
@@ -32396,6 +32836,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Trader/Service_Type_Repository.h Trader/Trader.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
@@ -32685,6 +33129,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
@@ -32981,6 +33429,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
@@ -33274,6 +33726,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
@@ -33569,6 +34025,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
@@ -33857,6 +34317,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
@@ -34132,6 +34596,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
@@ -34403,6 +34871,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i
 .obj/CC_LockSet.o .obj/CC_LockSet.so .shobj/CC_LockSet.o .shobj/CC_LockSet.so: Concurrency/CC_LockSet.cpp Concurrency/CC_LockSet.h \
@@ -34673,6 +35145,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
@@ -34946,6 +35422,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
@@ -35220,6 +35700,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
  Concurrency/Concurrency_Utils.h Concurrency/CC_LockSetFactory.h \
@@ -35493,6 +35977,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Logger_i.h \
@@ -35767,6 +36255,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
@@ -36047,6 +36539,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -36328,6 +36824,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -36640,6 +37140,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -36929,6 +37433,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -37216,6 +37724,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
@@ -37507,6 +38019,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
@@ -37778,6 +38294,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -38054,6 +38574,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -38325,6 +38849,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i
@@ -38598,6 +39126,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
@@ -38872,6 +39404,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -39141,6 +39677,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -39410,6 +39950,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -39679,6 +40223,10 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  Naming/Naming_Utils.h \
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile
index 1e9330abec9..89f67ae801c 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile
@@ -234,6 +234,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -244,8 +246,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -381,6 +381,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
@@ -517,6 +521,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -527,8 +533,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -664,6 +668,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
@@ -799,6 +807,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -809,8 +819,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -946,6 +954,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
@@ -1081,6 +1093,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1091,8 +1105,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1228,6 +1240,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i
 .obj/CC_command.tab.o .obj/CC_command.tab.so .shobj/CC_command.tab.o .shobj/CC_command.tab.so: CC_command.tab.cpp CC_command.h \
@@ -1348,6 +1364,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1358,8 +1376,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1495,6 +1511,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i
 .obj/lex.CC_command.o .obj/lex.CC_command.so .shobj/lex.CC_command.o .shobj/lex.CC_command.so: lex.CC_command.cpp \
@@ -1616,6 +1636,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1626,8 +1648,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1763,6 +1783,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
  CC_command.tab.h
@@ -1884,6 +1908,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1894,8 +1920,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2031,6 +2055,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
  CC_test_utils.h CC_naming_service.h \
@@ -2168,6 +2196,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2178,8 +2208,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2315,6 +2343,10 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
  CC_naming_service.h \
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/Makefile b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
index a04e5b16164..3b2d077207e 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
@@ -163,6 +163,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -173,8 +175,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -310,6 +310,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -531,6 +535,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -541,8 +547,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -678,6 +682,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
@@ -810,6 +818,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -820,8 +830,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -957,6 +965,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
index 426411043a8..386e957efce 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
@@ -190,6 +190,8 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -200,8 +202,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -337,6 +337,10 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -473,6 +477,8 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -483,8 +489,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -620,6 +624,10 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
@@ -767,6 +775,8 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -777,8 +787,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -914,6 +922,10 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
diff --git a/TAO/orbsvcs/tests/EC_Basic/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile
index 289bbe2ab01..17d9bceb0ea 100644
--- a/TAO/orbsvcs/tests/EC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/EC_Basic/Makefile
@@ -165,6 +165,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -175,8 +177,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -312,6 +312,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index 0d7f8a3cc9d..53ae696d6fb 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -188,6 +188,8 @@ realclean:
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -198,8 +200,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -335,6 +335,10 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -546,6 +550,8 @@ realclean:
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -556,8 +562,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -693,6 +697,10 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -893,6 +901,8 @@ realclean:
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -903,8 +913,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1040,6 +1048,10 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  dataC.i dataS.h dataS_T.h dataS_T.i dataS_T.cpp dataS.i
 .obj/dataS.o .obj/dataS.so .shobj/dataS.o .shobj/dataS.so: dataS.cpp dataS.h dataC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1158,6 +1170,8 @@ realclean:
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1168,8 +1182,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1305,6 +1317,10 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  dataC.i dataS_T.h dataS_T.i dataS_T.cpp dataS.i
 .obj/ECM_Data.o .obj/ECM_Data.so .shobj/ECM_Data.o .shobj/ECM_Data.so: ECM_Data.cpp ECM_Data.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
@@ -1427,6 +1443,8 @@ realclean:
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1437,8 +1455,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1571,6 +1587,10 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  dataC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index 872dd6e4a53..6d9e391235d 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile
@@ -167,6 +167,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -177,8 +179,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -314,6 +314,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -357,6 +361,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \
  EC_Mcast.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index 76d245b5690..ff901c5fd09 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -165,6 +165,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -175,8 +177,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -312,6 +312,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index 008be36af31..cc9d93e30c3 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -188,6 +188,8 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -198,8 +200,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -335,6 +335,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -349,9 +353,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- ECT_Supplier.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
+ ECT_Supplier.h ECT_Driver.h ECT_Driver.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
@@ -369,8 +371,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
- ECT_Driver.h ECT_Driver.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp
 .obj/ECT_Consumer.o .obj/ECT_Consumer.so .shobj/ECT_Consumer.o .shobj/ECT_Consumer.so: ECT_Consumer.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -499,6 +500,8 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -509,8 +512,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -646,6 +647,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -660,9 +665,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- ECT_Consumer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
+ ECT_Consumer.h ECT_Driver.h ECT_Driver.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
@@ -680,8 +683,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
- ECT_Driver.h ECT_Driver.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp
 .obj/ECT_Throughput.o .obj/ECT_Throughput.so .shobj/ECT_Throughput.o .shobj/ECT_Throughput.so: ECT_Throughput.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -706,6 +708,8 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
@@ -810,6 +814,8 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -820,8 +826,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -957,6 +961,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
@@ -1052,8 +1060,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i \
  ECT_Throughput.h ECT_Driver.h ECT_Driver.i ECT_Consumer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
@@ -1185,6 +1191,8 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1195,8 +1203,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1332,6 +1338,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
@@ -1498,6 +1508,8 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1508,8 +1520,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1645,6 +1655,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile
index 282db7442e9..65c56c07f0b 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Makefile
+++ b/TAO/orbsvcs/tests/Event_Latency/Makefile
@@ -177,6 +177,8 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -187,8 +189,6 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -323,6 +323,10 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile
index 4e6466d7522..9c99c15f7b0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile
@@ -29,7 +29,7 @@ PROG_SRCS = \
             nestea_client_i.cpp \
             nestea_server_i.cpp \
             nestea_i.cpp \
-            IR_Helper.cpp 
+            IR_Helper.cpp
 
 SRC=$(IDL_SRC) $(PROG_SRCS)
 
@@ -245,6 +245,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -255,8 +257,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -392,6 +392,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  AirplaneC.i AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i
 .obj/AirplaneC.o .obj/AirplaneC.so .shobj/AirplaneC.o .shobj/AirplaneC.so: AirplaneC.cpp AirplaneC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -510,6 +514,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -520,8 +526,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -657,6 +661,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  AirplaneC.i AirplaneS.h AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp \
  AirplaneS.i
 .obj/NesteaS.o .obj/NesteaS.so .shobj/NesteaS.o .shobj/NesteaS.so: NesteaS.cpp NesteaS.h NesteaC.h \
@@ -776,6 +784,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -786,8 +796,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -923,6 +931,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i
 .obj/NesteaC.o .obj/NesteaC.so .shobj/NesteaC.o .shobj/NesteaC.so: NesteaC.cpp NesteaC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1041,6 +1053,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1051,8 +1065,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1188,6 +1200,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  NesteaC.i NesteaS.h NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i
 .obj/Repository_Test.o .obj/Repository_Test.so .shobj/Repository_Test.o .shobj/Repository_Test.so: Repository_Test.cpp \
  ../../ImplRepo_Service/Repository.h \
@@ -1388,6 +1404,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1398,8 +1416,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1535,6 +1551,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  AirplaneC.i
 .obj/airplane_server.o .obj/airplane_server.so .shobj/airplane_server.o .shobj/airplane_server.so: airplane_server.cpp airplane_server_i.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -1664,6 +1684,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1671,8 +1693,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1802,6 +1822,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  AirplaneC.i AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i \
  IR_Helper.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
@@ -1927,6 +1951,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1937,8 +1963,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2074,6 +2098,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  AirplaneC.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
@@ -2207,6 +2235,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2214,8 +2244,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2345,6 +2373,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  AirplaneC.i AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i \
  IR_Helper.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
@@ -2473,6 +2505,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2483,8 +2517,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2620,6 +2652,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  AirplaneC.i AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i
 .obj/nestea_client.o .obj/nestea_client.so .shobj/nestea_client.o .shobj/nestea_client.so: nestea_client.cpp nestea_client_i.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2738,6 +2774,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2748,8 +2786,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2885,6 +2921,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  NesteaC.h NesteaC.i
 .obj/nestea_server.o .obj/nestea_server.so .shobj/nestea_server.o .shobj/nestea_server.so: nestea_server.cpp nestea_server_i.h \
  $(TAO_ROOT)/tao/TAO.h \
@@ -3014,6 +3054,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3021,8 +3063,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3152,6 +3192,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i IR_Helper.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
@@ -3275,6 +3319,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3285,8 +3331,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3422,6 +3466,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  NesteaC.h NesteaC.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
@@ -3555,6 +3603,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3562,8 +3612,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3693,6 +3741,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i IR_Helper.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
@@ -3820,6 +3872,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3830,8 +3884,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3967,6 +4019,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i \
  $(ACE_ROOT)/ace/FILE_Connector.h \
  $(ACE_ROOT)/ace/FILE_IO.h \
@@ -4106,6 +4162,8 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -4113,8 +4171,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4244,6 +4300,10 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
diff --git a/TAO/orbsvcs/tests/Logger/Makefile b/TAO/orbsvcs/tests/Logger/Makefile
index c67ac6732ac..0c5fc5eb0c6 100644
--- a/TAO/orbsvcs/tests/Logger/Makefile
+++ b/TAO/orbsvcs/tests/Logger/Makefile
@@ -176,6 +176,8 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -186,8 +188,6 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -323,6 +323,10 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -470,6 +474,8 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -480,8 +486,6 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -609,6 +613,10 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.h \
diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index a4c57b9f191..cd659965f69 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -187,6 +187,8 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -194,8 +196,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -325,6 +325,10 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
@@ -511,6 +515,8 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -518,8 +524,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -617,6 +621,10 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile
index 403fc7a1a71..14c6630530a 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile
@@ -164,6 +164,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -174,8 +176,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -311,6 +311,10 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
index c437ef035aa..97b490102f8 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile
@@ -181,6 +181,8 @@ realclean:
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -191,8 +193,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -328,6 +328,10 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  test_objectC.i test_objectS.h test_objectS_T.h test_objectS_T.i \
  test_objectS_T.cpp test_objectS.i
 .obj/test_objectS.o .obj/test_objectS.so .shobj/test_objectS.o .shobj/test_objectS.so: test_objectS.cpp test_objectS.h test_objectC.h \
@@ -447,6 +451,8 @@ realclean:
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -457,8 +463,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -594,6 +598,10 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  test_objectC.i test_objectS_T.h test_objectS_T.i test_objectS_T.cpp \
  test_objectS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client.h \
@@ -713,6 +721,8 @@ realclean:
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -723,8 +733,6 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -860,6 +868,10 @@ realclean:
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile
index cf9580248a5..460e177df85 100644
--- a/TAO/orbsvcs/tests/Time/Makefile
+++ b/TAO/orbsvcs/tests/Time/Makefile
@@ -185,6 +185,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -195,8 +197,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -332,6 +332,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -475,6 +479,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -485,8 +491,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -622,6 +626,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 902812c9e1d..f54c08ff643 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -62,6 +62,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 .PRECIOUS: TTestS.cpp TTestS.h TTestC.cpp TTestC.h
 
+ifneq ($(BIN),)
+ifeq ($(SHLIB), $(findstring $(SHLIB), $(BUILD)))
+$(BIN): $(SHLIB)
+endif
+ifeq ($(LIB), $(findstring $(LIB), $(BUILD)))
+$(BIN): $(LIB)
+endif
+endif # BIN
+
 clean:
 	-$(RM) *.o $(BIN) obj.* core Templates.DB .make.state
 
@@ -192,6 +201,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -202,8 +213,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -339,6 +348,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  TTestC.i TTestS.h TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i
 .obj/TTestS.o .obj/TTestS.so .shobj/TTestS.o .shobj/TTestS.so: TTestS.cpp TTestS.h TTestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -457,6 +470,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -467,8 +482,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -604,6 +617,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i
 .obj/TT_Info.o .obj/TT_Info.so .shobj/TT_Info.o .shobj/TT_Info.so: TT_Info.cpp TT_Info.h TTestS.h TTestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -722,6 +739,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -732,8 +751,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -869,6 +886,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
  $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -876,13 +897,27 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
 .obj/Service_Type_Exporter.o .obj/Service_Type_Exporter.so .shobj/Service_Type_Exporter.o .shobj/Service_Type_Exporter.so: Service_Type_Exporter.cpp \
  Service_Type_Exporter.h TT_Info.h TTestS.h TTestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1001,6 +1036,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1011,8 +1048,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1148,13 +1183,21 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
  $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i
 .obj/Offer_Exporter.o .obj/Offer_Exporter.so .shobj/Offer_Exporter.o .shobj/Offer_Exporter.so: Offer_Exporter.cpp Offer_Exporter.h TT_Info.h \
  TTestS.h TTestC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1273,6 +1316,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1283,8 +1328,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1420,6 +1463,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
  $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -1427,6 +1474,10 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
  Simple_Dynamic.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
@@ -1435,6 +1486,16 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  Simple_Dynamic.cpp
 .obj/Offer_Importer.o .obj/Offer_Importer.so .shobj/Offer_Importer.o .shobj/Offer_Importer.so: Offer_Importer.cpp Offer_Importer.h TT_Info.h \
  TTestS.h TTestC.h \
@@ -1554,6 +1615,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1564,8 +1627,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1701,6 +1762,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
  $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -1708,13 +1773,27 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
 .obj/Simple_Dynamic.o .obj/Simple_Dynamic.so .shobj/Simple_Dynamic.o .shobj/Simple_Dynamic.so: Simple_Dynamic.cpp Simple_Dynamic.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
@@ -1836,6 +1915,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1846,8 +1927,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1983,12 +2062,30 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  Simple_Dynamic.cpp
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
index 4e3145462e7..2e4629e5099 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
@@ -193,6 +193,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -203,8 +205,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -340,6 +340,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
index a0beb176254..4518072eeb2 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
@@ -209,6 +209,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -219,8 +221,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -356,6 +356,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
 .obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubitS.h cubitC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -474,6 +478,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -484,8 +490,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -621,6 +625,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
 .obj/Cubit_Server.o .obj/Cubit_Server.so .shobj/Cubit_Server.o .shobj/Cubit_Server.so: Cubit_Server.cpp Cubit_Server.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -757,6 +765,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -764,8 +774,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -894,6 +902,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.h cubitC.i Cubit_i.h cubitS.h cubitS_T.h cubitS_T.i \
  cubitS_T.cpp cubitS.i \
  $(TAO_ROOT)/tao/TAO_Internal.h
@@ -1032,6 +1044,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1039,8 +1053,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1169,6 +1181,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.h cubitC.i Cubit_i.h cubitS.h cubitS_T.h cubitS_T.i \
  cubitS_T.cpp cubitS.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
@@ -1304,6 +1320,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1314,8 +1332,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1450,6 +1466,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.h cubitC.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
@@ -1580,6 +1600,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1590,8 +1612,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1726,6 +1746,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.h cubitC.i Cubit_Server.h \
  $(TAO_ROOT)/tao/TAO.h \
  Cubit_i.h cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
@@ -1853,6 +1877,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1863,8 +1889,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1999,6 +2023,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.h cubitC.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
@@ -2133,6 +2161,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2143,8 +2173,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2279,6 +2307,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.h cubitC.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
@@ -2401,6 +2433,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2411,8 +2445,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2548,6 +2580,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i
 .obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp cubitC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2666,6 +2702,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2676,8 +2714,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2813,6 +2849,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i
 .obj/Cubit_i.o .obj/Cubit_i.so .shobj/Cubit_i.o .shobj/Cubit_i.so: Cubit_i.cpp \
  $(TAO_ROOT)/tao/corba.h \
@@ -2931,6 +2971,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2941,8 +2983,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3078,6 +3118,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
index 49b7aa49319..0d3afcd33ee 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
@@ -70,7 +70,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 CPPFLAGS += -DDEBUG
 
 LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) 
+CPPFLAGS += -I$(TAO_ROOT)
 
 # pccTimer will eventually get integrated into ACE.  It is specific for ClassiX on VME
 ifdef CHORUS
@@ -218,6 +218,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -228,8 +230,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -365,6 +365,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
 .obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubitS.h cubitC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -483,6 +487,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -493,8 +499,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -630,6 +634,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -754,6 +762,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -764,8 +774,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -901,6 +909,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TAO.h \
  cubit_i.h cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i \
  cubitS_T.cpp cubitS.i Task_Client.h \
@@ -1026,6 +1038,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1036,8 +1050,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1173,6 +1185,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubit_i.h cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i \
  cubitS_T.cpp cubitS.i Task_Client.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -1347,6 +1363,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1357,8 +1375,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1461,6 +1477,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i cubit_i.h cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp \
  cubitS.i Globals.h Timer.h \
  $(ACE_ROOT)/ace/Stats.h \
@@ -1590,6 +1610,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1600,8 +1622,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1737,6 +1757,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TAO.h \
  cubit_i.h cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i \
  cubitS_T.cpp cubitS.i Task_Client.h \
@@ -1906,6 +1930,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1916,8 +1942,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2020,6 +2044,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i cubit_i.h cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp \
  cubitS.i Globals.h Timer.h
 .obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp cubitC.h \
@@ -2139,6 +2167,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2149,8 +2179,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2286,6 +2314,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i
 .obj/Cubit_Task.o .obj/Cubit_Task.so .shobj/Cubit_Task.o .shobj/Cubit_Task.so: Cubit_Task.cpp \
  $(ACE_ROOT)/ace/Sched_Params.h \
@@ -2458,6 +2490,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2465,8 +2499,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2561,6 +2593,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i \
  $(TAO_ROOT)/tao/TAO_Internal.h
 .obj/Globals.o .obj/Globals.so .shobj/Globals.o .shobj/Globals.so: Globals.cpp Globals.h \
@@ -2768,6 +2804,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2778,8 +2816,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2882,6 +2918,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  cubitC.i cubit_i.h cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp \
  cubitS.i Globals.h
 
diff --git a/TAO/performance-tests/Thruput/TAO/Makefile b/TAO/performance-tests/Thruput/TAO/Makefile
index 32f87e4eb55..c12e841eabb 100644
--- a/TAO/performance-tests/Thruput/TAO/Makefile
+++ b/TAO/performance-tests/Thruput/TAO/Makefile
@@ -180,6 +180,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -190,8 +192,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -327,6 +327,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ttcpC.i ttcpS.h ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i
 .obj/ttcpS.o .obj/ttcpS.so .shobj/ttcpS.o .shobj/ttcpS.so: ttcpS.cpp ttcpS.h ttcpC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -445,6 +449,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -455,8 +461,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -592,6 +596,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ttcpC.i ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/ACE.h \
@@ -715,6 +723,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -725,8 +735,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -862,6 +870,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ttcpC.i ttcp_decl.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -985,6 +997,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -995,8 +1009,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1132,6 +1144,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ttcpC.i ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i ttcp_decl.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -1257,6 +1273,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1267,8 +1285,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1404,6 +1420,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ttcpC.i ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i
 .obj/utils.o .obj/utils.so .shobj/utils.o .shobj/utils.so: utils.cpp ttcpC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1522,6 +1542,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1532,8 +1554,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1669,6 +1689,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ttcpC.i ttcp_decl.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -1791,6 +1815,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1801,8 +1827,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1938,6 +1962,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ttcpC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 07960a9807d..f464b75d078 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -85,6 +85,9 @@ ORB_CORE_FILES = \
   MProfile \
   Stub \
   Typecode \
+  ValueBase \
+  ValueFactory \
+  ValueFactory_Map \
   CDR \
   Client_Strategy_Factory \
   Connect \
@@ -6032,7 +6035,6 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
@@ -6171,6 +6173,8 @@ realclean:
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/ValueFactory_Map.h \
+ $(TAO_ROOT)/tao/ValueFactory_Map.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h
 .obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp \
@@ -6597,8 +6601,9 @@ realclean:
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i TimeBaseC.i \
- TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i
+ $(TAO_ROOT)/tao/Any.i \
+ TimeBaseC.i TimeBaseS.h TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp \
+ TimeBaseS.i
 .obj/TimeBaseS.o .obj/TimeBaseS.so .shobj/TimeBaseS.o .shobj/TimeBaseS.so: TimeBaseS.cpp TimeBaseS.h TimeBaseC.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
@@ -6676,8 +6681,8 @@ realclean:
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i TimeBaseC.i \
- TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i
+ $(TAO_ROOT)/tao/Any.i \
+ TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i
 .obj/Principal.o .obj/Principal.so .shobj/Principal.o .shobj/Principal.so: Principal.cpp \
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -7510,6 +7515,384 @@ realclean:
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/debug.h
+.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(ACE_ROOT)/ace/Module.h \
+ $(ACE_ROOT)/ace/Module.i \
+ $(ACE_ROOT)/ace/Module.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Stream_Modules.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i
+.obj/ValueFactory.o .obj/ValueFactory.so .shobj/ValueFactory.o .shobj/ValueFactory.so: ValueFactory.cpp \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
+.obj/ValueFactory_Map.o .obj/ValueFactory_Map.so .shobj/ValueFactory_Map.o .shobj/ValueFactory_Map.so: ValueFactory_Map.cpp \
+ $(TAO_ROOT)/tao/ValueFactory_Map.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/ValueFactory_Map.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/ORB.i
 .obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
@@ -9973,7 +10356,8 @@ realclean:
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/PolicyC.i
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
 .obj/IOR_LookupTable.o .obj/IOR_LookupTable.so .shobj/IOR_LookupTable.o .shobj/IOR_LookupTable.so: IOR_LookupTable.cpp \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Synch_T.h \
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 29f6d891337..7a0c1a38f2e 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -33,6 +33,10 @@
 #include "tao/Object_Adapter.h"
 #include "tao/POA.h"
 #include "tao/Request.h"
+#ifdef TAO_HAS_VALUETYPE
+#  include "tao/ValueFactory_Map.h"
+#endif /* TAO_HAS_VALUETYPE */
+
 
 #if !defined (__ACE_INLINE__)
 # include "tao/ORB.i"
@@ -134,6 +138,9 @@ CORBA_ORB::CORBA_ORB (TAO_ORB_Core* orb_core)
     event_service_ (CORBA_Object::_nil ()),
     trading_service_ (CORBA_Object::_nil ()),
     orb_core_ (orb_core),
+# ifdef TAO_HAS_VALUETYPE
+    valuetype_factory_map_ (0),
+# endif /* TAO_HAS_VALUETYPE */
     use_omg_ior_format_ (1),
     optimize_collocation_objects_ (1)
 {
@@ -180,6 +187,10 @@ CORBA_ORB::~CORBA_ORB (void)
     CORBA::release (this->event_service_);
   if (!CORBA::is_nil (this->trading_service_))
     CORBA::release (this->trading_service_);
+# ifdef TAO_HAS_VALUETYPE
+  // delete valuetype_factory_map_;
+  // not really, its a singleton
+# endif /* TAO_HAS_VALUETYPE */
 
   delete this->cond_become_leader_;
 }
@@ -647,8 +658,8 @@ CORBA_ORB::multicast_query (char *buf,
 
           // Length of data to be sent. This is sent as a header.
           CORBA::Short data_len =
-            ACE_HTONS (sizeof (ACE_UINT16) 
-                       + ACE_OS::strlen (service_name)); 
+            ACE_HTONS (sizeof (ACE_UINT16)
+                       + ACE_OS::strlen (service_name));
 
           // Vector to be sent.
           const int iovcnt = 3;
@@ -734,7 +745,7 @@ CORBA_ORB::multicast_query (char *buf,
         }
     }
 
-  // We don't need the dgram or acceptor anymore.  
+  // We don't need the dgram or acceptor anymore.
   dgram.close ();
   acceptor.close ();
 
@@ -1714,7 +1725,7 @@ CORBA_ORB::_tao_find_in_IOR_table (ACE_CString &object_id,
 // The following functions are not implemented - they just throw
 // CORBA::NO_IMPLEMENT.
 
-void 
+void
 CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &,
                                CORBA_Environment &ACE_TRY_ENV)
 {
@@ -1722,7 +1733,7 @@ CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &,
                                   CORBA::COMPLETED_NO));
 }
 
-void 
+void
 CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &,
                                   CORBA_Environment &ACE_TRY_ENV)
 {
@@ -1730,7 +1741,7 @@ CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &,
                                   CORBA::COMPLETED_NO));
 }
 
-void 
+void
 CORBA_ORB::create_context_list (CORBA::ContextList_ptr &,
                                 CORBA_Environment &ACE_TRY_ENV)
 {
@@ -1738,7 +1749,7 @@ CORBA_ORB::create_context_list (CORBA::ContextList_ptr &,
                                   CORBA::COMPLETED_NO));
 }
 
-void 
+void
 CORBA_ORB::get_default_context (CORBA::Context_ptr &,
                                 CORBA_Environment &ACE_TRY_ENV)
 {
@@ -1746,7 +1757,7 @@ CORBA_ORB::get_default_context (CORBA::Context_ptr &,
                                   CORBA::COMPLETED_NO));
 }
 
-void 
+void
 CORBA_ORB::create_environment (CORBA::Environment_ptr &,
                                CORBA_Environment &ACE_TRY_ENV)
 {
@@ -1754,7 +1765,7 @@ CORBA_ORB::create_environment (CORBA::Environment_ptr &,
                                   CORBA::COMPLETED_NO));
 }
 
-void 
+void
 CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq,
                                           CORBA_Environment &ACE_TRY_ENV)
 {
@@ -1762,7 +1773,7 @@ CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq,
                                   CORBA::COMPLETED_NO));
 }
 
-void 
+void
 CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq,
                                             CORBA_Environment &ACE_TRY_ENV)
 {
@@ -1770,7 +1781,7 @@ CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq,
                                   CORBA::COMPLETED_NO));
 }
 
-void 
+void
 CORBA_ORB::get_next_response (CORBA_Request_ptr &,
                               CORBA_Environment &ACE_TRY_ENV)
 {
@@ -1778,7 +1789,7 @@ CORBA_ORB::get_next_response (CORBA_Request_ptr &,
                                   CORBA::COMPLETED_NO));
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 CORBA_ORB::poll_next_response (CORBA_Environment &ACE_TRY_ENV)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
@@ -1853,6 +1864,74 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x)
   return cdr.good_bit ();
 }
 
+// *************************************************************
+// Valuetype factory operations
+// *************************************************************
+
+#ifdef TAO_HAS_VALUETYPE
+
+CORBA::ValueFactory_ptr
+CORBA_ORB::register_value_factory (
+                            const char *repository_id,
+                            CORBA::ValueFactory_ptr factory,
+                            CORBA_Environment &ACE_TRY_ENV)
+{
+// %! guard, and ACE_Null_Mutex in the map
+// do _add_ref here not in map->rebind
+
+  if (valuetype_factory_map_ == 0)
+    {
+      // currently the ValueFactory_Map is a singleton and not per ORB
+      // as in the OMG specs
+      valuetype_factory_map_ = TAO_VALUEFACTORY_MAP::instance ();
+      if (valuetype_factory_map_ == 0)
+        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    }
+
+  int result = valuetype_factory_map_->rebind (repository_id, factory);
+  if (result == -1)
+    {
+      // Error on bind.
+      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    }
+  if (result == 1)
+    {
+      return factory;    // previous factory was found
+    }
+  return 0;
+}
+
+void
+CORBA_ORB::unregister_value_factory (const char * repository_id,
+                                     CORBA_Environment &ACE_TRY_ENV)
+{
+  ACE_ERROR((LM_ERROR, "(%N:%l) function not implemented\n"));
+  // %! TODO
+}
+
+CORBA::ValueFactory_ptr
+CORBA_ORB::lookup_value_factory (const char *repository_id,
+                                 CORBA_Environment &ACE_TRY_ENV)
+{
+// %! guard
+// do _add_ref here not in map->find
+  if (valuetype_factory_map_)
+    {
+      CORBA::ValueFactory_ptr factory;
+      int result = valuetype_factory_map_->find (repository_id, factory);
+      if (result == -1)
+        factory = 0;  // %! raise exception !
+      return factory;
+    }
+  else
+    {
+      return 0; // %! raise exception !
+    }
+}
+
+#endif /* TAO_HAS_VALUETYPE */
+
+
 // ****************************************************************
 
 #define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index cacd02a72e9..f8147d8500d 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -69,6 +69,10 @@ class TAO_Server_Strategy_Factory;
 class TAO_ORB_Parameters;
 class TAO_InputCDR;
 class TAO_OutputCDR;
+#ifdef TAO_HAS_VALUETYPE
+class TAO_ValueFactory_Map;
+#endif /* TAO_HAS_VALUETYPE */
+
 
 // The new (POA) base class for servants.
 class TAO_ServantBase;
@@ -263,6 +267,20 @@ public:
   // this is typically eventually given to <string_to_object()> as an
   // argument.
 
+#ifdef TAO_HAS_VALUETYPE
+  // Value factory operations  (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7)
+  CORBA::ValueFactory_ptr register_value_factory (
+                            const char *repository_id,
+                            CORBA::ValueFactory_ptr factory,
+                            CORBA_Environment &ACE_TRY_ENV =
+                                CORBA::default_environment () );
+  void unregister_value_factory (const char * repository_id,
+                                 CORBA_Environment &ACE_TRY_ENV =
+                                     CORBA::default_environment () );
+  CORBA::ValueFactory_ptr lookup_value_factory (const char *repository_id,
+           CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment () );
+#endif /* TAO_HAS_VALUETYPE */
+
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
   void create_list (CORBA::Long count,
@@ -426,8 +444,8 @@ public:
   // Resolve the POA.
 
   TAO_Stub *create_stub_object (const TAO_ObjectKey &key,
-				const char *type_id,
-				CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+                                const char *type_id,
+                                CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Makes sure that the ORB is open and then creates an IIOP object
   // based on the endpoint.
 
@@ -514,7 +532,7 @@ protected:
 private:
 
   CORBA_Object_ptr resolve_service (CORBA::String service_name,
-				    ACE_Time_Value *timeout,
+                                    ACE_Time_Value *timeout,
                                     CORBA::Environment& ACE_TRY_ENV);
   // Resolve the service name.
 
@@ -523,9 +541,9 @@ private:
   // Resolve the trading object reference.
 
   int multicast_query (char *buf,
-		       const char *service_name,
-		       u_short port,
-		       ACE_Time_Value *timeout);
+                       const char *service_name,
+                       u_short port,
+                       ACE_Time_Value *timeout);
 
   // returns and IOR string, the client is responsible for freeing
   // memory!
@@ -606,6 +624,11 @@ private:
   TAO_ORB_Core* orb_core_;
   // The ORB_Core that created us....
 
+#ifdef TAO_HAS_VALUETYPE
+  TAO_ValueFactory_Map *valuetype_factory_map_;
+  // If non-0 then this is the Factory for OBV unmarshaling
+#endif /* TAO_HAS_VALUETYPE */
+
   TAO_IOR_LookupTable lookup_table_;
   // Table of ObjectID->IOR mappings.
 
diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp
new file mode 100644
index 00000000000..d42501aa56a
--- /dev/null
+++ b/TAO/tao/ValueBase.cpp
@@ -0,0 +1,259 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//     TAO
+//
+// = FILENAME
+//     ValueBase.cpp
+//
+// = AUTHOR
+//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+
+#include "tao/CDR.h"
+#include "tao/ORB.h"
+#include "tao/ORB_Core.h"
+#include "tao/ValueBase.h"
+
+#ifdef TAO_HAS_VALUETYPE
+
+#if !defined (__ACE_INLINE__)
+# include "tao/ValueBase.i"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID(tao, ValueBase, "$Id$")
+
+
+// destructor
+CORBA_ValueBase::~CORBA_ValueBase (void)
+{
+}
+
+CORBA_ValueBase*
+CORBA_ValueBase::_downcast (CORBA_ValueBase* vt)
+{
+  return vt;  // every vt is a CORBA::ValueBase :-)
+}
+
+
+// OBV marshaling in principle:
+// _tao_marshal () is called from the CDR operator<< ()
+// to marshal a valuetype. To marshal the state
+// it calls (virtual) _tao_marshal_v () (IDL generated) on itself
+// which 'jumps' to the most derived valuetype class. This function
+// further calls (inline) _tao_marshal_state, which is generated from
+// IDL too and does the marshaling of state members and base classes
+// (before, if any) actually.
+// Fragmentation (chunking) needs some cooperation with the CDR stream.
+// It needs to keep track of the state we're in:
+// (outside chunk, beginning of chunk - no data, inside chunk and
+// the nesting level of valuetypes. (The chunks itself are not nested.))
+
+// (see CORBA 2.3 GIOP 15.3.4)
+
+CORBA::Boolean
+CORBA_ValueBase::_tao_marshal (TAO_OutputCDR &strm,
+                               CORBA_ValueBase *this_,
+                               ptr_arith_t formal_type_id)
+{
+  CORBA::Boolean retval = 1;
+  // %! yet much to do ... look for +++ !
+
+  // 1. Is 'this' yet marshalled ? (->1a)
+  //    If not then mark 'this' as marshalled. (->2) +++
+  //    Or is it null ? (write null_ref and return ok)
+  // 1a. Put indirection and return successfull.
+
+  if (this_ == 0)
+    {
+      retval = strm.write_ulong (TAO_OBV_GIOP_Flags::Null_ref);
+      return retval;
+    }
+
+  // 2. if (chunking) and we are in a chunk (look in strm),
+  //    end the chunk by writing its length at its start.
+  //    This is the responsibility of the CDR stream. +++
+  //    But if nothing is writtern in this chunk yet,
+  //    we want to overwrite the place of the dummy blocksize-tag
+  //    with our <value-tag>.
+  //    Increase the nesting level of valuetypes.
+
+  // 3. Build <value-tag>, which states if chunking is used
+  //    and if type information ((list of) repository id(s))
+  //    is provided. The latter is necessary if the formal_type_id
+  //    is unequal the 'true derived' type of this object. +++
+
+  CORBA::ULong value_tag = TAO_OBV_GIOP_Flags::Value_tag_base |
+                           TAO_OBV_GIOP_Flags::Type_info_single;
+
+  retval = strm.write_ulong (value_tag);
+  if (!retval)
+    return retval;
+
+  // 4. Marshal type information.
+
+  retval = strm.write_string (this_->_tao_obv_repository_id ());
+  if (!retval)
+    return retval;
+
+  // 5. if (chunking) let room for a blocksize-tag. (i.e. write ULong)
+
+  // 6. Now marshal state members. (%! Problem when state is empty
+  //    and chunked encoding is used.)
+
+  retval = this_->_tao_marshal_v (strm);
+
+  // 7. if (chunking) let strm overwrite the last blocksize tag
+  //    with its concrete value.                                 +++
+  // 8. if (chunking) write an end tag, or (optimization) let the CDR
+  //    care for collecting all end tags of nested values (e.g. linked
+  //    list), so that only one end tag at all must be written.  +++
+
+  return retval;
+}
+
+
+CORBA::Boolean
+CORBA_ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
+                                  CORBA_ValueBase *& new_object)
+{
+  // This is for the special case only that one unmarshals in order
+  // to assign the newly created object directly to a ValueBase pointer.
+  // Implementation is like a specialized one (in TC.cpp, if T.idl is source).
+  // basically do:
+  //  ValueBase::_tao_unmarshal_pre ()
+  //    (Gets factory or possible a null or an existing object.
+  //     Then the job is done. On an existing (backreferenced) object
+  //     do a cast and a type check)
+  //  new_object = factory->create_for_unmarshal ()
+  //     (with apropriate cast)
+  //  new_object->_tao_unmarshal_v ()
+  //  new_object->_tao_unmarshal_post ()
+
+  ACE_DEBUG ((LM_DEBUG, "unimpl. CORBA::ValueBase::_tao_unmarshal\n"));
+  return 0; // %!
+}
+
+
+CORBA::Boolean
+CORBA_ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
+                                     CORBA_ValueFactory_ptr &factory,
+                                     CORBA_ValueBase *&valuetype,
+                                     const char * const repo_id)
+{ // %! dont leak on error case !
+  // %! postconditions
+  CORBA::Boolean retval = 1;
+  factory = 0;
+  // %! yet much to do ... look for +++ !
+
+  // 1. Get the <value-tag> (else it may be <indirection-tag> or <null-ref>).
+  //    Is object yet unmarshalled (<indirection-tag> is set) ? (->1a)
+  //    Is <null-ref> given ? Set 0 and return ok.
+  // 1a. Lookup the real address in memory, which should be aligned +++
+  //     to CORBA::ValueBase. Its possible at this point that worse
+  //     type mismatch gets by undetected, if the CDR stream fakes.
+  //     So the type should be checked ... +++
+
+  CORBA::ULong value_tag;
+  if (!strm.read_ulong (value_tag))
+    {
+      return 0;
+    }
+
+  if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag))
+    {
+      valuetype = 0;
+      return 1;
+      // ok, null reference unmarshaled
+    }
+  // 2. Now at this point it must be a <value-tag> (error else).
+  //    if (chunking) check that any last chunk ends with matching
+  //    size. If not raise marshal exception.
+  //    Increase the nesting level of valuetypes.
+
+  if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag))
+    {
+      ACE_DEBUG ((LM_DEBUG, "!CORBA::ValueBase::_tao_unmarshal_pre not value_tag\n"));
+      return 0;
+    }
+
+  // 3. if (chunking) read and record the blocksize-tag.
+
+  // 4. Unmarshal type information and lookup factory.
+  //    If no type information is given in the CDR encoding, as told
+  //    from the <value-tag>, then use the repository id parameter
+  //    (it _must_ be right).
+
+  CORBA::String_var repo_id_stream;
+
+  // It would be more efficient not to copy the string %!)
+  if (strm.read_string (repo_id_stream.inout ()) == 0)
+    {
+      return 0;
+    }
+
+  factory = TAO_ORB_Core_instance ()->orb ()   // @@ %! right way to access ?
+    ->lookup_value_factory (repo_id_stream.in());
+  if (factory == 0) // %! except.!
+    {
+      ACE_DEBUG ((LM_ERROR, "(%N:%l) OBV factory is null !!!\n"));
+      return 0;
+    }
+
+  return retval;
+}
+
+CORBA::Boolean
+CORBA_ValueBase::_tao_unmarshal_post (TAO_InputCDR &strm)
+{
+  CORBA::Boolean retval = 1;
+
+  // (... called from T::_tao_unmarshal)
+  // 7. if (chunking) check the last blocksize tag for correct value.  +++
+  //    And if we're gonna to truncate, skip all the state of the more
+  //    derived classes. (But it might need to be accessed again,
+  //    if there are embedded objects which are referenced later
+  //    in this CDR encoding stream.)
+
+  // 8. if (chunking) there must be some end tag. Let the CDR stream deal
+  //    with this (and decrease the nesting level of valuetypes).
+  //    Also the CDR stream must check for eventually outstanding end tags
+  //    at the end of the stream which have to cause a marshal
+  //    exception there.
+
+  return retval;
+}
+
+
+// member functions for CORBA_DefaultValueRefCountBase ============
+
+// destructor
+CORBA_DefaultValueRefCountBase::~CORBA_DefaultValueRefCountBase (void)
+{
+}
+
+void
+CORBA_DefaultValueRefCountBase::_add_ref (void)
+{
+  this->_tao_add_ref ();
+}
+
+void
+CORBA_DefaultValueRefCountBase::_remove_ref (void)
+{
+  this->_tao_remove_ref ();
+}
+
+CORBA::ULong
+CORBA_DefaultValueRefCountBase::_refcount_value (void)
+{
+  return this->_tao_refcount_value ();
+}
+
+
+
+#endif /* TAO_HAS_VALUETYPE */
diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h
new file mode 100644
index 00000000000..ceb24153731
--- /dev/null
+++ b/TAO/tao/ValueBase.h
@@ -0,0 +1,176 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//     TAO
+//
+// = FILENAME
+//     ValueBase.h
+//
+// = AUTHOR
+//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#ifndef TAO_VALUEBASE_H
+#define TAO_VALUEBASE_H
+
+#include "ace/OS.h"           /* for ptr_arith_t */
+#include "tao/corbafwd.h"
+
+#ifdef TAO_HAS_VALUETYPE
+
+
+class TAO_Export CORBA_ValueBase
+{
+  // = TITLE
+  //   Abstract baseclass for Valuetypes
+  //   (see CORBA 2.3 20.17.5)
+
+public:
+  // reference counting
+  virtual void _add_ref (void) = 0;
+  virtual void _remove_ref (void) = 0;
+  // %! virtual CORBA::ValueBase* _copy_value (void) = 0;
+  virtual CORBA::ULong _refcount_value (void) = 0;
+
+  // dynamic casting
+  static CORBA::ValueBase* _downcast (CORBA::ValueBase*);
+
+  virtual const char* _tao_obv_repository_id () const = 0;
+  // TAO extension
+
+  // TAO internal --------------------------
+
+  static CORBA::Boolean _tao_marshal (TAO_OutputCDR &strm,
+                                      CORBA_ValueBase *_this,
+                               ptr_arith_t formal_type_id = 0);
+  // Marshal a valuetype (see operator<< in tao_idl generated file
+  // how it is called)
+
+  static CORBA::Boolean _tao_unmarshal (TAO_InputCDR &strm,
+                                        CORBA_ValueBase *&_this);
+  // Unmarshal a valuetype, if formal type is a pointer to ValueBase
+
+  // static CORBA::Boolean
+  // T::_tao_unmarshal (TAO_InputCDR &, CORBA_ValueBase *&_this)
+  // is typespecific for valuetype T and generated from tao_idl
+  // Use this for unmarshaling.
+
+  static CORBA::Boolean _tao_unmarshal_pre (TAO_InputCDR &strm,
+                                            CORBA_ValueFactory_ptr &,
+                                            CORBA_ValueBase *&,
+                                            const char * const repo_id);
+  CORBA::Boolean _tao_unmarshal_post (TAO_InputCDR &strm);
+  // Both used internally and are called from T::_tao_unmarshal ()
+
+
+public:  // otherwise these cannot be called from a static function
+  virtual void *_tao_obv_narrow (ptr_arith_t) = 0;
+
+  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) = 0;
+  // during marshal jump to the most derived part
+
+  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &) = 0;
+  // called after obtaining the fresh object from create_for_unmarshal ()
+
+protected:
+  CORBA_ValueBase (void);
+  CORBA_ValueBase (const CORBA_ValueBase&);
+  virtual ~CORBA_ValueBase ();
+
+private:
+  void operator= (const CORBA_ValueBase &);
+}; // CORBA_ValueBase
+
+
+
+
+class TAO_Export CORBA_DefaultValueRefCountBase : public virtual CORBA_ValueBase
+{
+  // = TITLE
+  //   Default mix-in for reference count of a valuetype.
+
+public:
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
+  virtual CORBA::ULong _refcount_value (void);
+
+  void _tao_add_ref (void);
+  void _tao_remove_ref (void);
+  CORBA::ULong _tao_refcount_value (void);
+  // The _tao variants are inline for fast access from T_var
+  // (if valuetype T is compiled with optimization for that.) %! (todo)
+
+protected:
+  CORBA_DefaultValueRefCountBase (void);
+  CORBA_DefaultValueRefCountBase (const CORBA_DefaultValueRefCountBase&);
+  virtual ~CORBA_DefaultValueRefCountBase ();
+
+private:
+  void operator= (const CORBA_DefaultValueRefCountBase &);
+
+private: // data
+  CORBA::ULong _tao_reference_count_;
+  ACE_SYNCH_MUTEX _tao_reference_count_lock_;
+}; // CORBA_DefaultValueRefCountBase
+
+// %! which lock has the lowest memory overhead ?
+// %! todo refcountbase w/o locking (now memory overhead)
+// $! todo: debug aids for refcounts
+
+
+class TAO_OBV_GIOP_Flags
+{
+  // CORBA 2.3: 15.3.4
+public:
+  enum Tag                                   // test:
+  {
+    Null_ref              =  0x00000000L,    // equal
+    Value_tag_base        =  0x7fffff00L,
+    Value_tag_sigbits     =  0xffffff00L,
+      Codebase_url        =  0x00000001L,    // and
+      Type_info_no        =  0x00000000L,
+      Type_info_single    =  0x00000002L,
+      Type_info_list      =  0x00000006L,
+      Type_info_sigbits   =  0x00000006L,
+      Chunked_encoding    =  0x00000008L,    // and
+    Indirection_tag       =  0xffffffffL,    // equal
+    Block_size_tag_min    =  1,              // range
+    Block_size_tag_max    =  0x7fffff00L -1,
+    // @@ %! but how encode a stateless block ?
+    End_tag_min           = -0x80000000L +1, // range
+    End_tag_max           = -1,
+    Indirection_min       = -0x80000000L +1, // range
+    Indirection_max       = -5,
+  };
+  // all flags without a comment are complete tested against
+  // the analog _sigbits mask.
+
+
+
+public:
+  static CORBA::Boolean is_null_ref  (const CORBA::ULong);
+  static CORBA::Boolean is_value_tag (const CORBA::ULong);
+  static CORBA::Boolean has_codebase_url (const CORBA::ULong);
+  static CORBA::Boolean has_no_type_info (const CORBA::ULong);
+  static CORBA::Boolean has_single_type_info (const CORBA::ULong);
+  static CORBA::Boolean has_list_type_info (const CORBA::ULong);
+  static CORBA::Boolean is_chunked (const CORBA::ULong);
+  static CORBA::Boolean is_indirection_tag  (const CORBA::ULong);
+  static CORBA::Boolean block_size (const CORBA::ULong, CORBA::ULong &size);
+  static CORBA::Boolean end_tag_depth (const CORBA::ULong, CORBA::ULong &d);
+  static CORBA::Boolean indirection (const CORBA::ULong, CORBA::Long &jump);
+  //  static CORBA::Boolean (const CORBA::ULong);
+  //  static CORBA::Boolean (const CORBA::ULong);
+
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/ValueBase.i"
+#endif /* __ACE_INLINE__) */
+
+#endif /* TAO_HAS_VALUETYPE */
+#endif /* TAO_VALUEBASE_H */
diff --git a/TAO/tao/ValueBase.i b/TAO/tao/ValueBase.i
new file mode 100644
index 00000000000..ed1679670ee
--- /dev/null
+++ b/TAO/tao/ValueBase.i
@@ -0,0 +1,175 @@
+// This may not look like C++, but it's really -*- C++ -*-
+// $Id$
+
+// static operations in namespace CORBA ========================
+
+ACE_INLINE void
+CORBA::add_ref (CORBA::ValueBase *val)
+{
+  if (val)
+    val->_add_ref ();
+}
+
+ACE_INLINE void
+CORBA::remove_ref (CORBA::ValueBase *val)
+{
+  if (val)
+    val->_remove_ref ();
+}
+
+// ===========================================================
+
+// constructor
+ACE_INLINE
+CORBA_ValueBase::CORBA_ValueBase (void)
+{
+}
+
+
+// ===========================================================
+
+// constructor
+ACE_INLINE
+CORBA_DefaultValueRefCountBase::CORBA_DefaultValueRefCountBase (void)
+    : _tao_reference_count_ (1)
+{
+}
+
+
+ACE_INLINE void
+CORBA_DefaultValueRefCountBase::_tao_add_ref (void)
+{
+  ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
+  ++_tao_reference_count_;
+}
+
+ACE_INLINE void
+CORBA_DefaultValueRefCountBase::_tao_remove_ref (void)
+{
+  {
+    ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
+    -- this->_tao_reference_count_;
+    if (this->_tao_reference_count_ != 0)
+      return;
+  }
+  // The guard has been already given up, but this is no problem
+  // cause we have held the last reference, and this one we don't give
+  // away anymore, we do:
+  delete this;
+}
+
+ACE_INLINE CORBA::ULong
+CORBA_DefaultValueRefCountBase::_tao_refcount_value (void)
+{
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_,0);
+  return _tao_reference_count_;
+}
+
+// ===========================================================
+
+// Detection of flags in the CDR Stream
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::is_null_ref (const CORBA::ULong tag)
+{
+  return (tag == Null_ref);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::is_value_tag (const CORBA::ULong tag)
+{
+  return ((tag & Value_tag_sigbits) == Value_tag_base);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags:: has_codebase_url(const CORBA::ULong tag)
+{
+  return (tag & Codebase_url);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::has_no_type_info (const CORBA::ULong tag)
+{
+  return ((tag & Type_info_sigbits) == Type_info_no);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::has_single_type_info (const CORBA::ULong tag)
+{
+  return ((tag & Type_info_sigbits) == Type_info_single);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::has_list_type_info (const CORBA::ULong tag)
+{
+  return ((tag & Type_info_sigbits) == Type_info_list);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags:: is_chunked (const CORBA::ULong tag)
+{
+  return (tag & Chunked_encoding);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::is_indirection_tag (const CORBA::ULong tag)
+{
+  return (tag == Indirection_tag);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags:: block_size (const CORBA::ULong tag, CORBA::ULong &size)
+{
+  if ((tag >= Block_size_tag_min) &&
+      (tag <= Block_size_tag_max))
+    {
+      size = tag;
+      return 1;
+    }
+  return 0;
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags:: end_tag_depth (const CORBA::ULong tag,
+                                    CORBA::ULong &depth)
+{
+  if (ACE_static_cast (CORBA::Long, tag)
+          >= (ACE_static_cast (CORBA::Long, End_tag_min)) &&
+      ACE_static_cast (CORBA::Long, tag)
+          <= (ACE_static_cast (CORBA::Long, End_tag_max)))
+    {
+      depth = - ACE_static_cast (CORBA::Long, tag);
+      return 1;
+    }
+  return 0;
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags:: indirection (const CORBA::ULong tag,
+                                  CORBA::Long &jump)
+{
+  if (ACE_static_cast (CORBA::Long, tag)
+          >= (ACE_static_cast (CORBA::Long, Indirection_min)) &&
+      ACE_static_cast (CORBA::Long, tag)
+          <= (ACE_static_cast (CORBA::Long, Indirection_max)))
+    {
+      jump = ACE_static_cast (CORBA::Long, tag);
+      return 1;
+    }
+  return 0;
+}
+
+/*
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags:: (const CORBA::ULong tag)
+{
+  return ( );
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags:: (const CORBA::ULong tag)
+{
+  return ( );
+}
+
+*/
diff --git a/TAO/tao/ValueFactory.cpp b/TAO/tao/ValueFactory.cpp
new file mode 100644
index 00000000000..6b8f049ca11
--- /dev/null
+++ b/TAO/tao/ValueFactory.cpp
@@ -0,0 +1,31 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//     TAO
+//
+// = FILENAME
+//     ValueFactory.cpp
+//
+// = AUTHOR
+//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+
+#include "tao/ValueFactory.h"
+
+#ifdef TAO_HAS_VALUETYPE
+
+#if !defined (__ACE_INLINE__)
+# include "tao/ValueFactory.i"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID(tao, ValueFactory, "$Id$")
+
+CORBA_ValueFactoryBase::~CORBA_ValueFactoryBase ()
+{
+}
+
+#endif /* TAO_HAS_VALUETYPE */
diff --git a/TAO/tao/ValueFactory.h b/TAO/tao/ValueFactory.h
new file mode 100644
index 00000000000..9b0557f2611
--- /dev/null
+++ b/TAO/tao/ValueFactory.h
@@ -0,0 +1,94 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//     TAO
+//
+// = FILENAME
+//     ValueFactory.h
+//
+// = AUTHOR
+//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#ifndef TAO_VALUEFACTORY_H
+#define TAO_VALUEFACTORY_H
+
+#include "tao/corbafwd.h"
+
+#ifdef TAO_HAS_VALUETYPE
+
+
+class TAO_Export CORBA_ValueFactoryBase
+{
+  /*  friend CORBA::Boolean _tao_unmarshal_pre (TAO_InputCDR &,
+                                            CORBA_ValueFactory_ptr &,
+                                            CORBA_ValueBase *&,
+                                            const char * const);
+  %! how can I make the friendship work ? (g++) */
+public:
+  CORBA_ValueFactoryBase ();
+  virtual ~CORBA_ValueFactoryBase ();
+
+  // non-standard
+  virtual const char* tao_repository_id () = 0;
+
+  // non-virtual is non-standard
+  void _add_ref (void);
+  void _remove_ref (void);
+
+  // private: %!
+  virtual CORBA_ValueBase* create_for_unmarshal (void) = 0;
+  // In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T)
+  // (see at definition below)
+
+private:
+  CORBA::ULong _tao_reference_count_;
+  ACE_SYNCH_MUTEX _tao_reference_count_lock_;
+}; // CORBA_ValueFactoryBase
+
+
+
+// Use this macro for writing code that is independend from
+// the compiler support of covariant return types of pointers to
+// virtual inherited classes.
+// (e.g. in egcs-2.90.29 980515 (egcs-1.0.3 release) its not yet implemented)
+// (But it is TAO specific and at the moment the covariant case is not
+// elaborated --- its just a suggestion.)
+
+#ifdef TAO_HAS_OBV_COVARIANT_RETURN
+#  define TAO_OBV_CREATE_RETURN_TYPE(TYPE) TYPE *
+#else /*  TAO_HAS_OBV_COVARIANT_RETURN */
+#  define TAO_OBV_CREATE_RETURN_TYPE(TYPE) CORBA::ValueBase *
+#endif /* TAO_HAS_OBV_COVARIANT_RETURN */
+
+
+
+// (The obtaining of the repository id is currently not yet like the OMG way. %!)
+//
+// Macro for on the fly registration of a factory (with type Factory).
+// The repository id is taken from the static repository id of the
+// valuetype via tao_repository_id () of the specialized factory.
+// It forgets the pre-registered factory (if any) and the reference
+// to the newly created one. (A new reference could be obtained with
+// orb->lookup_value_factory (CORBA::String repo_id) .)
+
+#define TAO_OBV_REGISTER_FACTORY(FACTORY) \
+  { CORBA_ValueFactory_ptr factory = new FACTORY; \
+    CORBA_ValueFactory_ptr prev_factory = \
+    TAO_ORB_Core_instance ()->orb ()->register_value_factory (\
+                                   factory->tao_repository_id (),\
+                                   factory); \
+    if (prev_factory) prev_factory->_remove_ref (); \
+    factory->_remove_ref (); }
+
+
+#if defined (__ACE_INLINE__)
+# include "tao/ValueFactory.i"
+#endif /* __ACE_INLINE__) */
+
+#endif /* TAO_HAS_VALUETYPE */
+#endif /* TAO_VALUEFACTORY_H */
diff --git a/TAO/tao/ValueFactory.i b/TAO/tao/ValueFactory.i
new file mode 100644
index 00000000000..84d4da93833
--- /dev/null
+++ b/TAO/tao/ValueFactory.i
@@ -0,0 +1,26 @@
+// $Id$
+
+ACE_INLINE
+CORBA_ValueFactoryBase::CORBA_ValueFactoryBase ()
+  : _tao_reference_count_ (1)
+{
+}
+
+ACE_INLINE void
+CORBA_ValueFactoryBase::_add_ref (void)
+{
+  ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
+  ++_tao_reference_count_;
+}
+
+ACE_INLINE void
+CORBA_ValueFactoryBase::_remove_ref (void)
+{
+  {
+    ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
+    -- this->_tao_reference_count_;
+    if (this->_tao_reference_count_ != 0)
+      return;
+  }
+  delete this;
+}
diff --git a/TAO/tao/ValueFactory_Map.cpp b/TAO/tao/ValueFactory_Map.cpp
new file mode 100644
index 00000000000..39f5b127165
--- /dev/null
+++ b/TAO/tao/ValueFactory_Map.cpp
@@ -0,0 +1,132 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//     TAO
+//
+// = FILENAME
+//     ValueFactory_Map.cpp
+//
+// = AUTHOR
+//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#include "tao/ValueFactory_Map.h"
+#include "tao/ValueFactory.h"
+#include "tao/ORB.h"
+
+#ifdef TAO_HAS_VALUETYPE
+
+#if !defined (__ACE_INLINE__)
+# include "tao/ValueFactory_Map.i"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID(tao, ValueFactory_Map, "$Id$")
+
+
+TAO_ValueFactory_Map::TAO_ValueFactory_Map ()
+  : map_ ()   // use default size and allocator
+{
+}
+
+TAO_ValueFactory_Map::~TAO_ValueFactory_Map ()
+{
+  // Initialize an iterator.  We need to go thru each entry and free
+  // up storage allocated to hold the external ids and invoke
+  // _remove_ref () on the internal ids.
+  FACTORY_MAP_MANAGER::ITERATOR iterator (this->map_);
+
+  for (FACTORY_MAP_MANAGER::ENTRY *entry = 0;
+       iterator.next (entry) != 0;
+       iterator.advance ())
+    {
+      // We had allocated memory and stored the string. So we free the
+      // memory.
+      CORBA::string_free ((char *) entry->ext_id_);
+      entry->ext_id_ = 0;
+      entry->int_id_->_remove_ref ();
+      entry->int_id_ = 0;
+    }
+}
+
+// %! Thread issues
+
+int
+TAO_ValueFactory_Map::rebind (const char *repo_id,
+                              CORBA_ValueFactory_ptr &factory)
+{
+//  ACE_READ_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, guard, map_->mutex(),-1);
+//   --- but must be recursive
+  char *prev_repo_id;
+  CORBA_ValueFactory_ptr prev_factory;
+  int ret = this->map_.rebind (CORBA::string_dup (repo_id),
+                                 factory,
+                                 prev_repo_id, prev_factory);
+  if (ret > -1)   // ok, no error
+    {
+      factory->_add_ref ();    // The map owns one reference.
+      if (ret == 1)    // there was a previous factory
+        {
+          factory = prev_factory;
+          CORBA::string_free (prev_repo_id);
+        }
+    }
+  return ret;
+}
+
+int
+TAO_ValueFactory_Map::unbind (const char *repo_id,
+                              CORBA_ValueFactory_ptr &factory)
+{
+  // ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr> *prev_entry;
+  FACTORY_MAP_MANAGER::ENTRY *prev_entry;
+  int ret = this->map_.find (repo_id, prev_entry);
+  if (ret == 0)    // there was a matching factory
+    {
+      // set factory to the previous factory,
+      factory = prev_entry->int_id_;
+      char *temp = ACE_const_cast (char *, prev_entry->ext_id_);
+      ret = this->map_.unbind (prev_entry);
+      if (ret == 0)
+        {
+          CORBA::string_free (temp);
+        }
+    }
+  return ret;
+}
+
+// %! perhaps inline
+int
+TAO_ValueFactory_Map::find (const char *repo_id,
+                            CORBA_ValueFactory_ptr &factory)
+{
+  int ret = this->map_.find (repo_id, factory);
+  // %! this must be guarded to be atomic  !!!!!!!!!!!!!!!!!!
+  if (ret > -1)
+    {
+      factory->_add_ref ();    // The caller gets one reference as gift.
+    }
+  return ret;
+}
+
+
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr>;
+template class ACE_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr>
+#pragma instantiate ACE_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
+#endif /* TAO_HAS_VALUETYPE */
diff --git a/TAO/tao/ValueFactory_Map.h b/TAO/tao/ValueFactory_Map.h
new file mode 100644
index 00000000000..95952dab090
--- /dev/null
+++ b/TAO/tao/ValueFactory_Map.h
@@ -0,0 +1,77 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//     TAO
+//
+// = FILENAME
+//     ValueFactory_Map.h
+//
+// = AUTHOR
+//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+#ifndef TAO_VALUEFACTORY_MAP_H
+#define TAO_VALUEFACTORY_MAP_H
+
+#include "ace/Hash_Map_Manager.h"
+#include "ace/Singleton.h"
+#include "ace/Synch.h"
+#include "tao/corbafwd.h"
+
+#ifdef TAO_HAS_VALUETYPE
+
+class TAO_ValueFactory_Map
+{
+public:
+  TAO_ValueFactory_Map ();
+  ~TAO_ValueFactory_Map ();
+
+
+  int rebind (const char *repo_id, CORBA_ValueFactory_ptr &factory);
+  // Associate the factory (int_id) with the repo_id (ext_id).
+  // Invokes _add_ref () on the factory.
+  // If previous factory had been bind with this repo_id, this one is
+  // returned in factory (and the caller holds a reference).
+  // Returns -1 on failure, 0 on success and 1 if a previous factory
+  // is found (and returned in factory).
+
+  int unbind (const char *repo_id, CORBA_ValueFactory_ptr &factory);
+  // Removes entry for repo_id from the map and sets factory to
+  // the tied one.
+
+  int find (const char *repo_id, CORBA_ValueFactory_ptr &factory);
+  // Lookup a matching factory for repo_id.
+  // Invokes _add_ref () on the factory if found.
+  // Returns -1 on failure and 0 on success.
+
+  void dump (void);
+private:
+
+  typedef ACE_Hash_Map_Manager_Ex<const char *,
+                                  CORBA_ValueFactory_ptr,
+                                  ACE_Hash<const char *>,
+                                  ACE_Equal_To<const char *>,
+                                  ACE_SYNCH_RW_MUTEX>
+          FACTORY_MAP_MANAGER;
+  FACTORY_MAP_MANAGER map_;
+  // The hash table data structure.
+}; /* TAO_ValueFactory_Map */
+
+
+// currently the ValueFactory_Map is a singleton and not per ORB
+// as in the OMG specs
+typedef ACE_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX>
+        TAO_VALUEFACTORY_MAP;
+
+
+
+#if defined (__ACE_INLINE__)
+# include "tao/ValueFactory_Map.i"
+#endif /* __ACE_INLINE__) */
+
+#endif /* TAO_HAS_VALUETYPE */
+#endif /* TAO_VALUEFACTORY_MAP_H */
diff --git a/TAO/tao/ValueFactory_Map.i b/TAO/tao/ValueFactory_Map.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/TAO/tao/ValueFactory_Map.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index be1c3e2f2ee..171c423e4c8 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -77,6 +77,8 @@
 #include "tao/Sequence_T.h"
 #include "tao/Object_KeyC.h"
 #include "tao/Union.h"
+#include "tao/ValueBase.h"
+#include "tao/ValueFactory.h"
 
 #if !defined (ACE_NESTED_CLASS)
 #if defined (ACE_WIN32)
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 29fe4dfc360..9f9cfc0785e 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -165,7 +165,7 @@ class CORBA_NVList_var;
 class CORBA_NVList_out;
 typedef class CORBA_NVList *CORBA_NVList_ptr;
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+#endif /* ! TAO_HAS_MINIMUM_CORBA */
 
 class CORBA_ORB;
 class CORBA_ORB_var;
@@ -207,6 +207,13 @@ typedef class CORBA_ImplementationDef *CORBA_ImplementationDef_ptr;
 
 typedef class CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
 
+#ifdef TAO_HAS_VALUETYPE
+class CORBA_ValueBase;
+class CORBA_ValueFactoryBase;
+typedef CORBA_ValueFactoryBase *CORBA_ValueFactory_ptr;
+class CORBA_DefaultValueRefCountBase;
+#endif /* TAO_HAS_VALUETYPE */
+
 class CORBA_String_var;
 class CORBA_String_out;
 
@@ -431,6 +438,18 @@ public:
   typedef CORBA_Current_var Current_var;
   typedef CORBA_Current_out Current_out;
 
+#ifdef TAO_HAS_VALUETYPE
+  typedef CORBA_ValueBase ValueBase;
+  typedef CORBA_ValueFactoryBase ValueFactoryBase;
+  typedef CORBA_ValueFactoryBase *ValueFactory;
+          // as CORBA 2.3a C++ map. 20.17.10 says
+  typedef CORBA_ValueFactoryBase *ValueFactory_ptr;
+          // own invention, more readable
+  typedef CORBA_DefaultValueRefCountBase  DefaultValueRefCountBase;
+  static void add_ref (ValueBase *);
+  static void remove_ref (ValueBase *);
+#endif /* TAO_HAS_VALUETYPE */
+
   // enum values defined in nvlist.hh, bitwise ORed.
   typedef u_int Flags;
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index d9386a43c2c..20418a759f6 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -245,16 +245,16 @@
 // The IDL compiler can generate the classes corresponding to IDL
 // sequences in two ways:
 // + Use the TAO templates for sequences,
-//   i.e. TAO_{Unb,B}ounded_Sequence<> 
+//   i.e. TAO_{Unb,B}ounded_Sequence<>
 // + Explicitly generate code for the sequence.
 //
 // The first approach can (potentially) produce smaller code, because
-// the code for a sequence over a particular type (say sequence<long>) 
+// the code for a sequence over a particular type (say sequence<long>)
 // can be shared across multiple IDL files.
 // Unfortunately it is hard to manage the template instantiations on
 // platforms that do not automatically generate them, mainly because
 // it is hard to decide on which generated file are the templates
-// instantiated.  Thus the second approach is more convenient for most 
+// instantiated.  Thus the second approach is more convenient for most
 // applications.
 //
 // On platforms that support automatic template instantiation we use
@@ -284,6 +284,9 @@
 // The Root POA default name.
 #define TAO_DEFAULT_ROOTPOA_NAME   ""
 
+// OBV is in experimental stage
+#define TAO_HAS_VALUETYPE
+
 // Minimum CORBA
 // #define TAO_HAS_MINIMUM_CORBA
 
diff --git a/TAO/tests/CDR/Makefile b/TAO/tests/CDR/Makefile
index d52d935e1bc..d8f190d5975 100644
--- a/TAO/tests/CDR/Makefile
+++ b/TAO/tests/CDR/Makefile
@@ -186,6 +186,8 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -196,8 +198,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -332,7 +332,11 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 .obj/tc.o .obj/tc.so .shobj/tc.o .shobj/tc.so: tc.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -450,6 +454,8 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -460,8 +466,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -596,7 +600,11 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 .obj/growth.o .obj/growth.so .shobj/growth.o .shobj/growth.so: growth.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -718,6 +726,8 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -728,8 +738,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -864,7 +872,11 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 .obj/octet_sequence.o .obj/octet_sequence.so .shobj/octet_sequence.o .shobj/octet_sequence.so: octet_sequence.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -982,6 +994,8 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -992,8 +1006,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1128,7 +1140,11 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 .obj/allocator.o .obj/allocator.so .shobj/allocator.o .shobj/allocator.so: allocator.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -1250,6 +1266,8 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1260,8 +1278,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1396,6 +1412,10 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/MT_Client/Makefile b/TAO/tests/MT_Client/Makefile
index 33cc2ea6749..329cc324aeb 100644
--- a/TAO/tests/MT_Client/Makefile
+++ b/TAO/tests/MT_Client/Makefile
@@ -214,6 +214,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -224,8 +226,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -329,6 +329,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -450,6 +454,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -460,8 +466,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -597,6 +601,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
 .obj/orb_creation.o .obj/orb_creation.so .shobj/orb_creation.o .shobj/orb_creation.so: orb_creation.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
@@ -750,6 +758,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -760,8 +770,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -865,6 +873,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -983,6 +995,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -993,8 +1007,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1130,6 +1142,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i testS.h testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1248,6 +1264,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1258,8 +1276,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1395,6 +1411,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1513,6 +1533,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1523,8 +1545,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1660,6 +1680,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i testS_T.h testS_T.i testS_T.cpp testS.i test_i.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Multiple_Inheritance/Makefile b/TAO/tests/Multiple_Inheritance/Makefile
index 4406935c0d2..d2cbca6932b 100644
--- a/TAO/tests/Multiple_Inheritance/Makefile
+++ b/TAO/tests/Multiple_Inheritance/Makefile
@@ -15,11 +15,11 @@ endif # ! TAO_ROOT
 LDLIBS = -lTAO
 
 IDL_SRC	= Multiple_InheritanceC.cpp Multiple_InheritanceS.cpp
-PROG_SRCS = $(IDL_SRC) server.cpp client.cpp 
+PROG_SRCS = $(IDL_SRC) server.cpp client.cpp
 
 LSRC = $(PROG_SRCS)
 
-FILE_SVR_OBJS = Multiple_InheritanceC.o Multiple_InheritanceS.o server.o 
+FILE_SVR_OBJS = Multiple_InheritanceC.o Multiple_InheritanceS.o server.o
 FILE_CLT_OBJS = Multiple_InheritanceC.o Multiple_InheritanceS.o client.o
 
 BIN = server client
@@ -173,6 +173,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -183,8 +185,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -320,6 +320,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Multiple_InheritanceC.i Multiple_InheritanceS.h \
  Multiple_InheritanceS_T.h Multiple_InheritanceS_T.i \
  Multiple_InheritanceS_T.cpp Multiple_InheritanceS.i
@@ -441,6 +445,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -451,8 +457,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -588,6 +592,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Multiple_InheritanceC.i Multiple_InheritanceS_T.h \
  Multiple_InheritanceS_T.i Multiple_InheritanceS_T.cpp \
  Multiple_InheritanceS.i
@@ -712,6 +720,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -722,8 +732,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -859,6 +867,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Multiple_InheritanceC.i Multiple_InheritanceS_T.h \
  Multiple_InheritanceS_T.i Multiple_InheritanceS_T.cpp \
  Multiple_InheritanceS.i \
@@ -985,6 +997,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -995,8 +1009,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1132,6 +1144,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Multiple_InheritanceC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
index cb9fbce0e00..6ba4b366646 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
@@ -184,6 +184,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -194,8 +196,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -331,6 +331,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  MT_Client_TestC.i MT_Client_TestS.h MT_Client_TestS_T.h \
  MT_Client_TestS_T.i MT_Client_TestS_T.cpp MT_Client_TestS.i
 .obj/MT_Client_TestS.o .obj/MT_Client_TestS.so .shobj/MT_Client_TestS.o .shobj/MT_Client_TestS.so: MT_Client_TestS.cpp MT_Client_TestS.h \
@@ -451,6 +455,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -461,8 +467,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -598,6 +602,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  MT_Client_TestC.i MT_Client_TestS_T.h MT_Client_TestS_T.i \
  MT_Client_TestS_T.cpp MT_Client_TestS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
@@ -730,6 +738,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -737,8 +747,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -868,6 +876,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  MT_Client_TestC.i MT_Client_TestS_T.h MT_Client_TestS_T.i \
  MT_Client_TestS_T.cpp MT_Client_TestS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
@@ -1024,6 +1036,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1034,8 +1048,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1139,6 +1151,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  MT_Client_TestC.h MT_Client_TestC.i local_server.h \
  $(TAO_ROOT)/tao/TAO.h \
  MT_Object_i.h MT_Client_TestS.h MT_Client_TestS_T.h \
@@ -1276,6 +1292,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1283,8 +1301,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1414,6 +1430,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  MT_Client_TestC.i MT_Client_TestS_T.h MT_Client_TestS_T.i \
  MT_Client_TestS_T.cpp MT_Client_TestS.i
 .obj/MT_Object_i.o .obj/MT_Object_i.so .shobj/MT_Object_i.o .shobj/MT_Object_i.so: MT_Object_i.cpp \
@@ -1533,6 +1553,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1543,8 +1565,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1680,6 +1700,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  MT_Object_i.h MT_Client_TestS.h MT_Client_TestC.h MT_Client_TestC.i \
  MT_Client_TestS_T.h MT_Client_TestS_T.i MT_Client_TestS_T.cpp \
  MT_Client_TestS.i
diff --git a/TAO/tests/NestedUpcall/Reactor/Makefile b/TAO/tests/NestedUpcall/Reactor/Makefile
index 1a53ac43f35..bc405fa85f5 100644
--- a/TAO/tests/NestedUpcall/Reactor/Makefile
+++ b/TAO/tests/NestedUpcall/Reactor/Makefile
@@ -189,6 +189,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -199,8 +201,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -336,6 +336,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ReactorC.i ReactorS.h ReactorS_T.h ReactorS_T.i ReactorS_T.cpp \
  ReactorS.i
 .obj/ReactorS.o .obj/ReactorS.so .shobj/ReactorS.o .shobj/ReactorS.so: ReactorS.cpp ReactorS.h ReactorC.h \
@@ -455,6 +459,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -465,8 +471,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -602,6 +606,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  ReactorC.i ReactorS_T.h ReactorS_T.i ReactorS_T.cpp ReactorS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/Profile_Timer.h \
@@ -733,6 +741,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -743,8 +753,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -879,6 +887,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  reactor_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h \
  ReactorS_T.i ReactorS_T.cpp ReactorS.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
@@ -1005,6 +1017,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1015,8 +1029,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1152,6 +1164,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  eh_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h ReactorS_T.i \
  ReactorS_T.cpp ReactorS.i
 .obj/reactor_i.o .obj/reactor_i.so .shobj/reactor_i.o .shobj/reactor_i.so: reactor_i.cpp \
@@ -1271,6 +1287,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1281,8 +1299,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1418,6 +1434,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  reactor_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h \
  ReactorS_T.i ReactorS_T.cpp ReactorS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
@@ -1550,6 +1570,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1557,8 +1579,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1688,6 +1708,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  reactor_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h \
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
index 43ac533f90f..af82f1e51af 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
@@ -193,6 +193,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -203,8 +205,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -340,6 +340,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Triangle_TestC.i Triangle_TestS.h Triangle_TestS_T.h \
  Triangle_TestS_T.i Triangle_TestS_T.cpp Triangle_TestS.i
 .obj/Triangle_TestS.o .obj/Triangle_TestS.so .shobj/Triangle_TestS.o .shobj/Triangle_TestS.so: Triangle_TestS.cpp Triangle_TestS.h Triangle_TestC.h \
@@ -459,6 +463,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -469,8 +475,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -606,6 +610,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Triangle_TestC.i Triangle_TestS_T.h Triangle_TestS_T.i \
  Triangle_TestS_T.cpp Triangle_TestS.i
 .obj/server_A.o .obj/server_A.so .shobj/server_A.o .shobj/server_A.so: server_A.cpp server_A.h \
@@ -738,6 +746,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -745,8 +755,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -876,6 +884,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Triangle_TestC.i Triangle_TestS_T.h Triangle_TestS_T.i \
  Triangle_TestS_T.cpp Triangle_TestS.i
 .obj/server_B.o .obj/server_B.so .shobj/server_B.o .shobj/server_B.so: server_B.cpp server_B.h \
@@ -1008,6 +1020,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1015,8 +1029,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1146,6 +1158,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Triangle_TestC.i Triangle_TestS_T.h Triangle_TestS_T.i \
  Triangle_TestS_T.cpp Triangle_TestS.i
 .obj/Object_A_i.o .obj/Object_A_i.so .shobj/Object_A_i.o .shobj/Object_A_i.so: Object_A_i.cpp \
@@ -1265,6 +1281,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1275,8 +1293,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1412,6 +1428,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Object_A_i.h Triangle_TestS.h Triangle_TestC.h Triangle_TestC.i \
  Triangle_TestS_T.h Triangle_TestS_T.i Triangle_TestS_T.cpp \
  Triangle_TestS.i
@@ -1532,6 +1552,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1542,8 +1564,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1679,6 +1699,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Object_B_i.h Triangle_TestS.h Triangle_TestC.h Triangle_TestC.i \
  Triangle_TestS_T.h Triangle_TestS_T.i Triangle_TestS_T.cpp \
  Triangle_TestS.i
@@ -1799,6 +1823,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1809,8 +1835,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1946,6 +1970,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Initiator_i.h Triangle_TestS.h Triangle_TestC.h Triangle_TestC.i \
  Triangle_TestS_T.h Triangle_TestS_T.i Triangle_TestS_T.cpp \
  Triangle_TestS.i
@@ -2082,6 +2110,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2089,8 +2119,6 @@ realclean: clean
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2220,6 +2248,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  Triangle_TestC.i Triangle_TestS_T.h Triangle_TestS_T.i \
  Triangle_TestS_T.cpp Triangle_TestS.i
 
diff --git a/TAO/tests/OctetSeq/Makefile b/TAO/tests/OctetSeq/Makefile
index 4274ab32d22..81eb1dc294d 100644
--- a/TAO/tests/OctetSeq/Makefile
+++ b/TAO/tests/OctetSeq/Makefile
@@ -176,6 +176,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -186,8 +188,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -323,6 +323,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.h testC.i
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -441,6 +445,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -451,8 +457,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -588,6 +592,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i testS.h testS_T.h testS_T.i testS_T.cpp testS.i
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -706,6 +714,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -716,8 +726,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -853,6 +861,10 @@ realclean: clean
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  testC.i testS_T.h testS_T.i testS_T.cpp testS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile
index 93a85a27015..14883673afe 100644
--- a/TAO/tests/Param_Test/Makefile
+++ b/TAO/tests/Param_Test/Makefile
@@ -231,6 +231,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -241,8 +243,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -378,6 +378,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i param_testSer.h param_testSer_T.h param_testS_T.i \
  param_testSer_T.cpp param_testS.i
 .obj/param_testSer.o .obj/param_testSer.so .shobj/param_testSer.o .shobj/param_testSer.so: param_testSer.cpp param_testSer.h param_testCli.h \
@@ -497,6 +501,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -507,8 +513,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -644,6 +648,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i param_testSer_T.h param_testS_T.i param_testSer_T.cpp \
  param_testS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
@@ -766,6 +774,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -776,8 +786,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -913,6 +921,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i param_testSer_T.h param_testS_T.i param_testSer_T.cpp \
  param_testS.i
 .obj/param_test_i.o .obj/param_test_i.so .shobj/param_test_i.o .shobj/param_test_i.so: param_test_i.cpp \
@@ -1032,6 +1044,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1042,8 +1056,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1179,6 +1191,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_test_i.h param_testSer.h param_testCli.h param_testCli.i \
  param_testSer_T.h param_testS_T.i param_testSer_T.cpp param_testS.i
 .obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp param_testCli.h \
@@ -1298,6 +1314,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1308,8 +1326,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1445,6 +1461,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i
 .obj/param_testCli.o .obj/param_testCli.so .shobj/param_testCli.o .shobj/param_testCli.so: param_testCli.cpp param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1563,6 +1583,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1573,8 +1595,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1710,6 +1730,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i param_testSer.h param_testSer_T.h param_testS_T.i \
  param_testSer_T.cpp param_testS.i
 .obj/param_testSer.o .obj/param_testSer.so .shobj/param_testSer.o .shobj/param_testSer.so: param_testSer.cpp param_testSer.h param_testCli.h \
@@ -1829,6 +1853,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1839,8 +1865,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -1976,6 +2000,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i param_testSer_T.h param_testS_T.i param_testSer_T.cpp \
  param_testS.i
 .obj/driver.o .obj/driver.so .shobj/driver.o .shobj/driver.so: driver.cpp driver.h options.h \
@@ -2098,6 +2126,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2108,8 +2138,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2242,6 +2270,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.h param_testCli.i results.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -2375,6 +2407,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2385,8 +2419,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2519,6 +2551,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  results.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -2650,6 +2686,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2660,8 +2698,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -2793,7 +2829,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i
 .obj/results.o .obj/results.so .shobj/results.o .shobj/results.so: results.cpp \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
@@ -2912,6 +2952,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -2922,8 +2964,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3059,6 +3099,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
@@ -3180,6 +3224,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3190,8 +3236,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3327,6 +3371,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i
 .obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -3445,6 +3493,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3455,8 +3505,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3592,6 +3640,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i
 .obj/any.o .obj/any.so .shobj/any.o .shobj/any.so: any.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -3710,6 +3762,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3720,8 +3774,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -3857,6 +3909,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i any.h
 .obj/bd_long_seq.o .obj/bd_long_seq.so .shobj/bd_long_seq.o .shobj/bd_long_seq.so: bd_long_seq.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -3975,6 +4031,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -3985,8 +4043,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4122,6 +4178,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i bd_long_seq.h
 .obj/bd_short_seq.o .obj/bd_short_seq.so .shobj/bd_short_seq.o .shobj/bd_short_seq.so: bd_short_seq.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -4240,6 +4300,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -4250,8 +4312,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4387,6 +4447,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i bd_short_seq.h
 .obj/bd_str_seq.o .obj/bd_str_seq.so .shobj/bd_str_seq.o .shobj/bd_str_seq.so: bd_str_seq.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -4505,6 +4569,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -4515,8 +4581,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4652,6 +4716,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i bd_str_seq.h
 .obj/bd_string.o .obj/bd_string.so .shobj/bd_string.o .shobj/bd_string.so: bd_string.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -4770,6 +4838,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -4780,8 +4850,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -4917,6 +4985,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i bd_string.h
 .obj/bd_struct_seq.o .obj/bd_struct_seq.so .shobj/bd_struct_seq.o .shobj/bd_struct_seq.so: bd_struct_seq.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -5035,6 +5107,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -5045,8 +5119,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5182,6 +5254,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i bd_struct_seq.h
 .obj/fixed_array.o .obj/fixed_array.so .shobj/fixed_array.o .shobj/fixed_array.so: fixed_array.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -5300,6 +5376,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -5310,8 +5388,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5447,6 +5523,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i fixed_array.h
 .obj/fixed_struct.o .obj/fixed_struct.so .shobj/fixed_struct.o .shobj/fixed_struct.so: fixed_struct.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -5565,6 +5645,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -5575,8 +5657,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5712,6 +5792,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i fixed_struct.h
 .obj/nested_struct.o .obj/nested_struct.so .shobj/nested_struct.o .shobj/nested_struct.so: nested_struct.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -5830,6 +5914,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -5840,8 +5926,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -5977,6 +6061,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i nested_struct.h
 .obj/objref_struct.o .obj/objref_struct.so .shobj/objref_struct.o .shobj/objref_struct.so: objref_struct.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -6095,6 +6183,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -6105,8 +6195,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -6242,6 +6330,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i objref_struct.h
 .obj/objref.o .obj/objref.so .shobj/objref.o .shobj/objref.so: objref.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -6360,6 +6452,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -6370,8 +6464,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -6507,6 +6599,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i objref.h
 .obj/short.o .obj/short.so .shobj/short.o .shobj/short.so: short.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -6625,6 +6721,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -6635,8 +6733,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -6772,6 +6868,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i short.h
 .obj/ulonglong.o .obj/ulonglong.so .shobj/ulonglong.o .shobj/ulonglong.so: ulonglong.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -6890,6 +6990,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -6900,8 +7002,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7037,6 +7137,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i ulonglong.h
 .obj/typecode.o .obj/typecode.so .shobj/typecode.o .shobj/typecode.so: typecode.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -7155,6 +7259,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -7165,8 +7271,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7302,6 +7406,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i typecode.h
 .obj/ub_any_seq.o .obj/ub_any_seq.so .shobj/ub_any_seq.o .shobj/ub_any_seq.so: ub_any_seq.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -7420,6 +7528,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -7430,8 +7540,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7567,6 +7675,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i ub_any_seq.h
 .obj/ub_long_seq.o .obj/ub_long_seq.so .shobj/ub_long_seq.o .shobj/ub_long_seq.so: ub_long_seq.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -7685,6 +7797,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -7695,8 +7809,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7832,6 +7944,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i ub_long_seq.h
 .obj/ub_objref_seq.o .obj/ub_objref_seq.so .shobj/ub_objref_seq.o .shobj/ub_objref_seq.so: ub_objref_seq.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -7950,6 +8066,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -7960,8 +8078,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8097,6 +8213,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i ub_objref_seq.h
 .obj/ub_short_seq.o .obj/ub_short_seq.so .shobj/ub_short_seq.o .shobj/ub_short_seq.so: ub_short_seq.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -8215,6 +8335,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -8225,8 +8347,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8362,6 +8482,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i ub_short_seq.h
 .obj/ub_str_seq.o .obj/ub_str_seq.so .shobj/ub_str_seq.o .shobj/ub_str_seq.so: ub_str_seq.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -8480,6 +8604,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -8490,8 +8616,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8627,6 +8751,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i ub_str_seq.h
 .obj/ub_string.o .obj/ub_string.so .shobj/ub_string.o .shobj/ub_string.so: ub_string.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -8745,6 +8873,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -8755,8 +8885,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -8892,6 +9020,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i ub_string.h
 .obj/ub_struct_seq.o .obj/ub_struct_seq.so .shobj/ub_struct_seq.o .shobj/ub_struct_seq.so: ub_struct_seq.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -9010,6 +9142,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -9020,8 +9154,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9157,6 +9289,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i ub_struct_seq.h
 .obj/var_array.o .obj/var_array.so .shobj/var_array.o .shobj/var_array.so: var_array.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -9275,6 +9411,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -9285,8 +9423,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9422,6 +9558,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i var_array.h
 .obj/var_struct.o .obj/var_struct.so .shobj/var_struct.o .shobj/var_struct.so: var_struct.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -9540,6 +9680,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -9550,8 +9692,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9687,6 +9827,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i var_struct.h
 .obj/except.o .obj/except.so .shobj/except.o .shobj/except.so: except.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -9805,6 +9949,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -9815,8 +9961,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -9952,6 +10096,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i except.h
 .obj/big_union.o .obj/big_union.so .shobj/big_union.o .shobj/big_union.so: big_union.cpp helper.h param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -10070,6 +10218,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -10080,8 +10230,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -10217,6 +10365,10 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  param_testCli.i big_union.h
 .obj/multdim_array.o .obj/multdim_array.so .shobj/multdim_array.o .shobj/multdim_array.so: multdim_array.cpp
 
diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile
index 95d3149a5e9..f8fd412a243 100644
--- a/TAO/utils/catior/Makefile
+++ b/TAO/utils/catior/Makefile
@@ -163,6 +163,8 @@ include $(TAO_ROOT)/taoconfig.mk
  $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -173,8 +175,6 @@ include $(TAO_ROOT)/taoconfig.mk
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -310,6 +310,10 @@ include $(TAO_ROOT)/taoconfig.mk
  $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
  $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
  $(TAO_ROOT)/tao/IIOP_Profile.i