Fri Feb 15 19:41:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 117 insertions, 499 deletions

diff --git a/CIAO/CIDLC/AttributeHeaderEmitters.cpp b/CIAO/CIDLC/AttributeHeaderEmitters.cpp
index d5794a889f5..24a550e4ea1 100644
--- a/CIAO/CIDLC/AttributeHeaderEmitters.cpp
+++ b/CIAO/CIDLC/AttributeHeaderEmitters.cpp
@@ -42,20 +42,16 @@ WriteAttributeHeaderEmitter::get_raises (SemanticGraph::ReadWriteAttribute&)
 void
 WriteAttributeHeaderEmitter::set_raises_none (SemanticGraph::ReadWriteAttribute&)
 {
-  os << STRS[EXCP_SNGL];
 }
 
 void
 WriteAttributeHeaderEmitter::set_raises_pre (SemanticGraph::ReadWriteAttribute&)
 {
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
 }
 
 void
 WriteAttributeHeaderEmitter::set_raises_post (SemanticGraph::ReadWriteAttribute&)
 {
-  os << "))";
 }
 
 void
@@ -104,20 +100,16 @@ AttributeHeaderEmitter::name (SemanticGraph::ReadWriteAttribute& a)
 void
 AttributeHeaderEmitter::get_raises_none (SemanticGraph::ReadWriteAttribute&)
 {
-  os << STRS[EXCP_SNGL];
 }
 
 void
 AttributeHeaderEmitter::get_raises_pre (SemanticGraph::ReadWriteAttribute&)
 {
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
 }
 
 void
 AttributeHeaderEmitter::get_raises_post (SemanticGraph::ReadWriteAttribute&)
 {
-  os << "))";
 }
 
 void
@@ -161,20 +153,16 @@ AttributeHeaderEmitter::name (SemanticGraph::ReadAttribute& a)
 void
 AttributeHeaderEmitter::get_raises_none (SemanticGraph::ReadAttribute&)
 {
-  os << STRS[EXCP_SNGL];
 }
 
 void
 AttributeHeaderEmitter::get_raises_pre (SemanticGraph::ReadAttribute&)
 {
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
 }
 
 void
 AttributeHeaderEmitter::get_raises_post (SemanticGraph::ReadAttribute&)
 {
-  os << "))";
 }
 
 void
diff --git a/CIAO/CIDLC/AttributeSourceEmitters_T.hpp b/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
index 9f601d27de7..2e45e8957eb 100644
--- a/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
+++ b/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
@@ -72,20 +72,16 @@ struct WriteAttributeSourceEmitter : Traversal::ReadWriteAttribute,
   virtual void
   set_raises_none (SemanticGraph::ReadWriteAttribute&)
   {
-    os << STRS[EXCP_SNGL];
   }
 
   virtual void
   set_raises_pre (SemanticGraph::ReadWriteAttribute&)
   {
-    os << STRS[EXCP_START] << " "
-       << STRS[EXCP_SYS] << "," << endl;
   }
 
   virtual void
   set_raises_post (SemanticGraph::ReadWriteAttribute&)
   {
-    os << "))" << endl;
   }
 
   virtual void
@@ -195,20 +191,16 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
   virtual void
   get_raises_none (SemanticGraph::ReadWriteAttribute&)
   {
-    os << STRS[EXCP_SNGL] << endl;
   }
 
   virtual void
   get_raises_pre (SemanticGraph::ReadWriteAttribute&)
   {
-    os << STRS[EXCP_START] << " "
-       << STRS[EXCP_SYS] << "," << endl;
   }
 
   virtual void
   get_raises_post (SemanticGraph::ReadWriteAttribute&)
   {
-    os << "))" << endl;
   }
 
   virtual void
@@ -287,20 +279,16 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
   virtual void
   get_raises_none (SemanticGraph::ReadAttribute&)
   {
-    os << STRS[EXCP_SNGL] << endl;
   }
 
   virtual void
   get_raises_pre (SemanticGraph::ReadAttribute&)
   {
-    os << STRS[EXCP_START] << " "
-       << STRS[EXCP_SYS] << "," << endl;
   }
 
   virtual void
   get_raises_post (SemanticGraph::ReadAttribute&)
   {
-    os << "))" << endl;
   }
 
   virtual void
diff --git a/CIAO/CIDLC/ExecImplHeaderGenerator.cpp b/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
index 6ee4899a4df..1da86b6c8bd 100644
--- a/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
+++ b/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
@@ -135,8 +135,7 @@ namespace
 
       os << "_ptr" << endl
          << "get_" << p.name () << " (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << ");" << endl;
     }
 
     virtual void
@@ -148,8 +147,7 @@ namespace
       Traversal::ConsumerData::belongs (c, belongs_);
 
       os << " *ev" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << ");" << endl;
    }
 
   private:
@@ -306,46 +304,17 @@ namespace
 
       os << "virtual void" << endl
          << "set_session_context (" << endl
-         << STRS[COMP_SC] << "_ptr ctx" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+         << STRS[COMP_SC] << "_ptr ctx);" << endl;
 
-      os << "virtual void" << endl
-         << "ciao_preactivate (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+      os << "virtual void ciao_preactivate ();" << endl;
 
-      os << "virtual void" << endl
-         << "ciao_postactivate (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+      os << "virtual void ciao_postactivate ();" << endl;
 
-      os << "virtual void" << endl
-         << "ccm_activate (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+      os << "virtual void ccm_activate ();" << endl;
 
-      os << "virtual void" << endl
-         << "ccm_passivate (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+      os << "virtual void ccm_passivate ();" << endl;
 
-      os << "virtual void" << endl
-         << "ccm_remove (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+      os << "virtual void ccm_remove ();" << endl;
     }
 
     virtual void
@@ -590,11 +559,7 @@ namespace
 
       os << "// Implicit operations." << endl << endl
          << "virtual " << STRS[COMP_EC] << "_ptr" << endl
-         << "create (" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << endl
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "));" << endl;
+         << "create ();" << endl;
     }
 
     virtual void
diff --git a/CIAO/CIDLC/ExecImplSourceGenerator.cpp b/CIAO/CIDLC/ExecImplSourceGenerator.cpp
index 1f36dd99248..89d4831ef1a 100644
--- a/CIAO/CIDLC/ExecImplSourceGenerator.cpp
+++ b/CIAO/CIDLC/ExecImplSourceGenerator.cpp
@@ -59,20 +59,16 @@ namespace
     virtual void
     raises_pre (Type&)
     {
-      os << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl;
     }
 
     virtual void
     raises_none (Type&)
     {
-      os << STRS[EXCP_SNGL];
     }
 
     virtual void
     raises_post (Type&)
     {
-      os << "))";
     }
 
     virtual void
@@ -229,7 +225,6 @@ namespace
       os << "_ptr" << endl
          << scope_.name () << "_exec_i::get_"
          << p.name () << " ()" << endl
-         << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[YCH] << endl
          << "return ";
@@ -255,7 +250,6 @@ namespace
 
       os << " * /* ev */" << endl
          << ")" << endl
-         << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[YCH] << endl
          << "}";
@@ -440,11 +434,7 @@ namespace
 
       os << "void" << endl
          << t.name () << "_exec_i::set_session_context (" << endl
-         << STRS[COMP_SC] << "_ptr ctx" << endl
-         << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
+         << STRS[COMP_SC] << "_ptr ctx)" << endl
          << "{"
          << "this->context_ =" << endl
          << "  " << t.name () << "_Context::_narrow (" << endl
@@ -460,45 +450,30 @@ namespace
 
       os << "void" << endl
          << t.name () << "_exec_i::ciao_preactivate ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[YCH]
          << "}";
 
       os << "void" << endl
          << t.name () << "_exec_i::ciao_postactivate ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[YCH]
          << "}";
 
       os << "void" << endl
          << t.name () << "_exec_i::ccm_activate ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[YCH]
          << "}";
 
       os << "void" << endl
          << t.name () << "_exec_i::ccm_passivate ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[YCH]
          << "}";
 
       os << "void" << endl
          << t.name () << "_exec_i::ccm_remove ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[YCH]
          << "}";
@@ -582,20 +557,16 @@ namespace
     virtual void
     raises_none (SemanticGraph::HomeFactory&)
     {
-      os << STRS[EXCP_SNGL];
     }
 
     virtual void
     raises_pre (SemanticGraph::HomeFactory&)
     {
-      os << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl;
     }
 
     virtual void
     raises_post (SemanticGraph::HomeFactory&)
     {
-      os << "))";
     }
 
     virtual void
@@ -675,20 +646,16 @@ namespace
     virtual void
     raises_none (SemanticGraph::HomeFinder&)
     {
-      os << STRS[EXCP_SNGL];
     }
 
     virtual void
     raises_pre (SemanticGraph::HomeFinder&)
     {
-      os << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl;
     }
 
     virtual void
     raises_post (SemanticGraph::HomeFinder&)
     {
-      os << "))";
     }
 
     virtual void
@@ -974,9 +941,6 @@ namespace
       os << "// Implicit operations." << endl << endl
          << STRS[COMP_EC] << "_ptr" << endl
          << t.name () << "_exec_i::create ()" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_CE] << "))" << endl
          << "{"
          << STRS[COMP_EC] << "_ptr retval =" << endl
          << "  " << STRS[COMP_EC] << "::_nil ();" << endl
diff --git a/CIAO/CIDLC/Literals.cpp b/CIAO/CIDLC/Literals.cpp
index 12d025ca448..dec2bfcd286 100644
--- a/CIAO/CIDLC/Literals.cpp
+++ b/CIAO/CIDLC/Literals.cpp
@@ -31,8 +31,6 @@ namespace StringLiterals
   char const* const STRS[LIT_SIZE] =
   {
     // Common CORBA and all Components exceptions.
-    "ACE_THROW_SPEC (( ::CORBA::SystemException))",       // EXCP_SNGL
-    "ACE_THROW_SPEC ((",                                  // EXCP_START
     "::CORBA::SystemException",                           // EXCP_SYS
     "::CORBA::BAD_PARAM",                                 // EXCP_BP
     "::Components::IllegalState",                         // EXCP_IS
diff --git a/CIAO/CIDLC/Literals.hpp b/CIAO/CIDLC/Literals.hpp
index 710aeb4e306..2e0a650df30 100644
--- a/CIAO/CIDLC/Literals.hpp
+++ b/CIAO/CIDLC/Literals.hpp
@@ -12,8 +12,6 @@ namespace StringLiterals
   // Index into the string array in Literals.cpp.
   enum
   {
-    EXCP_SNGL,
-    EXCP_START,
     EXCP_SYS,
     EXCP_BP,
     EXCP_IS,
diff --git a/CIAO/CIDLC/OperationHeaderEmitters.cpp b/CIAO/CIDLC/OperationHeaderEmitters.cpp
index e41e3d6d023..88cd130eeaf 100644
--- a/CIAO/CIDLC/OperationHeaderEmitters.cpp
+++ b/CIAO/CIDLC/OperationHeaderEmitters.cpp
@@ -45,20 +45,16 @@ OperationEmitter::receives_post (Type&)
 void
 OperationEmitter::raises_pre (Type&)
 {
-  os << STRS[EXCP_START] << " "
-      << STRS[EXCP_SYS] << "," << endl;
 }
 
 void
 OperationEmitter::raises_none (Type&)
 {
-  os << STRS[EXCP_SNGL];
 }
 
 void
 OperationEmitter::raises_post (Type&)
 {
-  os << "))";
 }
 
 void
@@ -148,20 +144,16 @@ FactoryOperationEmitter::receives_post (SemanticGraph::HomeFactory&)
 void
 FactoryOperationEmitter::raises_none (SemanticGraph::HomeFactory&)
 {
-  os << STRS[EXCP_SNGL];
 }
 
 void
 FactoryOperationEmitter::raises_pre (SemanticGraph::HomeFactory&)
 {
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
 }
 
 void
 FactoryOperationEmitter::raises_post (SemanticGraph::HomeFactory&)
 {
-  os << "))";
 }
 
 void
@@ -234,20 +226,16 @@ FinderOperationEmitter::receives_post (SemanticGraph::HomeFinder&)
 void
 FinderOperationEmitter::raises_none (SemanticGraph::HomeFinder&)
 {
-  os << STRS[EXCP_SNGL];
 }
 
 void
 FinderOperationEmitter::raises_pre (SemanticGraph::HomeFinder&)
 {
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
 }
 
 void
 FinderOperationEmitter::raises_post (SemanticGraph::HomeFinder&)
 {
-  os << "))";
 }
 
 void
diff --git a/CIAO/CIDLC/ServantHeaderGenerator.cpp b/CIAO/CIDLC/ServantHeaderGenerator.cpp
index 2e3c584c73a..81584320124 100644
--- a/CIAO/CIDLC/ServantHeaderGenerator.cpp
+++ b/CIAO/CIDLC/ServantHeaderGenerator.cpp
@@ -87,10 +87,8 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         operation_emitter.edge_traverser (receives);
         operation_emitter.edge_traverser (returns);
-        operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -102,7 +100,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -122,8 +119,7 @@ namespace
 
       os << "// Get component implementation." << endl
          << "virtual CORBA::Object_ptr" << endl
-         << "_get_component ()" << endl
-         << STRS[EXCP_SNGL] << ";" << endl
+         << "_get_component ();" << endl
          << "protected:" << endl
          << "// Facet executor." << endl
          << i.scoped_name ().scope_name ()<< "::CCM_" << i.name ()
@@ -173,8 +169,7 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "ev)" << endl
-            << STRS[EXCP_SNGL] << ";" << endl;
+        os << "ev);" << endl;
       }
 
       virtual void
@@ -186,8 +181,7 @@ namespace
 
         os << endl
             << "get_connection_" << u.name ()
-            << " ()" << endl
-            << STRS[EXCP_SNGL] << ";" << endl;
+            << " ();" << endl;
       }
 
       virtual void
@@ -195,8 +189,7 @@ namespace
       {
         os << "virtual " << u.scoped_name () << "Connections *" << endl
            << "get_connections_" << u.name ()
-           << " ()" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << " ();" << endl;
       }
 
       virtual void
@@ -208,8 +201,7 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "ev)" << endl
-            << STRS[EXCP_SNGL] << ";" << endl;
+        os << "ev);" << endl;
       }
 
     private:
@@ -238,20 +230,14 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "));" << endl;
+        os << "Consumer_ptr c);" << endl;
 
         os << "virtual ";
 
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr" << endl
-           << "disconnect_" << e.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << "disconnect_" << e.name () << " ();" << endl;
       }
 
       virtual void
@@ -262,21 +248,14 @@ namespace
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
-        os << "_ptr)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+        os << "_ptr);" << endl;
 
         os << "virtual ";
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_ptr" << endl
-           << "disconnect_" << u.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << "disconnect_" << u.name () << " ();" << endl;
       }
 
       virtual void
@@ -287,11 +266,7 @@ namespace
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
-        os << "_ptr)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+        os << "_ptr);" << endl;
 
         os << "virtual ";
 
@@ -299,10 +274,7 @@ namespace
 
         os << "_ptr" << endl
            << "disconnect_" << u.name () << " (" << endl
-           << "::Components::Cookie * ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << "::Components::Cookie * ck);" << endl;
       }
 
       virtual void
@@ -313,18 +285,12 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+        os << "Consumer_ptr c);" << endl;
 
         os << "// CIAO-specific." << endl
            << STRS[COMP_CK] << " *" << endl
            << "subscribe_" << p.name () << "_generic (" << endl
-           << STRS[COMP_ECB] << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+           << STRS[COMP_ECB] << "_ptr c);" << endl;
 
         os << "virtual ";
 
@@ -332,10 +298,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << "unsubscribe_" << p.name () << " (" << endl
-           << STRS[COMP_CK] << " *ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[COMP_CK] << " *ck);" << endl;
       }
 
     private:
@@ -475,12 +438,8 @@ namespace
            << endl << endl;
 
         os << "virtual " << STRS[COMP_CD] << " *" << endl
-           << "get_registered_consumers (" << endl
-           << "const char *publisher_name)" << endl
-           << STRS[EXCP_START] << endl
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IN] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << "get_registered_consumers (const char *publisher_name);"
+           << endl;
       }
 
       os << "// CIAO-specific." << endl << endl;
@@ -575,8 +534,7 @@ namespace
 
         os << "_ptr" << endl
            << "provide_" << p.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -587,21 +545,14 @@ namespace
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
-        os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+        os << "_ptr c);" << endl;
 
         os << "virtual ";
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_ptr" << endl
-           << "disconnect_" << u.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << "disconnect_" << u.name () << " ();" << endl;
 
         os << "virtual ";
 
@@ -609,8 +560,7 @@ namespace
 
         os << "_ptr" << endl
            << "get_connection_" << u.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -621,11 +571,7 @@ namespace
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
-        os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+        os << "_ptr c);" << endl;
 
         os << "virtual ";
 
@@ -633,15 +579,11 @@ namespace
 
         os << "_ptr" << endl
            << "disconnect_" << u.name () << " (" << endl
-           << "::Components::Cookie * ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << "::Components::Cookie * ck);" << endl;
 
         os << "virtual " << u.scoped_name () << "Connections *" << endl
            << "get_connections_" << u.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -690,15 +632,11 @@ namespace
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << " *evt" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
 
         os << "// Inherited from " << STRS[COMP_ECB] << "." << endl
            << "virtual void" << endl
-           << "push_event ( ::Components::EventBase *ev)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_BET] << "));" << endl;
+           << "push_event ( ::Components::EventBase *ev);" << endl;
 
         // @@ GD added below code.
 
@@ -706,23 +644,18 @@ namespace
            << "virtual void" << endl
            << "ciao_push_event ( ::Components::EventBase *ev," << endl
            << "const char * source_id," << endl
-           << "::CORBA::TypeCode_ptr tc)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_BET] << "));" << endl;
+           << "::CORBA::TypeCode_ptr tc);" << endl;
 
         os << "// CIAO-specific in " << STRS[COMP_ECB] << "." << endl
            << "virtual CORBA::Boolean" << endl
            << "ciao_is_substitutable (" << endl
            << "const char *event_repo_id" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
 
         os << "// Get component implementation." << endl
            << "virtual CORBA::Object_ptr" << endl
            << "_get_component (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
 
         os << "protected:" << endl
            << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
@@ -743,8 +676,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << "get_consumer_" << c.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -755,20 +687,14 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "));" << endl;
+        os << "Consumer_ptr c);" << endl;
 
         os << "virtual ";
 
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr" << endl
-           << "disconnect_" << e.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << "disconnect_" << e.name () << " ();" << endl;
       }
 
       virtual void
@@ -779,18 +705,12 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+        os << "Consumer_ptr c);" << endl;
 
         os << "// CIAO-specific." << endl
            << STRS[COMP_CK] << " *" << endl
            << "subscribe_" << p.name () << "_generic (" << endl
-           << STRS[COMP_ECB] << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+           << STRS[COMP_ECB] << "_ptr c);" << endl;
 
         os << "virtual ";
 
@@ -798,10 +718,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << "unsubscribe_" << p.name () << " (" << endl
-           << STRS[COMP_CK] << " *ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[COMP_CK] << " *ck);" << endl;
       }
 
     private:
@@ -871,8 +788,7 @@ namespace
       {
         os << "::CORBA::Object_ptr" << endl
            << "provide_" << p.name () << "_i (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -890,8 +806,7 @@ namespace
       {
         os << "::Components::EventConsumerBase_ptr" << endl
            << "get_consumer_" << c.name () << "_i (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << ");" << endl;
       }
 
       virtual void
@@ -1056,85 +971,45 @@ namespace
       os << "virtual " << STRS[COMP_CK] << " *" << endl
          << "connect (" << endl
          << "const char *name," << endl
-         << "CORBA::Object_ptr connection)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_ECL] << "));" << endl;
+         << "CORBA::Object_ptr connection);" << endl;
 
       os << "virtual CORBA::Object_ptr" << endl
          << "disconnect (" << endl
          << "const char *name," << endl
-         << STRS[COMP_CK] << " *ck)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_CR] << "," << endl
-         << STRS[EXCP_NC] << "));" << endl;
+         << STRS[COMP_CK] << " *ck);" << endl;
 
       os << "virtual " << STRS[COMP_RD] << " *" << endl
-         << "get_all_receptacles (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << "get_all_receptacles ();" << endl;
 
       os << "// Operations for Events interface." << endl << endl;
 
       os << "virtual " << STRS[COMP_CK] << " *" << endl
          << "subscribe (" << endl
          << "const char *publisher_name," << endl
-         << STRS[COMP_ECB] << "_ptr subscriber)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_ECL] << "));" << endl;
+         << STRS[COMP_ECB] << "_ptr subscriber);" << endl;
 
       os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
          << "unsubscribe (" << endl
          << "const char *publisher_name," << endl
-         << STRS[COMP_CK] << " *ck)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "));" << endl;
+         << STRS[COMP_CK] << " *ck);" << endl;
 
       os << "virtual void" << endl
          << "connect_consumer (" << endl
          << "const char *emitter_name," << endl
-         << STRS[COMP_ECB] << "_ptr consumer)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_IC] << "));" << endl;
+         << STRS[COMP_ECB] << "_ptr consumer);" << endl;
 
       os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
-         << "disconnect_consumer (" << endl
-         << "const char *source_name)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_NC] << "));" << endl;
+         << "disconnect_consumer (const char *source_name);" << endl;
 
       os << "virtual " << STRS[COMP_PD] << " *" << endl
-         << "get_all_publishers (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << "get_all_publishers ();" << endl;
 
       os << "virtual " << STRS[COMP_ED] << " *" << endl
-         << "get_all_emitters (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << "get_all_emitters ();" << endl;
 
       os << "// CIAO specific operations on the servant. " << endl
          << "CORBA::Object_ptr" << endl
-         << "get_facet_executor (" << endl
-         << "const char *name)" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS]<< "));" << endl;
+         << "get_facet_executor (const char *name);" << endl;
 
       os << "private:" << endl << endl;
 
@@ -1159,9 +1034,7 @@ namespace
 
       os << "private:" << endl << endl
          << "void" << endl
-         << "populate_port_tables (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << "populate_port_tables ();" << endl;
 
       // Generate private operations for ports.
       {
diff --git a/CIAO/CIDLC/ServantSourceGenerator.cpp b/CIAO/CIDLC/ServantSourceGenerator.cpp
index a3ffb0b67f2..d15d0229227 100644
--- a/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -218,20 +218,16 @@ namespace
     virtual void
     raises_pre (Type&)
     {
-      os << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl;
     }
 
     virtual void
     raises_none (Type&)
     {
-      os << STRS[EXCP_SNGL];
     }
 
     virtual void
     raises_post (Type&)
     {
-      os << "))";
     }
 
     virtual void
@@ -461,10 +457,8 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         operation_emitter.edge_traverser (receives);
         operation_emitter.edge_traverser (returns);
-        operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -476,7 +470,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -496,9 +489,7 @@ namespace
 
       os << "template <typename T>" << endl
          << "::CORBA::Object_ptr" << endl
-         << i.name () << "_Servant_T<T>::_get_component (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << endl
+         << i.name () << "_Servant_T<T>::_get_component ()" << endl
          << "{"
          << STRS[COMP_SC] << "_var sc =" << endl
          << "  " << STRS[COMP_SC] << "::_narrow (" << endl
@@ -563,9 +554,7 @@ namespace
 
         os << "_ptr" << endl
            << scope_.name () << "_Context::get_connection_"
-           << u.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << u.name () << " ()" << endl
            << "{"
            << "return ";
 
@@ -583,10 +572,6 @@ namespace
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "if (! ::CORBA::is_nil (this->ciao_uses_"
            << u.name () << "_.in ()))" << endl
@@ -610,9 +595,6 @@ namespace
         os << "_ptr" << endl
            << scope_.name () << "_Context::disconnect_"
            << u.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (this->ciao_uses_"
            << u.name () << "_.in ()))" << endl
@@ -632,9 +614,7 @@ namespace
       {
         os << u.scoped_name () << "Connections *" << endl
            << scope_.name () << "_Context::get_connections_"
-           << u.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << u.name () << " ()" << endl
            << "{"
            << u.scoped_name () << "Connections *tmp_retv = 0;"
            << "ACE_NEW_THROW_EX ("
@@ -692,10 +672,6 @@ namespace
         Traversal::MultiUserData::belongs (u, belongs_);
 
         os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
@@ -737,9 +713,6 @@ namespace
            << scope_.name () << "_Context::disconnect_"
            << u.name () << " (" << endl
            << STRS[COMP_CK] << " * ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{";
 
         Traversal::MultiUserData::belongs (u, belongs_);
@@ -778,9 +751,7 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << " *ev" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+        os << " *ev)" << endl
            << "{"
            << "for (ACE_Active_Map_Manager< " << endl
            << "  ";
@@ -841,9 +812,6 @@ namespace
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
@@ -874,9 +842,6 @@ namespace
            << scope_.name () << "_Context::subscribe_"
            << p.name () << "_generic (" << endl
            << STRS[COMP_ECB] << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
@@ -903,9 +868,6 @@ namespace
            << scope_.name () << "_Context::unsubscribe_"
            << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "ACE_Active_Map_Manager_Key key;" << endl
            << "if (ck == 0 || ::CIAO::Map_Key_Cookie::"
@@ -953,9 +915,7 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << " *ev" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+        os << " *ev)" << endl
            << "{"
            << "if (! ::CORBA::is_nil (this->ciao_emits_"
            << e.name () << "_consumer_.in ()))" << endl
@@ -976,9 +936,6 @@ namespace
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
@@ -1002,9 +959,6 @@ namespace
         os << "Consumer_ptr" << endl
            << scope_.name () << "_Context::disconnect_"
            << e.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (this->ciao_emits_" << e.name ()
            << "_consumer_.in ()))" << endl
@@ -1161,9 +1115,9 @@ namespace
          << "{"
          << "}";
 
-      os << "// Operations for " << t.name () << " receptacles"
+      os << "/// Operations for " << t.name () << " receptacles"
          << " and event sources," << endl
-         << "// defined in " << t.scoped_name ().scope_name () << "::CCM_"
+         << "/// defined in " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_Context."
          << endl << endl;
 
@@ -1187,18 +1141,14 @@ namespace
       // Extra *_Context methods for swapping container.
       if (swapping)
       {
-        os << "// Operations defined in " << t.scoped_name ().scope_name ()
+        os << "/// Operations defined in " << t.scoped_name ().scope_name ()
            << "::CCM_" << t.name () << "_Context" << endl
-           << "// that enable component swapping in the container"
+           << "/// that enable component swapping in the container"
            << endl << endl;
 
         os << STRS[COMP_CD] << " *" << endl
            << t.name () << "_Context::get_registered_consumers (" << endl
            << "const char *publisher_name)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IN] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "if (publisher_name == 0)" << endl
            << "{"
@@ -1234,7 +1184,7 @@ namespace
            << "}";
       }
 
-      os << "// CIAO-specific." << endl << endl;
+      os << "/// CIAO-specific." << endl << endl;
 
       os << t.name () << "_Context *" << endl
          << t.name () << "_Context::_narrow (" << endl
@@ -1362,9 +1312,6 @@ namespace
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "))" << endl
            << "{";
 
         string swap_option = ctx.cl ().get_value ("custom-container", "");
@@ -1386,9 +1333,6 @@ namespace
            << scope_.name ()
            << "_Servant::subscribe_" << p.name () << "_generic (" << endl
            << STRS[COMP_ECB] << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "))" << endl
            << "{";
 
         if (swapping)
@@ -1409,9 +1353,6 @@ namespace
            << scope_.name ()
            << "_Servant::unsubscribe_" << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{";
 
         if (swapping)
@@ -1466,7 +1407,7 @@ namespace
            << "throw " << STRS[EXCP_IC] << " ();"
            << endl
            << "}"
-           << "// Simplex connect." << endl
+           << "/// Simplex connect." << endl
            << "this->connect_" << u.name () << " (" << endl
            << "_ciao_conn.in ()" << endl
            << ");"
@@ -1497,7 +1438,7 @@ namespace
            << "throw " << STRS[EXCP_IC] << " ();"
            << endl
            << "}"
-           << "// Multiplex connect." << endl
+           << "/// Multiplex connect." << endl
            << "return this->connect_" << u.name () << " (" << endl
            << "_ciao_conn.in ()" << endl
            << ");"
@@ -1524,7 +1465,7 @@ namespace
         os << "if (ACE_OS::strcmp (name, \""
            << u.name ().unescaped_str () << "\") == 0)" << endl
            << "{"
-           << "// Simplex disconnect." << endl
+           << "/// Simplex disconnect." << endl
            << "return this->disconnect_" << u.name ()
            << " ();" << endl
            << "}";
@@ -1571,10 +1512,6 @@ namespace
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "this->context_->connect_" << u.name () << " ("
            << endl
@@ -1589,9 +1526,6 @@ namespace
         os << "_ptr" << endl
            << scope_.name () << "_Servant::disconnect_"
            << u.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "))" << endl
            << "{"
            << "return this->context_->disconnect_" << u.name ()
            << " (" << endl
@@ -1603,9 +1537,7 @@ namespace
         os << "_ptr" << endl
            << scope_.name ()
            << "_Servant::get_connection_" << u.name ()
-           << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << " ()" << endl
            << "{"
            << "return this->context_->get_connection_"
            << u.name () << " (" << endl
@@ -1623,10 +1555,6 @@ namespace
         Traversal::MultiUserData::belongs (u, belongs_);
 
         os << "_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "::Components::Cookie * cookie = "
           "this->context_->connect_" << u.name () << " ("
@@ -1644,9 +1572,6 @@ namespace
            << scope_.name () << "_Servant::disconnect_"
            << u.name () << " (" << endl
            << STRS[COMP_CK] << " * ck)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "))" << endl
            << "{"
            << "return this->context_->disconnect_" << u.name ()
            << " (" << endl
@@ -1657,9 +1582,7 @@ namespace
         os << u.scoped_name () << "Connections *" << endl
            << scope_.name ()
            << "_Servant::get_connections_" << u.name ()
-           << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << " ()" << endl
            << "{"
            << "return this->context_->get_connections_"
            << u.name () << " (" << endl
@@ -1781,9 +1704,6 @@ namespace
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr c)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "))" << endl
            << "{"
            << "this->context_->connect_" << e.name ()
            << " (" << endl
@@ -1796,9 +1716,6 @@ namespace
         os << "Consumer_ptr" << endl
            << scope_.name () << "_Servant::disconnect_"
            << e.name () << " ()" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "))" << endl
            << "{"
            << "return this->context_->disconnect_"
            << e.name () << " (" << endl
@@ -1858,9 +1775,7 @@ namespace
 
         os << "_ptr" << endl
            << scope_.name ()
-           << "_Servant::provide_" << p.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "_Servant::provide_" << p.name () << " ()" << endl
            << "{";
 
         string swap_option = ctx.cl ().get_value ("custom-container", "");
@@ -1915,9 +1830,7 @@ namespace
 
         os << "::CORBA::Object_ptr" << endl
            << scope_.name ()
-           << "_Servant::provide_" << p.name () << "_i (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "_Servant::provide_" << p.name () << "_i ()" << endl
            << "{"
            << "::CORBA::Object_ptr ret =" << endl
            << "  this->lookup_facet (\""
@@ -2101,9 +2014,7 @@ namespace
         Traversal::ConsumerData::belongs (c, simple_belongs_);
 
         os << "Consumer_" << c.name ()
-           << "_Servant::_get_component (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "_Servant::_get_component ()" << endl
            << "{"
            << "return this->ctx_->get_CCM_object "
            << "();" << endl
@@ -2123,9 +2034,7 @@ namespace
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
-        os << " *evt" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+        os << " *evt)" << endl
            << "{"
            << "this->executor_->push_" << c.name ()
            << " (" << endl
@@ -2133,7 +2042,7 @@ namespace
            << ");" << endl
            << "}";
 
-        os << "// Inherited from " << STRS[COMP_ECB] << "." << endl
+        os << "/// Inherited from " << STRS[COMP_ECB] << "." << endl
            << "void" << endl
            << scope_.name  () << "_Servant::";
 
@@ -2142,9 +2051,6 @@ namespace
         os << "Consumer_" << c.name ()
            << "_Servant::push_event (" << endl
            << "::Components::EventBase *ev)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_BET] << "))" << endl
            << "{";
 
         Traversal::ConsumerData::belongs (c, belongs_);
@@ -2172,7 +2078,7 @@ namespace
         // GD Added below code
         // Begin
 
-        os << "// Inherited from " << STRS[COMP_ECB] << "." << endl
+        os << "/// Inherited from " << STRS[COMP_ECB] << "." << endl
            << "void" << endl
            << scope_.name  () << "_Servant::";
 
@@ -2183,9 +2089,6 @@ namespace
            << "::Components::EventBase *ev," << endl
            << "const char * /* source_id */," << endl
            << "::CORBA::TypeCode_ptr /* tc */)" << endl
-           << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_BET] << "))" << endl
            << "{"
            << "this->push_event (ev);" << endl
            << "}";
@@ -2199,9 +2102,7 @@ namespace
 
         os << "Consumer_" << c.name ()
            << "_Servant::ciao_is_substitutable (" << endl
-           << "const char * event_repo_id" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "const char * event_repo_id)" << endl
            << "{"
            << "if (event_repo_id == 0)" << endl
            << "{"
@@ -2248,9 +2149,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << scope_.name  () << "_Servant::"
-           << "get_consumer_" << c.name () << " (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "get_consumer_" << c.name () << " ()" << endl
            << "{"
            << "if (! ::CORBA::is_nil (this->consumes_" << c.name ()
            << "_.in ()))" << endl
@@ -2292,9 +2191,7 @@ namespace
 
         os << "::Components::EventConsumerBase_ptr" << endl
            << scope_.name  () << "_Servant::"
-           << "get_consumer_" << c.name () << "_i (" << endl
-           << ")" << endl
-           << STRS[EXCP_SNGL] << endl
+           << "get_consumer_" << c.name () << "_i ()" << endl
            << "{"
            << "::Components::EventConsumerBase_ptr ret =" << endl
            << "  this->lookup_consumer (\""
@@ -2899,7 +2796,7 @@ namespace
          << "this->context_," << endl
          << t.name () << "_Context (h, c, this));" << endl;
 
-      os << "// Set the instance id of the component on the context" << endl
+      os << "/// Set the instance id of the component on the context" << endl
          << endl
          << "this->context_->_ciao_instance_id (this->ins_name_);" << endl;
 
@@ -3051,12 +2948,6 @@ namespace
          << "const char *name," << endl
          << "::CORBA::Object_ptr connection" << endl
          << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_ECL] << "))" << endl
          << "{";
 
       if (swapping)
@@ -3065,7 +2956,7 @@ namespace
              << endl;
         }
 
-      os << "// If the component has no receptacles, this will be unused."
+      os << "/// If the component has no receptacles, this will be unused."
          << endl
          << STRS[ACE_UA] << " (connection);" << endl
          << "if (name == 0)" << endl
@@ -3098,12 +2989,6 @@ namespace
          << "const char *name," << endl
          << STRS[COMP_CK] << " * ck" << endl
          << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_CR] << "," << endl
-         << STRS[EXCP_NC] << "))" << endl
          << "{"
          << STRS[ACE_UA] << " (ck);" << endl;
 
@@ -3141,9 +3026,7 @@ namespace
          << "}";
 
       os << STRS[COMP_RD] << " *" << endl
-         << t.name () << "_Servant::get_all_receptacles (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << endl
+         << t.name () << "_Servant::get_all_receptacles ()" << endl
          << "{"
          << STRS[COMP_RD] << " *retval = 0;"
          << "ACE_NEW_RETURN (retval," << endl
@@ -3215,11 +3098,6 @@ namespace
          << "const char * emitter_name," << endl
          << STRS[COMP_ECB] << "_ptr consumer" << endl
          << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_IC] << "))" << endl
          << "{";
 
       if (swapping)
@@ -3259,10 +3137,6 @@ namespace
          << t.name () << "_Servant::disconnect_consumer (" << endl
          << "const char *source_name" << endl
          << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_NC] << "))" << endl
          << "{";
 
       if (swapping)
@@ -3298,9 +3172,7 @@ namespace
          << "}";
 
       os << STRS[COMP_PD] << " *" << endl
-         << t.name () << "_Servant::get_all_publishers (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << endl
+         << t.name () << "_Servant::get_all_publishers ()" << endl
          << "{"
          << STRS[COMP_PD] << " *retval = 0;"
          << "ACE_NEW_RETURN (retval," << endl
@@ -3348,9 +3220,7 @@ namespace
          << "}";
 
       os << STRS[COMP_ED] << " *" << endl
-         << t.name () << "_Servant::get_all_emitters (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << endl
+         << t.name () << "_Servant::get_all_emitters ()" << endl
          << "{"
          << STRS[COMP_ED] << " *retval = 0;"
          << "ACE_NEW_RETURN (retval," << endl
@@ -3402,11 +3272,6 @@ namespace
          << "const char *publisher_name," << endl
          << STRS[COMP_ECB] << "_ptr subscribe" << endl
          << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_ECL] << "))" << endl
          << "{";
 
       if (swapping)
@@ -3415,7 +3280,7 @@ namespace
              << endl;
         }
 
-      os << "// Just in case there are no if blocks" << endl
+      os << "/// Just in case there are no if blocks" << endl
          << STRS[ACE_UA] << " (subscribe);" << endl
          << "if (publisher_name == 0)" << endl
          << "{"
@@ -3449,10 +3314,6 @@ namespace
          << "const char *publisher_name," << endl
          << STRS[COMP_CK] << " *ck" << endl
          << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "," << endl
-         << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "))" << endl
          << "{";
 
       if (swapping)
@@ -3461,7 +3322,7 @@ namespace
            << endl;
       }
 
-      os << "// Just in case there are no if blocks" << endl
+      os << "/// Just in case there are no if blocks" << endl
          << STRS[ACE_UA] << " (ck);" << endl
          << "if (publisher_name == 0)" << endl
          << "{"
@@ -3512,8 +3373,6 @@ namespace
          << "_Servant::get_facet_executor (" << endl
          << "const char *name" << endl
          << ")" << endl
-         << STRS[EXCP_START] << " "
-         << STRS[EXCP_SYS] << "))" << endl
          << "{";
 
       if (swapping)
@@ -3548,7 +3407,7 @@ namespace
       os << "return ::CORBA::Object::_nil ();"
          << "}";
 
-      os << "// Supported operations." << endl << endl;
+      os << "/// Supported operations." << endl << endl;
 
       // Generate operations for all supported interfaces.
       {
@@ -3578,10 +3437,8 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         operation_emitter.edge_traverser (receives);
         operation_emitter.edge_traverser (returns);
-        operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -3593,7 +3450,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -3611,7 +3467,7 @@ namespace
       }
 
       // Generate operations for component attributes.
-      os << "// Component attribute operations." << endl << endl;
+      os << "/// Component attribute operations." << endl << endl;
 
       {
         Traversal::Component component_emitter;
@@ -3629,13 +3485,11 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "// Private method to populate the port tables."
+      os << "/// Private method to populate the port tables."
          << endl;
 
       os << "void" << endl
-         << t.name () << "_Servant::populate_port_tables (" << endl
-         << ")" << endl
-         << STRS[EXCP_SNGL] << endl
+         << t.name () << "_Servant::populate_port_tables ()" << endl
          << "{"
          << ";"
          << "::CORBA::Object_var obj_var;"
@@ -3781,20 +3635,16 @@ namespace
       virtual void
       raises_none (SemanticGraph::HomeFactory&)
       {
-        os << STRS[EXCP_SNGL];
       }
 
       virtual void
       raises_pre (SemanticGraph::HomeFactory&)
       {
-        os << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl;
       }
 
       virtual void
       raises_post (SemanticGraph::HomeFactory&)
       {
-        os << "))";
       }
 
       virtual void
@@ -3920,20 +3770,16 @@ namespace
       virtual void
       raises_none (SemanticGraph::HomeFinder&)
       {
-        os << STRS[EXCP_SNGL];
       }
 
       virtual void
       raises_pre (SemanticGraph::HomeFinder&)
       {
-        os << STRS[EXCP_START] << " "
-           << STRS[EXCP_SYS] << "," << endl;
       }
 
       virtual void
       raises_post (SemanticGraph::HomeFinder&)
       {
-        os << "))";
       }
 
       virtual void
@@ -4012,7 +3858,7 @@ namespace
          << "{"
          << "}";
 
-      os << "// Home operations." << endl << endl;
+      os << "/// Home operations." << endl << endl;
 
       {
         Traversal::Home home_emitter;
@@ -4029,10 +3875,8 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         home_operation_emitter.edge_traverser (receives);
         home_operation_emitter.edge_traverser (returns);
-        home_operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -4044,7 +3888,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -4061,7 +3904,7 @@ namespace
         home_emitter.traverse (t);
       }
 
-      os << "// Home supported interface operations." << endl << endl;
+      os << "/// Home supported interface operations." << endl << endl;
 
       {
         Traversal::Home home_emitter;
@@ -4090,10 +3933,8 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         operation_emitter.edge_traverser (receives);
         operation_emitter.edge_traverser (returns);
-        operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -4105,7 +3946,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -4122,7 +3962,7 @@ namespace
         home_emitter.traverse (t);
       }
 
-      os << "// Home factory and finder operations." << endl << endl;
+      os << "/// Home factory and finder operations." << endl << endl;
 
       {
         Traversal::Home home_emitter;
@@ -4141,13 +3981,10 @@ namespace
 
         Traversal::Receives receives;
         Traversal::Belongs returns;
-        Traversal::Raises raises;
         factory_operation_emitter.edge_traverser (receives);
         factory_operation_emitter.edge_traverser (returns);
-        factory_operation_emitter.edge_traverser (raises);
         finder_operation_emitter.edge_traverser (receives);
         finder_operation_emitter.edge_traverser (returns);
-        finder_operation_emitter.edge_traverser (raises);
 
         ParameterEmitter<Traversal::InParameter> in_param (ctx);
         ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
@@ -4159,7 +3996,6 @@ namespace
         ReturnTypeNameEmitter return_type_emitter (ctx);
         FullTypeNameEmitter type_name_emitter (ctx);
         returns.node_traverser (return_type_emitter);
-        raises.node_traverser (type_name_emitter);
 
         Traversal::Belongs in_belongs, inout_belongs, out_belongs;
         in_param.edge_traverser (in_belongs);
@@ -4177,7 +4013,7 @@ namespace
       }
 
       // Generate operations for component attributes.
-      os << "// Home attribute operations." << endl << endl;
+      os << "/// Home attribute operations." << endl << endl;
 
       {
         Traversal::Home home_emitter;
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 01c6e102569..c77fc70fe5e 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,23 @@
+Fri Feb 15 19:41:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIDLC/AttributeHeaderEmitters.cpp:
+        * CIDLC/AttributeSourceEmitters_T.hpp:
+        * CIDLC/ExecImplHeaderGenerator.cpp:
+        * CIDLC/ExecImplSourceGenerator.cpp:
+        * CIDLC/Literals.cpp:
+        * CIDLC/Literals.hpp:
+        * CIDLC/OperationHeaderEmitters.cpp:
+        * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+          Removed generation of ACE_THROW_SPEC, maybe some raise methods can be
+          removed internally but that is for the next cleanup round
+
+        * examples/Null_Component/Null_Component_exec.h:
+          Layout change
+
+        * examples/Null_Component/StaticDAnCEApp.cpp:
+          Updated include
+
 Fri Feb 15 09:34:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/CCM_Core.mpc:
diff --git a/CIAO/examples/Null_Component/StaticDAnCEApp.cpp b/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
index 4f50720ec1e..9f6e4572475 100644
--- a/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
+++ b/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Container_Base.h"
+#include "Session_Container.h"
 #include "NodeManager/NodeManager_Impl.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/streams.h"