ChangeLogTag:Mon Oct 23 02:49:25 2000 Ossama Othman <ossama@uci.edu>

8 files changed, 38 insertions, 38 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ch.cpp
index 1dc88ca4adb..1dbad147e99 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ch.cpp
@@ -63,7 +63,7 @@ int be_visitor_interface_interceptors_ch::visit_interface (be_interface *node)
   *os << "// Generation of interceptors related RequestInfo"
       << " classes per operation." << be_nl
       << "// This needed to be able to store the arguments, "
-      << "exceptiosn, constexts" << be_nl
+      << "exceptions, contexts" << be_nl
       << "// and build the lists dynamically on demand so that "
       << "unnecessary time overhead" << be_nl
       << "// of building these lists when they arent used is "
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp
index 933be2c80aa..64dd286b395 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp
@@ -62,8 +62,8 @@ int be_visitor_interface_interceptors_sh::visit_interface (be_interface *node)
 
   *os << "// Generation of interceptors related RequestInfo classes "
       << "per operation." << be_nl
-      << "// This needed to be able to store the arguments, exceptiosn, "
-      << "constexts" << be_nl
+      << "// This needed to be able to store the arguments, exceptions, "
+      << "contexts" << be_nl
       << "// and build the lists dynamically on demand so that "
       << "unnecessary time overhead" << be_nl
       << "// of building these lists when they arent used is avoided." 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ch.cpp
index fcf4150daf1..9ec9dbe163e 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ch.cpp
@@ -55,11 +55,11 @@ be_visitor_operation_interceptors_ch::visit_operation (be_operation *node)
   // Save the node
   this->ctx_->node (node);
 
-  // Generate the ClientRequest_Info object per operation to
+  // Generate the ClientRequestInfo object per operation to
   // be used by the interecptors.
 
   // Start with the current indentation level.
-  *os << "class TAO_ClientRequest_Info_" << node->flat_name ();
+  *os << "class TAO_ClientRequestInfo_" << node->flat_name ();
 
   // 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
@@ -91,7 +91,7 @@ be_visitor_operation_interceptors_ch::visit_operation (be_operation *node)
         }
     }
 
-  *os << " : public TAO_ClientRequest_Info" << be_nl
+  *os << " : public TAO_ClientRequestInfo" << be_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
 
@@ -104,7 +104,7 @@ be_visitor_operation_interceptors_ch::visit_operation (be_operation *node)
 
   *os << parent->full_name () << ";" << be_nl << be_nl;
 
-  *os << "TAO_ClientRequest_Info_" << node->flat_name ();
+  *os << "TAO_ClientRequestInfo_" << node->flat_name ();
 
   // 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
@@ -202,7 +202,7 @@ be_visitor_operation_interceptors_ch::visit_operation (be_operation *node)
 
   *os << "private:" << be_idt_nl;
 
-  *os << "TAO_ClientRequest_Info_" << node->flat_name ();
+  *os << "TAO_ClientRequestInfo_" << node->flat_name ();
 
   // 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
@@ -234,7 +234,7 @@ be_visitor_operation_interceptors_ch::visit_operation (be_operation *node)
         }
     }
 
-  *os << " (const " << "TAO_ClientRequest_Info_" << node->flat_name ();
+  *os << " (const " << "TAO_ClientRequestInfo_" << node->flat_name ();
 
   // 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
@@ -268,7 +268,7 @@ be_visitor_operation_interceptors_ch::visit_operation (be_operation *node)
 
   *os << " &);" << be_nl
       << "void operator= (const "
-      << "TAO_ClientRequest_Info_"<< node->flat_name ();
+      << "TAO_ClientRequestInfo_"<< node->flat_name ();
 
   // 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
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
index 189c4febb2d..4c93b959529 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
@@ -58,7 +58,7 @@ be_visitor_operation_interceptors_cs::visit_operation (be_operation *node)
   // Start with the current indentation level.
   os->indent ();
 
-  // Generate the ClientRequest_Info object definition per operation
+  // Generate the ClientRequestInfo object definition per operation
   // to be used by the interecptors.
   if (node->is_nested ())
     {
@@ -68,7 +68,7 @@ be_visitor_operation_interceptors_cs::visit_operation (be_operation *node)
       *os << parent->full_name () << "::";
     }
 
-  *os << "TAO_ClientRequest_Info_"<< node->flat_name ();
+  *os << "TAO_ClientRequestInfo_"<< node->flat_name ();
 
   // 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
@@ -101,7 +101,7 @@ be_visitor_operation_interceptors_cs::visit_operation (be_operation *node)
     }
 
   *os << "::"
-      << "TAO_ClientRequest_Info_"<< node->flat_name ();
+      << "TAO_ClientRequestInfo_"<< node->flat_name ();
 
   // 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
@@ -162,7 +162,7 @@ be_visitor_operation_interceptors_cs::visit_operation (be_operation *node)
   // Generate the member list and set each member but before that,
   // its necessary to pass on some args to the base class.
   os->indent ();
-  *os << "  : TAO_ClientRequest_Info (_tao_operation, "
+  *os << "  : TAO_ClientRequestInfo (_tao_operation, "
       << "_tao_service_context_list, _tao_target)";
 
   ctx = *this->ctx_;
@@ -195,7 +195,7 @@ be_visitor_operation_interceptors_cs::visit_operation (be_operation *node)
     }
 
   // The interceptors cant modify "in" and "out" parameters.
-  *os << "TAO_ClientRequest_Info_" << node->flat_name ();
+  *os << "TAO_ClientRequestInfo_" << node->flat_name ();
 
   // 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
@@ -279,7 +279,7 @@ be_visitor_operation_interceptors_cs::visit_operation (be_operation *node)
       *os << parent->full_name () << "::";
     }
 
-  *os << "TAO_ClientRequest_Info_" << node->flat_name ();
+  *os << "TAO_ClientRequestInfo_" << node->flat_name ();
 
   // 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
@@ -356,7 +356,7 @@ be_visitor_operation_interceptors_cs::visit_operation (be_operation *node)
       *os << parent->full_name () << "::";
     }
 
-  *os << "TAO_ClientRequest_Info_" << node->flat_name ();
+  *os << "TAO_ClientRequestInfo_" << node->flat_name ();
 
   // 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
@@ -453,7 +453,7 @@ be_visitor_operation_interceptors_cs::visit_operation (be_operation *node)
           *os << parent->full_name () << "::";
         }
 
-      *os << "TAO_ClientRequest_Info_"<< node->flat_name ();
+      *os << "TAO_ClientRequestInfo_"<< node->flat_name ();
 
       // 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
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_sh.cpp
index 5bd8b3bf388..eadb04df41b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_sh.cpp
@@ -51,10 +51,10 @@ be_visitor_operation_interceptors_sh::visit_operation (be_operation *node)
   // save the node.
   this->ctx_->node (node);
 
-  // Generate the ServerRequest_Info object per operation to 
+  // Generate the ServerRequestInfo object per operation to 
   // be used by the interecptors.
 
-  *os << "class TAO_ServerRequest_Info_"<< node->flat_name ();
+  *os << "class TAO_ServerRequestInfo_"<< node->flat_name ();
 
   // 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
@@ -86,7 +86,7 @@ be_visitor_operation_interceptors_sh::visit_operation (be_operation *node)
         }
     }
 
-  *os << " : public TAO_ServerRequest_Info" << be_nl
+  *os << " : public TAO_ServerRequestInfo" << be_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
 
@@ -98,7 +98,7 @@ be_visitor_operation_interceptors_sh::visit_operation (be_operation *node)
     be_scope::narrow_from_scope (node->defined_in ())->decl ();
 
   *os << "POA_" << parent->full_name () << ";"<<be_nl;
-  *os << "TAO_ServerRequest_Info_"<< node->flat_name ();
+  *os << "TAO_ServerRequestInfo_"<< node->flat_name ();
 
   // 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
@@ -192,7 +192,7 @@ be_visitor_operation_interceptors_sh::visit_operation (be_operation *node)
 
   *os << be_uidt_nl << "private:" << be_idt_nl;
 
-  *os << "TAO_ServerRequest_Info_" << node->flat_name ();
+  *os << "TAO_ServerRequestInfo_" << node->flat_name ();
 
   // 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
@@ -224,7 +224,7 @@ be_visitor_operation_interceptors_sh::visit_operation (be_operation *node)
         }
     }
 
-  *os << " (const "<< "TAO_ServerRequest_Info_"<< node->flat_name ();
+  *os << " (const "<< "TAO_ServerRequestInfo_"<< node->flat_name ();
 
   // 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
@@ -259,7 +259,7 @@ be_visitor_operation_interceptors_sh::visit_operation (be_operation *node)
 
   *os << " &);" << be_nl
       << "void operator= (const "
-      << "TAO_ServerRequest_Info_"<< node->flat_name ();
+      << "TAO_ServerRequestInfo_"<< node->flat_name ();
 
   // 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
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
index 678ba6ebfea..97d2373933c 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
@@ -59,7 +59,7 @@ be_visitor_operation_interceptors_ss::visit_operation (be_operation *node)
   // Start with the current indentation level.
   os->indent ();
 
-  // Generate the ServerRequest_Info object definition per operation
+  // Generate the ServerRequestInfo object definition per operation
   // to be used by the interceptors.
   if (node->is_nested ())
     {
@@ -69,7 +69,7 @@ be_visitor_operation_interceptors_ss::visit_operation (be_operation *node)
       *os << "POA_" << parent->full_name () << "::";
     }
 
-  *os << "TAO_ServerRequest_Info_" << node->flat_name ();
+  *os << "TAO_ServerRequestInfo_" << node->flat_name ();
 
   // 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
@@ -102,7 +102,7 @@ be_visitor_operation_interceptors_ss::visit_operation (be_operation *node)
     }
 
   *os << "::"
-      << "TAO_ServerRequest_Info_" << node->flat_name ();
+      << "TAO_ServerRequestInfo_" << node->flat_name ();
 
   // 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
@@ -161,7 +161,7 @@ be_visitor_operation_interceptors_ss::visit_operation (be_operation *node)
 
   // Generate the member list and set each member but before that,
   // its necessary to pass on some args to the base class.
-  *os << ": TAO_ServerRequest_Info (_tao_operation, "
+  *os << ": TAO_ServerRequestInfo (_tao_operation, "
       << "_tao_service_context_list)";
 
   ctx = *this->ctx_;
@@ -193,7 +193,7 @@ be_visitor_operation_interceptors_ss::visit_operation (be_operation *node)
       *os << "POA_" << parent->full_name () << "::";
     }
 
-  *os << "TAO_ServerRequest_Info_"<<node->flat_name ();
+  *os << "TAO_ServerRequestInfo_"<<node->flat_name ();
 
   // 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
@@ -275,7 +275,7 @@ be_visitor_operation_interceptors_ss::visit_operation (be_operation *node)
       *os << "POA_" << parent->full_name () << "::";
     }
 
-  *os << "TAO_ServerRequest_Info_"<<node->flat_name ();
+  *os << "TAO_ServerRequestInfo_"<<node->flat_name ();
 
   // 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
@@ -352,7 +352,7 @@ be_visitor_operation_interceptors_ss::visit_operation (be_operation *node)
       *os << "POA_" <<parent->full_name () << "::";
     }
 
-  *os << "TAO_ServerRequest_Info_"<<node->flat_name ();
+  *os << "TAO_ServerRequestInfo_"<<node->flat_name ();
 
     // 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
@@ -448,7 +448,7 @@ be_visitor_operation_interceptors_ss::visit_operation (be_operation *node)
           *os << "POA_"<< parent->full_name () << "::";
         }
 
-      *os << "TAO_ServerRequest_Info_" << node->flat_name ();
+      *os << "TAO_ServerRequestInfo_" << node->flat_name ();
 
       // 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
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index 27b7f97ca90..c9c82ee353d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -354,7 +354,7 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
   *os << "\n#if (TAO_HAS_INTERCEPTORS == 1)" << be_uidt_nl;
   *os << "TAO_ClientRequestInterceptor_Adapter _tao_vfr ("
       << be_idt << be_idt_nl
-      << "istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)"
+      << "istub->orb_core ()->client_request_interceptors ()"
       << be_uidt_nl
       << ");" << be_uidt_nl;
   os->decr_indent ();
@@ -381,7 +381,7 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
       *os << parent->full_name () << "::";
     }
 
-  *os << "TAO_ClientRequest_Info_" << node->flat_name ();
+  *os << "TAO_ClientRequestInfo_" << node->flat_name ();
 
   // 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
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index a8531a383fc..ea3bef484c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -192,8 +192,8 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   *os << "#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl
       << "TAO_ServerRequestInterceptor_Adapter _tao_vfr (" 
       << be_idt << be_idt_nl
-      << "_tao_server_request.orb ()->"
-      << "_get_server_interceptor (ACE_TRY_ENV)" << be_uidt_nl
+      << "_tao_server_request.orb_core ()->server_request_interceptors ()"
+      << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_CHECK;" << be_nl;
 
@@ -206,7 +206,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       *os << "POA_" << parent->full_name () << "::";
     }
 
-  *os << "TAO_ServerRequest_Info_" << node->flat_name ();
+  *os << "TAO_ServerRequestInfo_" << node->flat_name ();
 
   // 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