Mon Apr 12 06:53:23 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * docs/compiler.html
        * TAO_IDL/be/be_global.cpp
        * TAO_IDL/be/be_visitor_component/context_svh.cpp
        * TAO_IDL/be/be_visitor_component/context_svs.cpp
        * TAO_IDL/be/be_visitor_component/servant_svh.cpp
        * TAO_IDL/be/be_visitor_component/servant_svs.cpp
        * TAO_IDL/be/be_visitor_component_scope.cpp
        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp
        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
        * TAO_IDL/be_include/be_global.h
        * TAO_IDL/be_include/be_visitor_component_scope.h
          Removed support for static configuration and ciao specific
          ccm event extensions which are not used anymore

12 files changed, 85 insertions, 351 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8b60a64575b..0aab6655bf8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Mon Apr 12 06:53:23 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/compiler.html
+        * TAO_IDL/be/be_global.cpp
+        * TAO_IDL/be/be_visitor_component/context_svh.cpp
+        * TAO_IDL/be/be_visitor_component/context_svs.cpp
+        * TAO_IDL/be/be_visitor_component/servant_svh.cpp
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp
+        * TAO_IDL/be/be_visitor_component_scope.cpp
+        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+        * TAO_IDL/be_include/be_global.h
+        * TAO_IDL/be_include/be_visitor_component_scope.h
+          Removed support for static configuration and ciao specific
+          ccm event extensions which are not used anymore
+
 Fri Apr  9 14:33:23 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp:
@@ -31,16 +47,16 @@ Fri Apr  9 14:33:23 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 Fri Apr  9 13:37:29 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp(visit_sequence):
-        
+
           Added OMG-preferred 'const' qualifier to the generated
           sequence pointer declaration.
-          
+
         * TAO_IDL/be/be_visitor_attribute/component_init.cpp:
-        
+
           Cosmetic changes.
-          
+
         * TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp:
-        
+
           Implemented override for visit_typedef()
 
 Fri Apr  9 13:34:25 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index e0e42a8f931..782b16893e0 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -126,7 +126,6 @@ BE_GlobalData::BE_GlobalData (void)
     gen_ciao_exec_idl_ (false),
     gen_ciao_exec_impl_ (false),
     gen_ciao_conn_impl_ (false),
-    gen_ciao_static_config_ (false),
     gen_ciao_valuefactory_reg_ (true),
     gen_stub_export_hdr_file_ (false),
     gen_skel_export_hdr_file_ (false),
@@ -2234,18 +2233,6 @@ BE_GlobalData::gen_ciao_conn_impl (bool val)
 }
 
 bool
-BE_GlobalData::gen_ciao_static_config (void) const
-{
-  return this->gen_ciao_static_config_;
-}
-
-void
-BE_GlobalData::gen_ciao_static_config (bool val)
-{
-  this->gen_ciao_static_config_ = val;
-}
-
-bool
 BE_GlobalData::gen_ciao_valuefactory_reg (void) const
 {
   return this->gen_ciao_valuefactory_reg_;
@@ -2770,11 +2757,6 @@ BE_GlobalData::parse_args (long &i, char **av)
                 // CIAO servant code generation.
                 be_global->gen_ciao_svnt (true);
               }
-            else if (av[i][3] == 'c')
-              {
-                // CIAO static configuration code generation.
-                be_global->gen_ciao_static_config (true);
-              }
             else
               {
                 ACE_ERROR ((
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp
index ecfc9ba56cf..01dd30a36d4 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp
@@ -70,11 +70,11 @@ be_visitor_context_svh::visit_component (be_component *node)
   os_ << "typedef base_type::context_type context_type;" << be_nl
       << "typedef base_type::component_type component_type;"
       << be_nl;
-      
-  AST_Decl::NodeType nt = this->node_->node_type ();    
+
+  AST_Decl::NodeType nt = this->node_->node_type ();
   bool is_connector = (nt == AST_Decl::NT_connector);
   bool no_events = false;
-  
+
   if (!is_connector)
     {
       no_events =
@@ -82,9 +82,9 @@ be_visitor_context_svh::visit_component (be_component *node)
          && !node->has_emits ()
          && !node->has_publishes ());
     }
-    
+
   bool de_facto = (is_connector || no_events);
-  
+
   os_ << "typedef ::CIAO::"
       << (de_facto ? "Connector_" : "")
       << "Servant_Impl_Base svnt_base_type;" << be_nl << be_nl;
@@ -224,12 +224,6 @@ be_visitor_context_svh::visit_publishes (be_publishes *node)
       << "::" << obj_name << "Consumer_ptr c);" << be_uidt_nl;
 
   os_ << be_nl
-      << "// CIAO-specific." << be_nl
-      << "::Components::Cookie *" << be_nl
-      << "subscribe_" << port_name << "_generic (" << be_idt_nl
-      << "::Components::EventConsumerBase_ptr c);" << be_uidt_nl;
-
-  os_ << be_nl
       << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
       << "unsubscribe_" << port_name << " (" << be_idt_nl
       << "::Components::Cookie * ck);" << be_uidt;
@@ -246,15 +240,6 @@ be_visitor_context_svh::visit_publishes (be_publishes *node)
       << "TAO_SYNCH_MUTEX " << port_name << "_lock_;"
       << be_nl << be_nl;
 
-  os_ << "typedef ACE_Array_Map<ptrdiff_t," << be_nl
-      << "                      ::Components::EventConsumerBase_var>"
-      << be_idt_nl
-      << tao_cg->upcase (port_name)
-      << "_GENERIC_TABLE;" << be_uidt_nl
-      << tao_cg->upcase (port_name)
-      << "_GENERIC_TABLE ciao_publishes_"
-      << port_name << "_generic_;";
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp
index edfdf6e7fbe..6574a9bce5a 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp
@@ -132,13 +132,10 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "::" << fname << " * ev)" << be_uidt_nl
       << "{" << be_idt_nl;
 
-  if (! static_config_)
-    {
-      os_ << "ACE_READ_GUARD (TAO_SYNCH_MUTEX," << be_nl
-          << "                mon," << be_nl
-          << "                this->" << port_name
-          << "_lock_);" << be_nl << be_nl;
-    }
+  os_ << "ACE_READ_GUARD (TAO_SYNCH_MUTEX," << be_nl
+      << "                mon," << be_nl
+      << "                this->" << port_name
+      << "_lock_);" << be_nl << be_nl;
 
   os_ << "for (" << tao_cg->upcase (port_name)
       << "_TABLE::const_iterator iter =" << be_nl
@@ -150,24 +147,6 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "{" << be_idt_nl
       << "iter->second->push_" << lname << " (ev);"
       << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "ACE_CString source_id (this->_ciao_instance_id ());"
-      << be_nl
-      << "source_id += \"_" << port_name << "\";"
-      << be_nl << be_nl
-      << "for (" << tao_cg->upcase (port_name)
-      << "_GENERIC_TABLE::const_iterator giter =" << be_nl
-      << "       this->ciao_publishes_" << port_name
-      << "_generic_.begin ();" << be_nl
-      << "     giter != this->ciao_publishes_"
-      << port_name << "_generic_.end ();" << be_nl
-      << "     ++giter)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "giter->second->ciao_push_event (ev," << be_nl
-      << "                                source_id.c_str (),"
-      << be_nl
-      << "                                " << global
-      << sname << "::_tc_" << lname << ");" << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
       << "}";
 
@@ -190,91 +169,24 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "entry.second = ::" << fname
       << "Consumer::_duplicate (c);" << be_nl << be_nl;
 
-  if (! static_config_)
-    {
-    os_ << "{" << be_idt_nl
-        << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-        << "                        mon," << be_nl
-        << "                        this->" << port_name
-        << "_lock_," << be_nl
-        << "                        0);" << be_nl << be_nl;
-    }
+  os_ << "{" << be_idt_nl
+      << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                        mon," << be_nl
+      << "                        this->" << port_name
+      << "_lock_," << be_nl
+      << "                        0);" << be_nl << be_nl;
 
   os_ << "result = this->ciao_publishes_" << port_name
       << "_.insert (entry);";
 
-  if (! static_config_)
-    {
-      os_ << be_uidt_nl
-          << "}";
-    }
-
-  os_ << be_nl << be_nl
-      << "if (! result.second)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "ACE_ERROR_RETURN ((LM_ERROR," << be_nl
-      << "                   ACE_TEXT (\"subscribe on %s failed\\n\"),"
-      << be_nl
-      << "                   ACE_TEXT (\"" << port_name
-      << "\"))," << be_nl
-      << "                  0);" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "::Components::Cookie * retv = 0;" << be_nl
-      << "ACE_NEW_THROW_EX (retv," << be_nl
-      << "                  ::CIAO::Cookie_Impl (entry.first),"
-      << be_nl
-      << "                  ::CORBA::NO_MEMORY ());"
-      << be_nl << be_nl
-      << "return retv;" << be_uidt_nl
+  os_ << be_uidt_nl
       << "}";
 
   os_ << be_nl << be_nl
-      << "::Components::Cookie *" << be_nl
-      << node_->local_name () << "_Context::subscribe_"
-      << port_name << "_generic (" << be_idt_nl
-      << "::Components::EventConsumerBase_ptr c)" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if ( ::CORBA::is_nil (c))" << be_idt_nl
-      << "{" << be_idt_nl
-      << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "std::pair<" << tao_cg->upcase (port_name)
-      << "_GENERIC_TABLE::iterator, bool> result;" << be_nl
-      << tao_cg->upcase (port_name)
-      << "_GENERIC_TABLE::value_type entry;" << be_nl
-      << "entry.first = reinterpret_cast<ptrdiff_t> (c);"
-      << be_nl
-      << "entry.second =" << be_idt_nl
-      << "::Components::EventConsumerBase::_duplicate (c);"
-      << be_uidt_nl << be_nl;
-
-  if (! static_config_)
-    {
-      os_ << "{" << be_idt_nl
-          << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-          << "                        mon," << be_nl
-          << "                        this->" << port_name
-          << "_lock_," << be_nl
-          << "                        0);" << be_nl << be_nl;
-    }
-
-  os_ << "result =" << be_idt_nl
-      << "this->ciao_publishes_" << port_name
-      << "_generic_.insert (entry);" << be_uidt;
-
-  if (! static_config_)
-    {
-      os_ << be_uidt_nl
-          << "}";
-    }
-
-  os_ << be_nl << be_nl
       << "if (! result.second)" << be_idt_nl
       << "{" << be_idt_nl
       << "ACE_ERROR_RETURN ((LM_ERROR," << be_nl
-      << "                   ACE_TEXT (\"generic subscribe \")"
-      << be_nl
-      << "                   ACE_TEXT (\"on %s failed\\n\"),"
+      << "                   ACE_TEXT (\"subscribe on %s failed\\n\"),"
       << be_nl
       << "                   ACE_TEXT (\"" << port_name
       << "\"))," << be_nl
@@ -304,16 +216,13 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
 
-  if (! static_config_)
-    {
-      os_ << "{" << be_idt_nl
-          << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-          << "                        mon," << be_nl
-          << "                        this->" << port_name
-          << "_lock_," << be_nl
-          << "                        ::" << fname
-          << "Consumer::_nil ());" << be_nl << be_nl;
-    }
+  os_ << "{" << be_idt_nl
+      << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                        mon," << be_nl
+      << "                        this->" << port_name
+      << "_lock_," << be_nl
+      << "                        ::" << fname
+      << "Consumer::_nil ());" << be_nl << be_nl;
 
   os_ << tao_cg->upcase (port_name) << "_TABLE::iterator iter ="
       << be_idt_nl
@@ -331,24 +240,10 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "return retv._retn ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << tao_cg->upcase (port_name)
-      << "_GENERIC_TABLE::iterator giter =" << be_idt_nl
-      << "this->ciao_publishes_" << port_name
-      << "_generic_.find (key);" << be_uidt_nl << be_nl
-      << "if (giter == this->ciao_publishes_" << port_name
-      << "_generic_.end ())" << be_idt_nl
-      << "{" << be_idt_nl
-      << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "n = this->ciao_publishes_" << port_name
-      << "_generic_.erase (key);";
+      << "}" << be_uidt_nl << be_nl;
 
-  if (! static_config_)
-    {
-      os_ << be_uidt_nl
-          << "}";
-    }
+  os_ << be_uidt_nl
+      << "}";
 
   os_ << be_nl << be_nl
       << "if (n != 1UL)" << be_idt_nl
@@ -482,7 +377,6 @@ be_visitor_context_svs::gen_uses_multiplex (
   const char *port_name)
 {
   const char *fname = obj->full_name ();
-  bool static_config = be_global->gen_ciao_static_config ();
 
   os_ << be_nl << be_nl
       << "::" << node_->full_name () << "::" << port_name
@@ -491,14 +385,11 @@ be_visitor_context_svs::gen_uses_multiplex (
       << port_name << " (void)" << be_nl
       << "{" << be_idt_nl;
 
-  if (! static_config)
-    {
-      os_ << "ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-          << "                       mon," << be_nl
-          << "                       this->" << port_name
-          << "_lock_," << be_nl
-          << "                       0);" << be_nl << be_nl;
-    }
+  os_ << "ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                       mon," << be_nl
+      << "                       this->" << port_name
+      << "_lock_," << be_nl
+      << "                       0);" << be_nl << be_nl;
 
   os_ << "::" << node_->full_name () << "::" << port_name
       << "Connections * tmp_retv = 0;" << be_nl
@@ -549,26 +440,20 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "entry.second = ::" << fname
       << "::_duplicate (c);";
 
-  if (! static_config)
-    {
-      os_ << be_nl << be_nl
-          << "{" << be_idt_nl
-          << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-          << "                        mon," << be_nl
-          << "                        this->" << port_name
-          << "_lock_," << be_nl
-          << "                        0);";
-    }
+  os_ << be_nl << be_nl
+      << "{" << be_idt_nl
+      << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                        mon," << be_nl
+      << "                        this->" << port_name
+      << "_lock_," << be_nl
+      << "                        0);";
 
   os_ << be_nl << be_nl
       << "result = this->ciao_uses_" << port_name
       << "_.insert (entry);";
 
-  if (! static_config)
-    {
-      os_ << be_uidt_nl
-          << "}";
-    }
+  os_ << be_uidt_nl
+      << "}";
 
   os_ << be_nl << be_nl
       << "if (! result.second)" << be_idt_nl
@@ -601,17 +486,14 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
       << "}" << be_uidt;
 
-  if (! static_config)
-    {
-      os_ << be_nl << be_nl
-          << "{" << be_idt_nl
-          << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-          << "                        mon," << be_nl
-          << "                        this->" << port_name
-          << "_lock_," << be_nl
-          << "                        ::" << fname
-          << "::_nil ());";
-    }
+  os_ << be_nl << be_nl
+      << "{" << be_idt_nl
+      << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                        mon," << be_nl
+      << "                        this->" << port_name
+      << "_lock_," << be_nl
+      << "                        ::" << fname
+      << "::_nil ());";
 
   os_ << be_nl << be_nl
       << tao_cg->upcase (port_name)
@@ -627,11 +509,8 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "n = this->ciao_uses_" << port_name
       << "_.erase (key);";
 
-  if (! static_config)
-    {
-      os_ << be_uidt_nl
-          << "}";
-    }
+  os_ << be_uidt_nl
+      << "}";
 
   os_ << be_nl << be_nl
       << "if (n != 1UL)" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
index 751f8047b9a..27f77fd6498 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
@@ -228,12 +228,6 @@ be_visitor_servant_svh::visit_publishes (be_publishes *node)
       << "::" << obj_name << "Consumer_ptr c);" << be_uidt_nl;
 
   os_ << be_nl
-      << "// CIAO-specific." << be_nl
-      << "::Components::Cookie *" << be_nl
-      << "subscribe_" << port_name << "_generic (" << be_idt_nl
-      << "::Components::EventConsumerBase_ptr c);" << be_uidt_nl;
-
-  os_ << be_nl
       << "virtual ::" << obj_name << "Consumer_ptr" << be_nl
       << "unsubscribe_" << port_name << " (" << be_idt_nl
       << "::Components::Cookie * ck);" << be_uidt;
@@ -318,18 +312,6 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node)
       << "push_event ( ::Components::EventBase * ev);";
 
   os_ << be_nl << be_nl
-      << "// CIAO-specific in ::Components::EventConsumerBase." << be_nl
-      << "virtual void" << be_nl
-      << "ciao_push_event ( ::Components::EventBase * ev," << be_nl
-      << "                 const char * source_id," << be_nl
-      << "                 ::CORBA::TypeCode_ptr tc);";
-
-  os_ << be_nl << be_nl
-      << "// CIAO-specific in ::Components::EventConsumerBase." << be_nl
-      << "virtual ::CORBA::Boolean" << be_nl
-      << "ciao_is_substitutable (const char * event_repo_id);";
-
-  os_ << be_nl << be_nl
       << "// Get component implementation." << be_nl
       << "virtual ::CORBA::Object_ptr" << be_nl
       << "_get_component (void);";
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
index fb6f3d5bfc5..d6fa5cab86a 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
@@ -494,17 +494,6 @@ be_visitor_servant_svs::visit_publishes (be_publishes *node)
       << "}";
 
   os_ << be_nl << be_nl
-      << "::Components::Cookie *" << be_nl
-      << node_->local_name () << "_Servant::subscribe_"
-      << port_name << "_generic (" << be_idt_nl
-      << "::Components::EventConsumerBase_ptr c)" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  os_ << "return this->context_->subscribe_" << port_name
-      << "_generic (c);" << be_uidt_nl
-      << "}";
-
-  os_ << be_nl << be_nl
       << "::" << obj_name << "Consumer_ptr" << be_nl
       << node_->local_name () << "_Servant::unsubscribe_"
       << port_name << " (" << be_idt_nl
@@ -623,52 +612,6 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node)
       << "}";
 
   os_ << be_nl << be_nl
-      << "/// CIAO-specific."
-      << be_nl
-      << "void" << be_nl
-      << comp_lname << "_Servant::" << lname << "Consumer_"
-      << port_name << "_Servant::ciao_push_event (" << be_idt_nl
-      << "::Components::EventBase * ev," << be_nl
-      << "const char * /* source_id */," << be_nl
-      << "::CORBA::TypeCode_ptr /* tc */)" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "this->push_event (ev);" << be_uidt_nl
-      << "}";
-
-  os_ << be_nl << be_nl
-      << "/// CIAO-specific."
-      << be_nl
-      << "::CORBA::Boolean" << be_nl
-      << comp_lname << "_Servant::" << lname << "Consumer_"
-      << port_name << "_Servant::ciao_is_substitutable ("
-      << be_idt_nl
-      << "const char * event_repo_id)" << be_uidt_nl
-      << "{" << be_idt_nl
-      << "if (event_repo_id == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()->orb ();"
-      << be_nl << be_nl
-      << "CORBA::ValueFactory f =" << be_idt_nl
-      << "orb->lookup_value_factory (event_repo_id);"
-      << be_uidt_nl << be_nl
-      << "if (f == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return false;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "CORBA::ValueBase_var v = f->create_for_unmarshal ();"
-      << be_nl
-      << "f->_remove_ref ();" << be_nl << be_nl
-      << "if (v.in () == 0)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return false;" << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl
-      << "return dynamic_cast< ::" << fname
-      << " *> (v.in ()) != 0;" << be_uidt_nl
-      << "}";
-
-  os_ << be_nl << be_nl
       << "::" << fname << "Consumer_ptr" << be_nl
       << node_->local_name () << "_Servant::get_consumer_"
       << port_name << " (void)" << be_nl
@@ -1408,7 +1351,7 @@ be_visitor_receptacle_desc::visit_uses (be_uses *node)
 
   os_ << be_nl << be_nl;
 
-  bool gen_guard = is_multiple && ! static_config_;
+  bool gen_guard = is_multiple;
 
   if (gen_guard)
     {
@@ -1471,20 +1414,7 @@ be_visitor_subscribe_block::visit_publishes (
       << be_uidt_nl << be_nl
       << "if ( ::CORBA::is_nil (sub.in ()))" << be_idt_nl
       << "{" << be_idt_nl
-      << "::CORBA::Boolean const substitutable =" << be_idt_nl
-      << "subscribe->ciao_is_substitutable (" << be_idt_nl
-      << "::" << obj_name
-      << "::_tao_obv_static_repository_id ());"
-      << be_uidt << be_uidt_nl << be_nl
-      << "if (substitutable)" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return this->subscribe_" << port_name
-      << "_generic (subscribe);" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
       << "throw ::Components::InvalidConnection ();" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl
@@ -1551,15 +1481,12 @@ be_visitor_event_source_desc::visit_publishes (
 
   os_ << be_nl << be_nl;
 
-  if (! static_config_)
-    {
-      os_ << "{" << be_idt_nl
-          << "ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-          << "                       mon," << be_nl
-          << "                       this->context_->"
-          << port_name << "_lock_," << be_nl
-          << "                       0);" << be_nl << be_nl;
-    }
+  os_ << "{" << be_idt_nl
+      << "ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                       mon," << be_nl
+      << "                       this->context_->"
+      << port_name << "_lock_," << be_nl
+      << "                       0);" << be_nl << be_nl;
 
   os_ << "::CIAO::Servant::describe_pub_event_source<"
       << be_idt_nl
@@ -1572,11 +1499,8 @@ be_visitor_event_source_desc::visit_publishes (
       << "safe_retval," << be_nl
       << slot_++ << "UL);" << be_uidt << be_uidt;
 
-  if (! be_global->gen_ciao_static_config ())
-    {
-      os_ << be_uidt_nl
-          << "}";
-    }
+  os_ << be_uidt_nl
+      << "}";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
index cfd56096702..2b45e1c5add 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
@@ -32,8 +32,7 @@ be_visitor_component_scope::be_visitor_component_scope (
   : be_visitor_scope (ctx),
     node_ (0),
     os_ (*ctx->stream ()),
-    export_macro_ (be_global->svnt_export_macro ()),
-    static_config_ (be_global->gen_ciao_static_config ())
+    export_macro_ (be_global->svnt_export_macro ())
 {
   /// All existing CIAO examples set the servant export values in the CIDL
   /// compiler to equal the IDL compiler's skel export values. Below is a
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index d49a5fae013..340ff42c7b0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -149,15 +149,6 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << class_name.c_str () << "& rhs);" << be_nl
       << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_nl;
 
-  if (node->is_event_consumer ())
-    {
-      *os << "// Default implementation of CIAO-specific operation," << be_nl
-          << "// overridden in derived class generated by the CIDL compiler."
-          << be_nl
-          << "virtual ::CORBA::Boolean ciao_is_substitutable (const char *event_repo_id);" << be_nl
-          << be_nl << be_nl;
-    }
-
   // _is_a
   *os << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 9ae2fcaa120..c0eeffc8527 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -171,7 +171,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                        node->is_local (),
                        node->is_abstract ());
     is_a.set_defined_in (node);
-    
+
     ACE_CDR::ULong bound = 0UL;
 
     auto_ptr<AST_String> s (
@@ -387,7 +387,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   if (!be_global->gen_minimum_corba ())
   {
     ACE_CDR::ULong bound = 0UL;
-  
+
     // Generate code for the _repository_id skeleton.
     auto_ptr<AST_String> s (
       idl_global->gen ()->create_string (
@@ -692,16 +692,6 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   *os << "return \"" << node->repoID () << "\";" << be_uidt_nl;
   *os << "}";
 
-  if (node->is_event_consumer ())
-    {
-      *os << be_nl << be_nl
-          << "::CORBA::Boolean " << be_nl << full_skel_name
-          << "::ciao_is_substitutable (const char *)" << be_nl
-          << "{" << be_idt_nl
-          << "return true;" << be_uidt_nl
-          << "}";
-    }
-
   // Print out dispatch method.
   this->dispatch_method (node);
 
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 1813464e4e9..9e99633f774 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -775,9 +775,6 @@ public:
   bool gen_ciao_conn_impl (void) const;
   void gen_ciao_conn_impl (bool val);
 
-  bool gen_ciao_static_config (void) const;
-  void gen_ciao_static_config (bool val);
-
   bool gen_ciao_valuefactory_reg (void) const;
   void gen_ciao_valuefactory_reg (bool val);
 
@@ -1122,9 +1119,6 @@ private:
   /// for CCM connector implementations.
   bool gen_ciao_conn_impl_;
 
-  /// Suppresses generation of table guards in CIAO servants.
-  bool gen_ciao_static_config_;
-
   /// Generate automatic valuetype factory registration in
   /// CIAO servants.
   bool gen_ciao_valuefactory_reg_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_scope.h b/TAO/TAO_IDL/be_include/be_visitor_component_scope.h
index 1d7832fd9c3..a9b0a7761cb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component_scope.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component_scope.h
@@ -50,7 +50,7 @@ public:
 
   /// Swaps uses for provides members and vice versa.S
   int visit_porttype_scope_mirror (be_porttype *node);
-  
+
   /// Set the member.
   void node (be_component *c);
 
@@ -64,7 +64,6 @@ protected:
   be_component *node_;
   TAO_OutStream &os_;
   ACE_CString export_macro_;
-  bool static_config_;
   ACE_CString port_prefix_;
 };
 
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 7e5e07fbba9..989840a928f 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -995,13 +995,6 @@ also receives other options that are specific to it.<p>
     to support on-the-fly swapping of components.</td>
   </tr>
 
-  <tr><a name="Gsc">
-    <td><tt>-Gsc</tt></td>
-
-    <td>Generate CIAO servant code to support static configuration</td>
-    <td>Modify the generated servant code to optimize for static configuration.</td>
-  </tr>
-
   <tr><a name="Gxhst">
     <td><tt>-Gxhst</tt></td>