ChangeLogTag: Fri Dec 3 16:10:08 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 13 insertions, 249 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 870aa1925df..8392c012eb2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Fri Dec  3 16:10:08 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_root/root_cnh.cpp:
+        * TAO_IDL/be/be_visitor_root/root_cns.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp:
+        * TAO_IDL/be_include/be_codegen.h:
+
+          Removed AMI4CCM reply handler impl stream and the
+          associated mechanism to manage it, since this class is
+          now generated in the component executor.
+
 Fri Dec  3 15:46:55 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * be/be_visitor_component/component_ami_rh_ex_base.cpp:
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 9f6df3d2361..e90e1e6c134 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -52,8 +52,6 @@ TAO_CodeGen::TAO_CodeGen (void)
     ciao_conn_header_ (0),
     ciao_conn_source_ (0),
     ciao_ami_conn_idl_ (0),
-    ciao_ami_rh_impl_header_ (0),
-    ciao_ami_rh_impl_source_ (0),
     gperf_input_filename_ (0)
 {
 }
@@ -1482,130 +1480,6 @@ TAO_CodeGen::ciao_ami_conn_idl (void)
   return this->ciao_ami_conn_idl_;
 }
 
-int
-TAO_CodeGen::start_ciao_ami_rh_impl_header (const char *fname)
-{
-  // Clean up between multiple files.
-  delete this->ciao_ami_rh_impl_header_;
-
-  ACE_NEW_RETURN (this->ciao_ami_rh_impl_header_,
-                  TAO_OutStream,
-                  -1);
-
-  int status =
-    this->ciao_ami_rh_impl_header_->open (
-      fname,
-      TAO_OutStream::CIAO_AMI_RH_IMPL_HDR);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO_CodeGen::")
-                         ACE_TEXT ("start_ciao_ami_rh_impl_header - ")
-                         ACE_TEXT ("Error opening file\n")),
-                        -1);
-    }
-
-  TAO_OutStream &os = *this->ciao_ami_rh_impl_header_;
-
-  os << be_nl
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__
-     << be_nl_2;
-
-  // Generate the #ident string, if any.
-  this->gen_ident_string (this->ciao_conn_header_);
-
-  // Generate the #ifndef clause.
-  this->gen_ifndef_string (fname,
-                           this->ciao_ami_rh_impl_header_,
-                           "CIAO_",
-                           "_H_");
-
-  if (be_global->pre_include () != 0)
-    {
-      os << "#include /**/ \""
-         << be_global->pre_include ()
-         << "\"\n";
-    }
-
-  // This will almost certainly be true, but just in case...
-  if (be_global->conn_export_include () != 0)
-    {
-      this->gen_standard_include (
-        this->ciao_ami_rh_impl_header_,
-        be_global->conn_export_include (),
-        true);
-    }
-
-  // Some compilers don't optimize the #ifndef header include
-  // protection, but do optimize based on #pragma once.
-  os << "\n\n#if !defined (ACE_LACKS_PRAGMA_ONCE)\n"
-     << "# pragma once\n"
-     << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n";
-
-  this->gen_standard_include (
-    this->ciao_ami_rh_impl_header_,
-    be_global->be_get_client_hdr_fname (true));
-
-  *this->ciao_ami_rh_impl_header_ << be_global->versioning_begin ();
-
-  return 0;
-}
-
-TAO_OutStream *
-TAO_CodeGen::ciao_ami_rh_impl_header (void)
-{
-  return this->ciao_ami_rh_impl_header_;
-}
-
-int
-TAO_CodeGen::start_ciao_ami_rh_impl_source (const char *fname)
-{
-  // Clean up between multiple files.
-  delete this->ciao_ami_rh_impl_source_;
-
-  ACE_NEW_RETURN (this->ciao_ami_rh_impl_source_,
-                  TAO_OutStream,
-                  -1);
-
-  int status =
-    this->ciao_ami_rh_impl_source_->open (
-      fname,
-      TAO_OutStream::CIAO_AMI_RH_IMPL_SRC);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO_CodeGen::")
-                         ACE_TEXT ("start_ciao_ami_rh_impl_source - ")
-                         ACE_TEXT ("Error opening file\n")),
-                        -1);
-    }
-
-  TAO_OutStream &os = *this->ciao_ami_rh_impl_source_;
-
-  os << be_nl
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__
-     << be_nl;
-
-  // Generate the #ident string, if any.
-  this->gen_ident_string (this->ciao_ami_rh_impl_source_);
-
-  this->gen_standard_include (
-    this->ciao_ami_rh_impl_source_,
-    be_global->be_get_ciao_ami_conn_impl_hdr_fname (true));
-
-  return 0;
-}
-
-TAO_OutStream *
-TAO_CodeGen::ciao_ami_rh_impl_source (void)
-{
-  return this->ciao_ami_rh_impl_source_;
-}
-
 // Set the server header stream.
 int
 TAO_CodeGen::start_implementation_header (const char *fname)
@@ -2065,37 +1939,6 @@ TAO_CodeGen::end_ciao_ami_conn_idl (void)
   return 0;
 }
 
-int
-TAO_CodeGen::end_ciao_ami_rh_impl_header (void)
-{
-  *this->ciao_ami_rh_impl_header_ << be_nl_2 << "// TAO_IDL - Generated from"
-                                  << be_nl << "// " << __FILE__ << ":"
-                                  << __LINE__ << be_nl;
-
-  // End versioned namespace support before remaining include
-  // directives at end of file.
-  *this->ciao_ami_rh_impl_header_ << be_global->versioning_end ();
-
-  if (be_global->post_include () != 0)
-    {
-      *this->ciao_ami_rh_impl_header_ << "\n\n#include /**/ \""
-                                      << be_global->post_include ()
-                                      << "\"";
-    }
-
-  *this->ciao_ami_rh_impl_header_ << "\n\n#endif /* ifndef */\n";
-
-  return 0;
-}
-
-int
-TAO_CodeGen::end_ciao_ami_rh_impl_source (void)
-{
-  *this->ciao_ami_rh_impl_source_ << "\n";
-
-  return 0;
-}
-
 // We use the following helper functions to pass information. This class is the
 // best place to pass such information rather than passing information through
 // global variables spread everywhere. This class is a singleton and is
@@ -3760,8 +3603,6 @@ TAO_CodeGen::destroy (void)
   delete this->ciao_conn_header_;
   delete this->ciao_conn_source_;
   delete this->ciao_ami_conn_idl_;
-  delete this->ciao_ami_rh_impl_header_;
-  delete this->ciao_ami_rh_impl_source_;
   delete this->gperf_input_stream_;
   delete [] this->gperf_input_filename_;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp
index 091c5f0fbb3..a198b932062 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp
@@ -74,33 +74,6 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node)
   os_ << be_uidt_nl
       << "}";
 
-  /// Presence of -Gex option here triggers generation of AMI4CCM
-  /// reply handler impl class, with empty methods for user to
-  /// complete, in its own set of files.
-  if (be_global->gen_ciao_exec_impl ())
-    {
-      TAO_OutStream *new_stream = tao_cg->ciao_ami_rh_impl_header ();
-
-      if (new_stream == 0)
-        {
-          int status =
-            tao_cg->start_ciao_ami_rh_impl_header (
-              be_global->be_get_ciao_ami_conn_impl_hdr_fname ());
-
-           if (status == -1)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("be_visitor_connector_ami_exh")
-                                   ACE_TEXT ("::visit_connector - ")
-                                   ACE_TEXT ("Error opening CIAO AMI ")
-                                   ACE_TEXT ("conn rh impl header file\n")),
-                                  -1);
-              }
-
-            new_stream = tao_cg->ciao_ami_rh_impl_header ();
-        }
-    }
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
index f572d6c0e76..624f08c864d 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
@@ -67,33 +67,6 @@ be_visitor_connector_ami_exs::visit_connector (be_connector *node)
   os_ << be_uidt_nl
       << "}";
 
-  /// Presence of -Gex option here triggers generation of AMI4CCM
-  /// reply handler impl class, with empty methods for user to
-  /// complete, in its own set of files.
-  if (be_global->gen_ciao_exec_impl ())
-    {
-      TAO_OutStream *new_stream = tao_cg->ciao_ami_rh_impl_source ();
-
-      if (new_stream == 0)
-        {
-          int status =
-            tao_cg->start_ciao_ami_rh_impl_source (
-              be_global->be_get_ciao_ami_conn_impl_src_fname ());
-
-           if (status == -1)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("be_visitor_connector_ami_exh")
-                                   ACE_TEXT ("::visit_connector - ")
-                                   ACE_TEXT ("Error opening CIAO AMI ")
-                                   ACE_TEXT ("conn rh impl header file\n")),
-                                  -1);
-              }
-
-            new_stream = tao_cg->ciao_ami_rh_impl_source ();
-        }
-    }
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp
index 017c73ec855..b2764612aef 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp
@@ -47,16 +47,6 @@ be_visitor_root_cnh::visit_root (be_root *node)
 
   (void) tao_cg->end_ciao_conn_header ();
 
-  TAO_OutStream *rh_impl = tao_cg->ciao_ami_rh_impl_header ();
-
-  /// If this stream has been created during the connector AST
-  /// pass we generate the file ending stuff here, to make sure
-  /// that all the AST nodes have been traversed.
-  if (rh_impl != 0)
-    {
-      (void) tao_cg->end_ciao_ami_rh_impl_header ();
-    }
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp
index 9995a73c7c8..eac09e96d28 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp
@@ -47,16 +47,6 @@ be_visitor_root_cns::visit_root (be_root *node)
 
   (void) tao_cg->end_ciao_conn_source ();
 
-  TAO_OutStream *rh_impl = tao_cg->ciao_ami_rh_impl_source ();
-
-  /// If this stream has been created during the connector AST
-  /// pass we generate the file ending stuff here, to make sure
-  /// that all the AST nodes have been traversed.
-  if (rh_impl != 0)
-    {
-      (void) tao_cg->end_ciao_ami_rh_impl_source ();
-    }
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 981c7c8de88..dad318e6a64 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -247,8 +247,6 @@ public:
   int start_ciao_conn_header (const char *fname);
   int start_ciao_conn_source (const char *fname);
   int start_ciao_ami_conn_idl (const char *fname);
-  int start_ciao_ami_rh_impl_header (const char *fname);
-  int start_ciao_ami_rh_impl_source (const char *fname);
 
   /// Generate code at the end such as the <<= and >>= operators along
   /// with the ending #endif statement.
@@ -295,8 +293,6 @@ public:
   int end_ciao_conn_header (void);
   int end_ciao_conn_source (void);
   int end_ciao_ami_conn_idl (void);
-  int end_ciao_ami_rh_impl_header (void);
-  int end_ciao_ami_rh_impl_source (void);
 
   /// Get the client header stream.
   TAO_OutStream *client_header (void);
@@ -361,12 +357,6 @@ public:
   /// Get the CIAO AMI connector IDL stream.
   TAO_OutStream *ciao_ami_conn_idl (void);
 
-  /// Get the CIAO connector impl header stream.
-  TAO_OutStream *ciao_ami_rh_impl_header (void);
-
-  /// Get the CIAO connector impl source stream.
-  TAO_OutStream *ciao_ami_rh_impl_source (void);
-
   /// Set the gperf input file stream.
   void gperf_input_stream (TAO_OutStream *gperf_input);
 
@@ -504,12 +494,6 @@ private:
   /// Component connector impl source file.
   TAO_OutStream *ciao_ami_conn_idl_;
 
-  /// Component connector impl header file.
-  TAO_OutStream *ciao_ami_rh_impl_header_;
-
-  /// Component connector impl source file.
-  TAO_OutStream *ciao_ami_rh_impl_source_;
-
   /**
    * Name of the temp file used to collect the input for gperf
    * program. This is needed coz I do ACE_OS::open on this when I need