Sat Jun 19 15:46:22 1999 Alexander Babu Arulanthu <alex@cs.wustl.edu>

17 files changed, 303 insertions, 151 deletions

diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile
index c3431a717c5..058aef7bec9 100644
--- a/TAO/TAO_IDL/Makefile
+++ b/TAO/TAO_IDL/Makefile
@@ -1482,7 +1482,8 @@ tags:
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
  include/fe_private.h include/fe_interface_header.h \
  include/fe_declarator.h
-.obj/lex.yy.o .obj/lex.yy.so .shobj/lex.yy.o .shobj/lex.yy.so: fe/lex.yy.cpp $(ACE_ROOT)/ace/OS.h \
+.obj/lex.yy.o .obj/lex.yy.so .shobj/lex.yy.o .shobj/lex.yy.so: fe/lex.yy.cpp \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
@@ -1496,11 +1497,11 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i include/idl.h \
- 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/Log_Record.i \
+ include/idl.h 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 \
@@ -5515,7 +5516,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -5620,7 +5622,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -5725,7 +5728,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -5830,7 +5834,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -5935,7 +5940,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -6040,7 +6046,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -6145,7 +6152,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -6250,7 +6258,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -6355,7 +6364,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -6481,7 +6491,8 @@ tags:
  be_include/be_visitor_interface/tie_sh.h \
  be_include/be_visitor_interface/tie_si.h \
  be_include/be_visitor_interface/ami_handler_fwd_ch.h \
- be_include/be_visitor_interface/ami_handler_fwd_ci.h be_include/be.h \
+ be_include/be_visitor_interface/ami_handler_fwd_ci.h \
+ be_include/be_visitor_interface/ami_handler_ch.h be_include/be.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
@@ -6587,7 +6598,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -6692,7 +6704,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -6797,7 +6810,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -6902,7 +6916,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -7007,7 +7022,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -7112,7 +7128,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -7217,7 +7234,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -7322,7 +7340,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -7427,7 +7446,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -7544,7 +7564,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -7649,7 +7670,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -7754,7 +7776,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -7859,7 +7882,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -7964,7 +7988,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -8069,7 +8094,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -8174,7 +8200,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -8279,7 +8306,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -8384,7 +8412,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -8490,7 +8519,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -8595,7 +8625,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -8700,7 +8731,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -8805,7 +8837,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -8910,7 +8943,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -9016,7 +9050,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -9121,7 +9156,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -9226,7 +9262,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -9332,7 +9369,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -9370,7 +9408,8 @@ tags:
  be_include/be_visitor_argument/compiled_marshal_cs.h \
  be_include/be_visitor_argument/compiled_marshal_ss.h \
  be_include/be_visitor_argument/pre_invoke_cs.h \
- be_include/be_visitor_argument/arglist_ami.h \
+ be_include/be_visitor_argument/ami_arglist.h \
+ be_include/be_visitor_argument/ami_handler_arglist.h \
  be_include/be_visitor_array.h be_include/be_visitor_array/array.h \
  be_include/be_visitor_array/array_ch.h \
  be_include/be_visitor_array/array_ci.h \
@@ -9429,6 +9468,7 @@ tags:
  be_include/be_visitor_interface/tie_si.h \
  be_include/be_visitor_interface/ami_handler_fwd_ch.h \
  be_include/be_visitor_interface/ami_handler_fwd_ci.h \
+ be_include/be_visitor_interface/ami_handler_ch.h \
  be_include/be_visitor_interface_fwd.h \
  be_include/be_visitor_interface_fwd/interface_fwd_ch.h \
  be_include/be_visitor_interface_fwd/interface_fwd_ci.h \
@@ -9489,9 +9529,11 @@ tags:
  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_include/be_visitor_operation/operation_ami_ch.h \
- be_include/be_visitor_operation/operation_ami_cs.h \
- be_include/be_visitor_operation/arglist_ami.h \
+ be_include/be_visitor_operation/ami_ch.h \
+ be_include/be_visitor_operation/ami_cs.h \
+ be_include/be_visitor_operation/ami_arglist.h \
+ be_include/be_visitor_operation/ami_handler_operation_ch.h \
+ be_include/be_visitor_operation/ami_handler_arglist.h \
  be_include/be_visitor_root.h be_include/be_visitor_root/root.h \
  be_include/be_visitor_root/root_ch.h \
  be_include/be_visitor_root/root_ci.h \
@@ -9783,7 +9825,8 @@ tags:
  be_include/be_visitor_argument/compiled_marshal_cs.h \
  be_include/be_visitor_argument/compiled_marshal_ss.h \
  be_include/be_visitor_argument/pre_invoke_cs.h \
- be_include/be_visitor_argument/arglist_ami.h \
+ be_include/be_visitor_argument/ami_arglist.h \
+ be_include/be_visitor_argument/ami_handler_arglist.h \
  be/be_visitor_argument/arglist.cpp \
  be/be_visitor_argument/argument.cpp \
  be/be_visitor_argument/docall_cs.cpp \
@@ -9799,7 +9842,8 @@ tags:
  be/be_visitor_argument/compiled_marshal_cs.cpp \
  be/be_visitor_argument/compiled_marshal_ss.cpp \
  be/be_visitor_argument/pre_invoke_cs.cpp \
- be/be_visitor_argument/arglist_ami.cpp
+ be/be_visitor_argument/ami_arglist.cpp \
+ be/be_visitor_argument/ami_handler_arglist.cpp
 .obj/be_visitor_array.o .obj/be_visitor_array.so .shobj/be_visitor_array.o .shobj/be_visitor_array.so: be/be_visitor_array.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -9884,7 +9928,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -10002,7 +10047,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -10111,7 +10157,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -10222,7 +10269,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -10327,7 +10375,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -10433,7 +10482,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -10548,7 +10598,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -10683,7 +10734,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -10798,7 +10850,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -10841,6 +10894,7 @@ tags:
  be_include/be_visitor_interface/tie_si.h \
  be_include/be_visitor_interface/ami_handler_fwd_ch.h \
  be_include/be_visitor_interface/ami_handler_fwd_ci.h \
+ be_include/be_visitor_interface/ami_handler_ch.h \
  be/be_visitor_interface/interface.cpp \
  be/be_visitor_interface/interface_ch.cpp \
  be/be_visitor_interface/interface_ci.cpp \
@@ -10863,7 +10917,8 @@ 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/be_visitor_interface/ami_handler_fwd_ci.cpp
+ be/be_visitor_interface/ami_handler_fwd_ci.cpp \
+ be/be_visitor_interface/ami_handler_ch.cpp
 .obj/be_visitor_interface_fwd.o .obj/be_visitor_interface_fwd.so .shobj/be_visitor_interface_fwd.o .shobj/be_visitor_interface_fwd.so: be/be_visitor_interface_fwd.cpp \
  include/idl.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -10948,7 +11003,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -11061,7 +11117,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -11139,9 +11196,11 @@ tags:
  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_include/be_visitor_operation/operation_ami_ch.h \
- be_include/be_visitor_operation/operation_ami_cs.h \
- be_include/be_visitor_operation/arglist_ami.h \
+ be_include/be_visitor_operation/ami_ch.h \
+ be_include/be_visitor_operation/ami_cs.h \
+ be_include/be_visitor_operation/ami_arglist.h \
+ be_include/be_visitor_operation/ami_handler_operation_ch.h \
+ be_include/be_visitor_operation/ami_handler_arglist.h \
  be/be_visitor_valuetype/field_ch.cpp \
  be/be_visitor_valuetype/field_cs.cpp \
  be/be_visitor_valuetype/field_cdr_ci.cpp \
@@ -11236,7 +11295,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -11346,7 +11406,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -11461,7 +11522,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -11513,9 +11575,11 @@ tags:
  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_include/be_visitor_operation/operation_ami_ch.h \
- be_include/be_visitor_operation/operation_ami_cs.h \
- be_include/be_visitor_operation/arglist_ami.h \
+ be_include/be_visitor_operation/ami_ch.h \
+ be_include/be_visitor_operation/ami_cs.h \
+ be_include/be_visitor_operation/ami_arglist.h \
+ be_include/be_visitor_operation/ami_handler_operation_ch.h \
+ be_include/be_visitor_operation/ami_handler_arglist.h \
  be/be_visitor_operation/operation.cpp \
  be/be_visitor_operation/arglist.cpp \
  be/be_visitor_operation/argument.cpp \
@@ -11545,7 +11609,8 @@ tags:
  be_include/be_visitor_argument/compiled_marshal_cs.h \
  be_include/be_visitor_argument/compiled_marshal_ss.h \
  be_include/be_visitor_argument/pre_invoke_cs.h \
- be_include/be_visitor_argument/arglist_ami.h \
+ be_include/be_visitor_argument/ami_arglist.h \
+ be_include/be_visitor_argument/ami_handler_arglist.h \
  be/be_visitor_operation/operation_is.cpp \
  be/be_visitor_operation/rettype.cpp \
  be/be_visitor_operation/rettype_is.cpp \
@@ -11561,9 +11626,10 @@ tags:
  be/be_visitor_operation/tie_sh.cpp be/be_visitor_operation/tie_si.cpp \
  be/be_visitor_operation/compiled_marshal.cpp \
  be/be_visitor_operation/rettype_pre_invoke_cs.cpp \
- be/be_visitor_operation/operation_ami_ch.cpp \
- be/be_visitor_operation/operation_ami_cs.cpp \
- be/be_visitor_operation/arglist_ami.cpp
+ be/be_visitor_operation/ami_ch.cpp be/be_visitor_operation/ami_cs.cpp \
+ be/be_visitor_operation/ami_arglist.cpp \
+ be/be_visitor_operation/ami_handler_operation_ch.cpp \
+ be/be_visitor_operation/ami_handler_arglist.cpp
 .obj/be_visitor_root.o .obj/be_visitor_root.so .shobj/be_visitor_root.o .shobj/be_visitor_root.so: be/be_visitor_root.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -11648,7 +11714,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -11770,7 +11837,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -11876,7 +11944,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -12021,7 +12090,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -12152,7 +12222,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -12263,7 +12334,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -12387,7 +12459,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
@@ -12512,7 +12585,8 @@ tags:
  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 \
+ be_include/be.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
diff --git a/TAO/TAO_IDL/be/be_visitor_argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument.cpp
index 8e302bdcede..f839202185b 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument.cpp
@@ -38,7 +38,7 @@
 #include "be_visitor_argument/compiled_marshal_cs.cpp"
 #include "be_visitor_argument/compiled_marshal_ss.cpp"
 #include "be_visitor_argument/pre_invoke_cs.cpp"
-#include "be_visitor_argument/arglist_ami.cpp"
-
+#include "be_visitor_argument/ami_arglist.cpp"
+#include "be_visitor_argument/ami_handler_arglist.cpp"
 ACE_RCSID(be, be_visitor_argument, "$Id$")
 
diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp
index dc24f416080..e3c96cbcef0 100644
--- a/TAO/TAO_IDL/be/be_visitor_factory.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp
@@ -232,28 +232,6 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
 
 #   endif /* IDL_HAS_VALUETYPE */
 
-    case TAO_CodeGen::TAO_OPERATION_AMI_CH:
-      return new be_visitor_operation_ami_ch (new_ctx);
-
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_AMI:
-      return new be_visitor_operation_arglist_ami (new_ctx);
-      
-    case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
-      return new be_visitor_operation_argument (new_ctx);
-      
-    case TAO_CodeGen::TAO_ARGUMENT_AMI:
-      // @@ I am not sure about this case, yet (Alex).     
-      return new be_visitor_decl (new_ctx); // noop
-
-    case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_AMI:
-      return new be_visitor_args_arglist_ami (new_ctx);
-
-    case TAO_CodeGen::TAO_AMI_HANDLER_FWD_CH:
-      return new be_visitor_ami_handler_fwd_ch (new_ctx);
-      
-    case TAO_CodeGen::TAO_AMI_HANDLER_FWD_CI:
-      return new be_visitor_ami_handler_fwd_ci (new_ctx);
-
     case TAO_CodeGen::TAO_STRUCT_CH:
       return new be_visitor_structure_ch (new_ctx);
     case TAO_CodeGen::TAO_STRUCT_CS:
@@ -458,6 +436,23 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_ARRAY_CDR_OP_CS:
       return new be_visitor_decl (new_ctx);
 
+    case TAO_CodeGen::TAO_ARGUMENT_AMI:
+      // @@ Alex: I am not sure about this case, yet (Alex).
+      //    noop.
+      return new be_visitor_decl (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_FWD_CH:
+      return new be_visitor_interface_ami_handler_fwd_ch (new_ctx);
+      
+    case TAO_CodeGen::TAO_AMI_HANDLER_FWD_CI:
+      return new be_visitor_interface_ami_handler_fwd_ci (new_ctx);
+      
+    case TAO_CodeGen::TAO_AMI_HANDLER_CH:
+      return new be_visitor_interface_ami_handler_ch (new_ctx);
+      
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST:
+      return new be_visitor_operation_ami_handler_arglist (new_ctx);
+      
     default:
       // an error
       delete new_ctx;
@@ -496,10 +491,6 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_operation_ch (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_CS:
       return new be_interpretive_visitor_operation_cs (new_ctx);
-
-    case TAO_CodeGen::TAO_OPERATION_AMI_CS:
-      return new be_interpretive_visitor_operation_ami_cs (new_ctx);
-
     case TAO_CodeGen::TAO_OPERATION_SH:
       return new be_visitor_operation_sh (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_IH:
@@ -585,7 +576,31 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_args_marshal_ss (new_ctx);
     case TAO_CodeGen::TAO_ARGUMENT_POST_MARSHAL_SS:
       return new be_visitor_args_post_marshal_ss (new_ctx);
+      
+    case TAO_CodeGen::TAO_OPERATION_AMI_CH:
+      return new be_visitor_operation_ami_ch (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_AMI_CS:
+      return new be_interpretive_visitor_operation_ami_cs (new_ctx);
 
+    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST:
+      return new be_visitor_operation_ami_arglist (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
+      return new be_visitor_operation_argument (new_ctx);
+      
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST:
+      return new be_visitor_args_ami_arglist (new_ctx);
+      
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_CH:
+      return new be_visitor_operation_ami_handler_operation_ch (new_ctx);
+      
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST:
+      return new be_visitor_operation_ami_handler_arglist (new_ctx);
+
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST:
+      return new be_visitor_args_ami_handler_arglist (new_ctx);
+      
     default:
       // cannot handle it; delegate it to the common visitor factory
       delete new_ctx;
@@ -623,10 +638,6 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_operation_ch (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_CS:
       return new be_compiled_visitor_operation_cs (new_ctx);
-
-    case TAO_CodeGen::TAO_OPERATION_AMI_CS:
-      return new be_compiled_visitor_operation_ami_cs (new_ctx);
-
     case TAO_CodeGen::TAO_OPERATION_SH:
       return new be_visitor_operation_sh (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_SS:
@@ -720,6 +731,33 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       // this is a NO-OP
       return new be_visitor_decl (new_ctx);
 
+    case TAO_CodeGen::TAO_OPERATION_AMI_CS:
+      return new be_compiled_visitor_operation_ami_cs (new_ctx);
+      
+    case TAO_CodeGen::TAO_OPERATION_AMI_CH:
+      return new be_visitor_operation_ami_ch (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_AMI_ARGLIST:
+      return new be_visitor_operation_ami_arglist (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
+      return new be_visitor_operation_argument (new_ctx);
+
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_ARGLIST:
+      return new be_visitor_args_ami_arglist (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_CH:
+      return new be_visitor_operation_ami_handler_operation_ch (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_OPERATION_ARGLIST:
+      return new be_visitor_operation_ami_handler_arglist (new_ctx);
+
+    case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_AMI_HANDLER:
+      return new be_visitor_args_ami_handler_arglist (new_ctx);
+           
+    case TAO_CodeGen::TAO_ARGUMENT_AMI_HANDLER_ARGLIST:
+      return new be_visitor_args_ami_handler_arglist (new_ctx);
+
     default:
       // cannot handle it; delegate it to the common visitor factory
       delete new_ctx;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 10aa0ec67e6..061bd5b24d4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -43,5 +43,5 @@
 #include "be_visitor_interface/cdr_op_cs.cpp"
 #include "be_visitor_interface/ami_handler_fwd_ch.cpp"
 #include "be_visitor_interface/ami_handler_fwd_ci.cpp"
-
+#include "be_visitor_interface/ami_handler_ch.cpp"
 ACE_RCSID(be, be_visitor_interface, "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp
index 0e5a8cb8c6f..edd92eb656f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp
@@ -26,7 +26,7 @@
 
 #include "be_visitor_interface_fwd.h"
 
-ACE_RCSID(be_visitor_ami_handler_fwd, ami_handler_fwd_ch, "$Id$")
+ACE_RCSID(be_visitor_interface_ami_handler_fwd, ami_handler_fwd_ch, "$Id$")
 
 
 // ********************************************************************
@@ -34,18 +34,18 @@ ACE_RCSID(be_visitor_ami_handler_fwd, ami_handler_fwd_ch, "$Id$")
 // Handler interface.
 // ********************************************************************
   
-be_visitor_ami_handler_fwd_ch::be_visitor_ami_handler_fwd_ch (be_visitor_context *ctx)
+be_visitor_interface_ami_handler_fwd_ch::be_visitor_interface_ami_handler_fwd_ch (be_visitor_context *ctx)
   : be_visitor_decl (ctx)
 {
 }
 
-be_visitor_ami_handler_fwd_ch::~be_visitor_ami_handler_fwd_ch (void)
+be_visitor_interface_ami_handler_fwd_ch::~be_visitor_interface_ami_handler_fwd_ch (void)
 {
 }
 
 // visit the interface node and its scope
 int
-be_visitor_ami_handler_fwd_ch::visit_interface (be_interface *node)
+be_visitor_interface_ami_handler_fwd_ch::visit_interface (be_interface *node)
 {
   // Grab the out stream.
   TAO_OutStream *os = this->ctx_->stream ();
@@ -97,7 +97,7 @@ be_visitor_ami_handler_fwd_ch::visit_interface (be_interface *node)
       if (node->gen_var_defn (interface_name) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_ami_handler_fwd_ch::"
+                             "(%N:%l) be_visitor_interface_ami_handler_fwd_ch::"
                              "visit_interface_fwd - "
                              "codegen for _var failed\n"), -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp
index 02e8904d29f..d4f94f6198a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp
@@ -26,7 +26,7 @@
 
 #include "be_visitor_interface_fwd.h"
 
-ACE_RCSID(be_visitor_ami_handler_fwd, ami_handler_fwd_ci, "$Id$")
+ACE_RCSID(be_visitor_interface_ami_handler_fwd, ami_handler_fwd_ci, "$Id$")
 
 
 // ********************************************************************
@@ -34,18 +34,18 @@ ACE_RCSID(be_visitor_ami_handler_fwd, ami_handler_fwd_ci, "$Id$")
 // This one for the client inline file
 // ********************************************************************
 
-be_visitor_ami_handler_fwd_ci::be_visitor_ami_handler_fwd_ci (be_visitor_context *ctx)
+be_visitor_interface_ami_handler_fwd_ci::be_visitor_interface_ami_handler_fwd_ci (be_visitor_context *ctx)
   : be_visitor_decl (ctx)
 {
 }
 
-be_visitor_ami_handler_fwd_ci::~be_visitor_ami_handler_fwd_ci (void)
+be_visitor_interface_ami_handler_fwd_ci::~be_visitor_interface_ami_handler_fwd_ci (void)
 {
 }
 
 // visit the Ami_Handler_Fwd_ci node and its scope
 int
-be_visitor_ami_handler_fwd_ci::visit_interface (be_interface *node)
+be_visitor_interface_ami_handler_fwd_ci::visit_interface (be_interface *node)
 {
   if (node->cli_inline_gen () || node->imported ())
     return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 3fb87be9206..ea9cb738f5a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -267,7 +267,39 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                              "TypeCode declaration failed\n"
                              ), -1);
         }
-
+      
+      // Generate the Skeleton code for the AMI Reply Handler. 
+      if (idl_global->ami_call_back () == I_TRUE)
+        {
+          // Set the context.
+          be_visitor_context ctx (*this->ctx_);
+          
+          // Set the state.
+          ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_CH);
+          
+          // Create the visitor.
+          be_visitor *visitor = tao_cg->make_visitor (&ctx);
+          if (!visitor)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_interface_ch::"
+                                 "visit_interface - "
+                                 "Bad visitor\n"),
+                                -1);
+            }
+          
+          // call the visitor on this interface.
+          if (node->accept (visitor) == -1)
+            {
+              delete visitor;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_interface_ch::"
+                                 "visit_interface - "
+                                 "code gen for ami handler failed\n"),
+                                -1);
+            }
+          delete visitor;
+        }
 
       node->cli_hdr_gen (I_TRUE);
     } // if !cli_hdr_gen
diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp
index a4fa8a7cf86..1e96c632e86 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp
@@ -54,9 +54,11 @@
 #include "be_visitor_operation/tie_si.cpp"
 #include "be_visitor_operation/compiled_marshal.cpp"
 #include "be_visitor_operation/rettype_pre_invoke_cs.cpp"
-#include "be_visitor_operation/operation_ami_ch.cpp"
-#include "be_visitor_operation/operation_ami_cs.cpp"
-#include "be_visitor_operation/arglist_ami.cpp"
+#include "be_visitor_operation/ami_ch.cpp"
+#include "be_visitor_operation/ami_cs.cpp"
+#include "be_visitor_operation/ami_arglist.cpp"
+#include "be_visitor_operation/ami_handler_operation_ch.cpp"
+#include "be_visitor_operation/ami_handler_arglist.cpp"
 
 ACE_RCSID(be, be_visitor_operation, "$Id$")
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist_ami.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist_ami.cpp
index 47bbb778cbd..7b2502a4d75 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist_ami.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist_ami.cpp
@@ -51,10 +51,8 @@ be_visitor_operation_arglist_ami::visit_operation (be_operation *node)
   
   *os << " (" << be_idt << be_idt << "\n";
 
-  // #if defined (TAO_IDL_HAS_AMI)
-  // For the AMI, we need the Reply Handler as the first argument.
-
-  // start with current indentation level
+  
+  // Start with current indentation level.
   os->indent ();
 
   
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
index 39fcb55c7f2..b2ccf9ec21e 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
@@ -181,7 +181,7 @@ int be_visitor_operation_collocated_ss::visit_operation (be_operation *node)
       << ");" << be_uidt_nl
       << "servant_upcall.prepare_for_upcall (" << be_idt << be_idt_nl
       << "this->_object_key ()," << be_nl
-      << "\"" << node->local_name () << "\"";
+      << "\"" << node->original_local_name () << "\"";
   if (!idl_global->exception_support ())
     *os << "," << be_nl
         << "ACE_TRY_ENV" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
index ef518c16f67..b8f6978e4f3 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
@@ -8,13 +8,14 @@
 //    TAO IDL
 //
 // = FILENAME
-//    operation_ami_cs.cpp
+//    ami_cs.cpp
 //
 // = DESCRIPTION
 //    Visitor generating code for Operation in the stubs file.
 //
 // = AUTHOR
-//    Aniruddha Gokhale
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu>  
 //
 // ============================================================================
 
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index c34bbfde38b..8cef00013bb 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -275,14 +275,19 @@ public:
     // Emitting code for AMI.
     TAO_OPERATION_AMI_CH,                  // AMI stub generation.  
     TAO_OPERATION_AMI_CS,                  // AMI stub generation.  
-    TAO_OPERATION_ARGLIST_AMI,             // AMI stubs in client header
+    TAO_OPERATION_AMI_ARGLIST,             // AMI stubs in client header
     TAO_OPERATION_ARG_AMI,                 // AMI stub.
     TAO_ARGUMENT_AMI,                      // Argument in AMI stub.
-    TAO_ARGUMENT_ARGLIST_AMI,              // Arg list in AMI stub.
+    TAO_ARGUMENT_AMI_ARGLIST,              // Arg list in AMI stub.
     TAO_AMI_HANDLER_FWD_CH,                // FWD decl for AMI handler.           
     TAO_AMI_HANDLER_FWD_CI,                // FWD decl for AMI handler.
     // @ Alex: FWD does nt make sense.
     //         Should rename it.
+    TAO_AMI_HANDLER_CH,
+    TAO_AMI_HANDLER_OPERATION_CH,
+    TAO_AMI_HANDLER_OPERATION_ARGLIST,
+    TAO_ARGUMENT_AMI_HANDLER_ARGLIST,
+    TAO_ARGUMENT_ARGLIST_AMI_HANDLER,
 
     // Emitting code for root.
     TAO_ROOT_CH,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument.h
index 194cb2f387b..0f9fdf3a6f4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument.h
@@ -39,6 +39,6 @@
 #include "be_visitor_argument/compiled_marshal_cs.h"
 #include "be_visitor_argument/compiled_marshal_ss.h"
 #include "be_visitor_argument/pre_invoke_cs.h"
-#include "be_visitor_argument/arglist_ami.h"
-
+#include "be_visitor_argument/ami_arglist.h"
+#include "be_visitor_argument/ami_handler_arglist.h"
 #endif /* _BE_VISITOR_ARGUMENT_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index 1fd6fad3cf9..37fb2ea0177 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -43,4 +43,5 @@
 #include "be_visitor_interface/tie_si.h"
 #include "be_visitor_interface/ami_handler_fwd_ch.h"
 #include "be_visitor_interface/ami_handler_fwd_ci.h"
+#include "be_visitor_interface/ami_handler_ch.h"
 #endif /* _BE_VISITOR_INTERFACE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ch.h
index b495ed84e2f..158675919c9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ch.h
@@ -23,11 +23,11 @@
 #ifndef _BE_INTERFACE_AMI_HANDLER_FWD_CH_H_
 #define _BE_INTERFACE_AMI_HANDLER_FWD_CH_H_
 
-class be_visitor_ami_handler_fwd_ch : public be_visitor_decl
+class be_visitor_interface_ami_handler_fwd_ch : public be_visitor_decl
 {
   //
   // = TITLE
-  //   be_visitor_ami_handler_fwd_ch
+  //   be_visitor_interface_ami_handler_fwd_ch
   //
   // = DESCRIPTION
   //   This visitor visits the an interface and generates fwd
@@ -35,10 +35,10 @@ class be_visitor_ami_handler_fwd_ch : public be_visitor_decl
   //
   //
 public:
-  be_visitor_ami_handler_fwd_ch (be_visitor_context *ctx);
+  be_visitor_interface_ami_handler_fwd_ch (be_visitor_context *ctx);
   // constructor
 
-  ~be_visitor_ami_handler_fwd_ch (void);
+  ~be_visitor_interface_ami_handler_fwd_ch (void);
   // destructor
 
   virtual int visit_interface (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ci.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ci.h
index ecd01235f01..5714eeeaac1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ci.h
@@ -23,11 +23,11 @@
 #ifndef _BE_INTERFACE_AMI_HANDLER_FWD_CI_H_
 #define _BE_INTERFACE_AMI_HANDLER_FWD_CI_H_
 
-class be_visitor_ami_handler_fwd_ci : public be_visitor_decl
+class be_visitor_interface_ami_handler_fwd_ci : public be_visitor_decl
 {
   //
   // = TITLE
-  //   be_visitor_ami_handler_fwd_ci
+  //   be_visitor_interface_ami_handler_fwd_ci
   //
   // = DESCRIPTION
   //   This visitor visits the interface to generate the forward
@@ -35,10 +35,10 @@ class be_visitor_ami_handler_fwd_ci : public be_visitor_decl
   //
   //
 public:
-  be_visitor_ami_handler_fwd_ci (be_visitor_context *ctx);
+  be_visitor_interface_ami_handler_fwd_ci (be_visitor_context *ctx);
   // constructor
 
-  ~be_visitor_ami_handler_fwd_ci (void);
+  ~be_visitor_interface_ami_handler_fwd_ci (void);
   // destructor
 
   virtual int visit_interface (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h
index e9fd1f3a0e6..3e26d57bf28 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation.h
@@ -53,8 +53,9 @@
 #include "be_visitor_operation/rettype_marshal_ss.h"
 #include "be_visitor_operation/compiled_marshal.h"
 #include "be_visitor_operation/rettype_pre_invoke_cs.h"
-#include "be_visitor_operation/operation_ami_ch.h"
-#include "be_visitor_operation/operation_ami_cs.h"
-#include "be_visitor_operation/arglist_ami.h"
-
+#include "be_visitor_operation/ami_ch.h"
+#include "be_visitor_operation/ami_cs.h"
+#include "be_visitor_operation/ami_arglist.h"
+#include "be_visitor_operation/ami_handler_operation_ch.h"
+#include "be_visitor_operation/ami_handler_arglist.h"
 #endif // TAO_BE_VISITOR_OPERATION_H