1 files changed, 36 insertions, 29 deletions

diff --git a/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp b/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
index 8980cf1ccbe..57ea0791ac3 100644
--- a/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
+++ b/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
@@ -33,13 +33,13 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
   ACE_CString class_name_str (scope->local_name ()->get_string ());
   class_name_str += suffix;
   const char *class_name = class_name_str.c_str ();
-  
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << class_name << "::"
       << class_name << " (void)" << be_idt_nl
       << ": facet_exec_ (new ";
-      
-  /// The port is the only item in the connector's scope.    
+
+  /// The port is the only item in the connector's scope.
   UTL_ScopeActiveIterator j (node, UTL_Scope::IK_decls);
   AST_Extended_Port *p =
     AST_Extended_Port::narrow_from_decl (j.item ());
@@ -50,24 +50,24 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
     {
       AST_Decl *d = i.item ();
       AST_Provides *p = AST_Provides::narrow_from_decl (d);
-      
+
       if (p != 0)
         {
           os_ << p->provides_type ()->local_name ();
         }
     }
-    
+
   os_ << suffix << " ())" << be_uidt_nl
       << "{" << be_nl
       << "}";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << class_name << "::~"
       << class_name << " (void)" << be_nl
       << "{" << be_idt_nl
       << "delete this->facet_exec_;" << be_uidt_nl
       << "}";
-      
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -76,42 +76,49 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
                          ACE_TEXT ("visit_scope() failed\n")),
                         -1);
     }
-    
-  os_ << be_nl << be_nl
+
+  const char *container_type = be_global->ciao_container_type ();
+
+  os_ << be_nl_2
       << "void" << be_nl
-      << class_name << "::set_session_context (" << be_idt_nl
-      << "::Components::SessionContext_ptr ctx)"
+      << class_name << "::set_"
+      << tao_cg->downcase (container_type)
+      << "_context (" << be_idt_nl
+      << "::Components::" << be_global->ciao_container_type ()
+      << "Context_ptr ctx)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "this->facet_exec_->set_session_context "
+      << "this->facet_exec_->set_"
+      << tao_cg->downcase (container_type)
+      << "_context "
       << "(ctx);" << be_uidt_nl
       << "}";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "void" << be_nl
       << class_name << "::configuration_complete (void)" << be_nl
       << "{" << be_idt_nl
       << "this->facet_exec_->_set_component (this);" << be_uidt_nl
       << "}";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "void" << be_nl
       << class_name << "::ccm_activate (void)" << be_nl
       << "{" << be_nl
       << "}";
-      
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << "void" << be_nl
       << class_name << "::ccm_passivate (void)" << be_nl
       << "{" << be_nl
       << "}";
-      
+
   AST_Decl *s = ScopeAsDecl (this->node_->defined_in ());
   bool is_global =
    (s->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (is_global ? "" : "::");
 
-  os_ << be_nl << be_nl
+  os_ << be_nl_2
       << "void" << be_nl
       << class_name << "::ccm_remove (void)" << be_nl
       << "{" << be_idt_nl
@@ -120,7 +127,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
       << "CCM_" << this->node_->local_name ()
       << "::_nil ());" << be_uidt << be_uidt_nl
       << "}";
-  
+
   return 0;
 }
 
@@ -131,24 +138,24 @@ be_visitor_executor_ami_exs::visit_provides (be_provides *node)
   AST_Decl *scope = ScopeAsDecl (t->defined_in ());
   bool global = (scope->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (global ? "" : "::");
-  
-  os_ << be_nl << be_nl
+
+  os_ << be_nl_2
       << smart_scope << scope->full_name () << "::CCM_"
       << t->local_name () << "_ptr" << be_nl
       << ScopeAsDecl (this->node_->defined_in ())->local_name ()
       << "_exec_i::get_";
-      
+
   /// The port is the only thing in the connector's scope, and
-  /// we need to insert its name into the operation name.    
+  /// we need to insert its name into the operation name.
   UTL_ScopeActiveIterator i (this->node_, UTL_Scope::IK_decls);
   AST_Decl *d = i.item ();
-  
+
   os_ << d->local_name () << "_"
       << node->local_name () << " (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->facet_exec_;" << be_uidt_nl
       << "}";
-  
+
   return 0;
 }