Wed Aug 4 18:05:42 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * DAnCE/Config_Handlers/ADD_Handler.cpp:
        * DAnCE/Config_Handlers/DP_Handler.cpp:
        * DAnCE/Config_Handlers/DnC_Dump_T.cpp:
        * DAnCE/Config_Handlers/Dump_Obj.cpp:
        * DAnCE/Config_Handlers/IDREF_Base.cpp:
        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp:
        * DAnCE/NodeManager/Node_Manager_Module.cpp:
        * DAnCE/RepositoryManager/Repository_Manager_Module.cpp:
        * DAnCE/TargetManager/Target_Manager_Module.cpp:
        * DAnCE/tools/Completion/Completion_Counter_Base.cpp:
        * ciao/Servants/Port_Activator.cpp:
        * ciao/Valuetype_Factories/ConfigValue.cpp:
        * ciao/Valuetype_Factories/Cookies.cpp:
        * performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp:
        * tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp:
        * tools/IDL3_to_IDL2/be_helper.cpp:
        * tools/IDL3_to_XMI/be_helper.cpp:
        * tools/IDL3_to_XMI/be_sunsoft.cpp:
          Removed ACE_RCSID

19 files changed, 402 insertions, 448 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 6f9edfaa971..077079b3b4d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,25 @@
+Wed Aug  4 18:05:42 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/Config_Handlers/ADD_Handler.cpp:
+        * DAnCE/Config_Handlers/DP_Handler.cpp:
+        * DAnCE/Config_Handlers/DnC_Dump_T.cpp:
+        * DAnCE/Config_Handlers/Dump_Obj.cpp:
+        * DAnCE/Config_Handlers/IDREF_Base.cpp:
+        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp:
+        * DAnCE/NodeManager/Node_Manager_Module.cpp:
+        * DAnCE/RepositoryManager/Repository_Manager_Module.cpp:
+        * DAnCE/TargetManager/Target_Manager_Module.cpp:
+        * DAnCE/tools/Completion/Completion_Counter_Base.cpp:
+        * ciao/Servants/Port_Activator.cpp:
+        * ciao/Valuetype_Factories/ConfigValue.cpp:
+        * ciao/Valuetype_Factories/Cookies.cpp:
+        * performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp:
+        * tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp:
+        * tools/IDL3_to_IDL2/be_helper.cpp:
+        * tools/IDL3_to_XMI/be_helper.cpp:
+        * tools/IDL3_to_XMI/be_sunsoft.cpp:
+          Removed ACE_RCSID
+
 Wed Aug  4 18:01:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/DataReaderListener_T.cpp:
diff --git a/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp b/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
index 6b7989f9d09..19131ba707b 100644
--- a/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
+++ b/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
@@ -5,10 +5,6 @@
 #include "Property_Handler.h"
 #include "ace/UUID.h"
 
-ACE_RCSID (DAnCE,
-           ADD_Handler,
-           "$Id$")
-
 namespace CIAO
 {
   namespace Config_Handlers
diff --git a/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp b/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp
index 6ccda30d409..a57702e0db6 100644
--- a/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp
+++ b/CIAO/DAnCE/Config_Handlers/DP_Handler.cpp
@@ -15,262 +15,258 @@
 
 #include "PCD_Handler.h"
 
-ACE_RCSID (Config_Handlers,
-           DP_Handler,
-           "$Id$")
-
-  namespace CIAO
+namespace ciao
+{
+  namespace config_handlers
   {
-    namespace Config_Handlers
+    dp_handler::dp_handler (deploymentplan &dp)
+      :   xsc_dp_ (0)
+      , idl_dp_ (0)
+      , retval_ (true)
+    {
+      if (!this->resolve_plan (dp))
+        throw;
+    }
+
+    dp_handler::dp_handler (const ::deployment::deploymentplan &plan)
+      : xsc_dp_ (new deploymentplan),
+        idl_dp_ (0),
+        retval_ (0)
+    {
+      if (!this->build_xsc (plan))
+        throw;
+    }
+
+    dp_handler::~dp_handler (void)
+      throw ()
+    {
+    }
+
+    deploymentplan const *
+    dp_handler::xsc (void) const
+    {
+      if (this->retval_ && this->xsc_dp_.get () != 0)
+        return this->xsc_dp_.get ();
+
+      throw noplan ();
+    }
+
+    deploymentplan *
+    dp_handler::xsc (void)
+    {
+      if (this->retval_ && this->xsc_dp_.get () != 0)
+        return this->xsc_dp_.release ();
+
+      throw noplan ();
+    }
+
+    ::deployment::deploymentplan const *
+    dp_handler::plan (void) const
+    {
+      if (this->retval_ && this->idl_dp_.get () != 0)
+        return this->idl_dp_.get ();
+
+      throw noplan ();
+    }
+
+    ::deployment::deploymentplan *
+    dp_handler::plan (void)
+    {
+      if (this->retval_ && this->idl_dp_.get () != 0)
+        return this->idl_dp_.release ();
+
+      throw noplan ();
+    }
+
+    bool
+    dp_handler::resolve_plan (deploymentplan &xsc_dp)
+    {
+      dance_trace ("dp_handler::resolve_plan");
+
+      ::deployment::deploymentplan *tmp =
+          new deployment::deploymentplan;
+
+      this->idl_dp_.reset (tmp);
+
+      // read in the label, if present, since minoccurs = 0
+      if (xsc_dp.label_p ())
+        {
+          this->idl_dp_->label =
+            corba::string_dup (ace_text_always_char (xsc_dp.label ().c_str ()));
+        }
+
+      // read in the uuid, if present
+      if (xsc_dp.uuid_p ())
+        {
+          this->idl_dp_->uuid =
+            corba::string_dup (ace_text_always_char  (xsc_dp.uuid ().c_str ()));
+        }
+
+      // similar thing for dependson
+      for (deploymentplan::dependson_const_iterator dstart = xsc_dp.begin_dependson ();
+            dstart != xsc_dp.end_dependson ();
+            ++dstart)
+        {
+          corba::ulong len = this->idl_dp_->dependson.length ();
+          this->idl_dp_->dependson.length (len + 1);
+          id_handler::get_implementationdependency (*(*dstart),
+                                                    this->idl_dp_->dependson [len]);
+
+        }
+
+      // ... an the property stuff
+      for (deploymentplan::infoproperty_const_iterator pstart = xsc_dp.begin_infoproperty ();
+            pstart != xsc_dp.end_infoproperty ();
+            ++pstart)
+        {
+          corba::ulong len =
+            this->idl_dp_->infoproperty.length ();
+
+          this->idl_dp_->infoproperty.length (len + 1);
+
+          property_handler::handle_property (*(*pstart),
+                                              this->idl_dp_->infoproperty [len]);
+        }
+
+      // read in the realizes, if present
+      if (xsc_dp.realizes_p ())
+        {
+          ccd_handler::component_interface_descr (
+                                                  xsc_dp.realizes (),
+                                                  this->idl_dp_->realizes);
+        }
+
+      add_handler::artifact_deployment_descrs (xsc_dp,
+                                                this->idl_dp_->artifact);
+
+      mdd_handler::mono_deployment_descriptions (xsc_dp,
+                                                  this->idl_dp_->implementation);
+
+      idd_handler::instance_deployment_descrs (xsc_dp,
+                                                this->idl_dp_->instance);
+
+      this->idl_dp_->connection.length (xsc_dp.count_connection ());
+      std::for_each (xsc_dp.begin_connection (),
+                      xsc_dp.end_connection (),
+                      pcd_functor (this->idl_dp_->connection));
+
+      this->idl_dp_->localityconstraint.length (xsc_dp.count_localityconstraint ());
+
+      std::for_each (xsc_dp.begin_localityconstraint (),
+                      xsc_dp.end_localityconstraint (),
+                      pl_functor (this->idl_dp_->localityconstraint));
+
+      //pcd_handler::get_planconnectiondescription (xsc_dp, this->idl_dp_->connection);
+
+      return true;
+    }
+
+    bool
+    dp_handler::build_xsc (const ::deployment::deploymentplan &plan)
     {
-      DP_Handler::DP_Handler (deploymentPlan &dp)
-        :   xsc_dp_ (0)
-        , idl_dp_ (0)
-        , retval_ (true)
-      {
-        if (!this->resolve_plan (dp))
-          throw;
-      }
-
-      DP_Handler::DP_Handler (const ::Deployment::DeploymentPlan &plan)
-        : xsc_dp_ (new deploymentPlan),
-          idl_dp_ (0),
-          retval_ (0)
-      {
-        if (!this->build_xsc (plan))
-          throw;
-      }
-
-      DP_Handler::~DP_Handler (void)
-        throw ()
-      {
-      }
-
-      deploymentPlan const *
-      DP_Handler::xsc (void) const
-      {
-        if (this->retval_ && this->xsc_dp_.get () != 0)
-          return this->xsc_dp_.get ();
-
-        throw NoPlan ();
-      }
-
-      deploymentPlan *
-      DP_Handler::xsc (void)
-      {
-        if (this->retval_ && this->xsc_dp_.get () != 0)
-          return this->xsc_dp_.release ();
-
-        throw NoPlan ();
-      }
-
-      ::Deployment::DeploymentPlan const *
-      DP_Handler::plan (void) const
-      {
-        if (this->retval_ && this->idl_dp_.get () != 0)
-          return this->idl_dp_.get ();
-
-        throw NoPlan ();
-      }
-
-      ::Deployment::DeploymentPlan *
-      DP_Handler::plan (void)
-      {
-        if (this->retval_ && this->idl_dp_.get () != 0)
-          return this->idl_dp_.release ();
-
-        throw NoPlan ();
-      }
-
-      bool
-      DP_Handler::resolve_plan (deploymentPlan &xsc_dp)
-      {
-        DANCE_TRACE ("DP_Handler::resolve_plan");
-
-        ::Deployment::DeploymentPlan *tmp =
-            new Deployment::DeploymentPlan;
-
-        this->idl_dp_.reset (tmp);
-
-        // Read in the label, if present, since minoccurs = 0
-        if (xsc_dp.label_p ())
-          {
-            this->idl_dp_->label =
-              CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (xsc_dp.label ().c_str ()));
-          }
-
-        // Read in the UUID, if present
-        if (xsc_dp.UUID_p ())
-          {
-            this->idl_dp_->UUID =
-              CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR  (xsc_dp.UUID ().c_str ()));
-          }
-
-        // Similar thing for dependsOn
-        for (deploymentPlan::dependsOn_const_iterator dstart = xsc_dp.begin_dependsOn ();
-             dstart != xsc_dp.end_dependsOn ();
-             ++dstart)
-          {
-            CORBA::ULong len = this->idl_dp_->dependsOn.length ();
-            this->idl_dp_->dependsOn.length (len + 1);
-            ID_Handler::get_ImplementationDependency (*(*dstart),
-                                                      this->idl_dp_->dependsOn [len]);
-
-          }
-
-        // ... An the property stuff
-        for (deploymentPlan::infoProperty_const_iterator pstart = xsc_dp.begin_infoProperty ();
-             pstart != xsc_dp.end_infoProperty ();
-             ++pstart)
-          {
-            CORBA::ULong len =
-              this->idl_dp_->infoProperty.length ();
-
-            this->idl_dp_->infoProperty.length (len + 1);
-
-            Property_Handler::handle_property (*(*pstart),
-                                               this->idl_dp_->infoProperty [len]);
-          }
-
-        // Read in the realizes, if present
-        if (xsc_dp.realizes_p ())
-          {
-            CCD_Handler::component_interface_descr (
-                                                    xsc_dp.realizes (),
-                                                    this->idl_dp_->realizes);
-          }
-
-        ADD_Handler::artifact_deployment_descrs (xsc_dp,
-                                                 this->idl_dp_->artifact);
-
-        MDD_Handler::mono_deployment_descriptions (xsc_dp,
-                                                   this->idl_dp_->implementation);
-
-        IDD_Handler::instance_deployment_descrs (xsc_dp,
-                                                 this->idl_dp_->instance);
-
-        this->idl_dp_->connection.length (xsc_dp.count_connection ());
-        std::for_each (xsc_dp.begin_connection (),
-                       xsc_dp.end_connection (),
-                       PCD_Functor (this->idl_dp_->connection));
-
-        this->idl_dp_->localityConstraint.length (xsc_dp.count_localityConstraint ());
-
-        std::for_each (xsc_dp.begin_localityConstraint (),
-                       xsc_dp.end_localityConstraint (),
-                       PL_Functor (this->idl_dp_->localityConstraint));
-
-        //PCD_Handler::get_PlanConnectionDescription (xsc_dp, this->idl_dp_->connection);
-
-        return true;
-      }
-
-      bool
-      DP_Handler::build_xsc (const ::Deployment::DeploymentPlan &plan)
-      {
-        DANCE_TRACE ("DP_Handler::build_xsc");
-
-        // Initialize the UUID generator.
-        ACE_Utils::UUID_GENERATOR::instance ()->init ();
-
-        // Clear IDREF tables
-        IDD_Handler::IDREF.unbind_refs ();
-        MDD_Handler::IDREF.unbind_refs ();
-        ADD_Handler::IDREF.unbind_refs ();
-
-
-        size_t len; //Used for checking the length of struct data members
-
-        // Read in the label, if present, since minoccurs = 0
-        if (plan.label != 0)
-          {
-            XMLSchema::string< ACE_TCHAR > i(ACE_TEXT_CHAR_TO_TCHAR (plan.label));
-            this->xsc_dp_->label(i);
-          }
-
-        // Read in the UUID, if present
-        if (plan.UUID != 0)
-          {
-            XMLSchema::string< ACE_TCHAR > j(ACE_TEXT_CHAR_TO_TCHAR(plan.UUID));
-            this->xsc_dp_->UUID(j);
-          }
-
-        // Similar thing for dependsOn
-        len = plan.dependsOn.length();
-        for (size_t j = 0;
-             j < len;
-             ++j)
-          {
-            //this->xsc_dp_->add_dependsOn(ID_Handler::impl_dependency(plan.dependsOn[j]));
-          }
-
-        // ... And the property stuff
-        len = plan.infoProperty.length();
-        for (size_t q = 0;
-             q < len;
-             q++)
-          {
-            if (ACE_OS::strcmp (plan.infoProperty[q].name.in (),
-                                "CIAOServerResources") == 0)
-              {
-                DANCE_DEBUG (1, (LM_ERROR,
-                            "(%P|%t) DP_Handler: Dumping of ServerResources not currently supported."));
-                continue;
-              }
-
-            //this->xsc_dp_->add_infoProperty (Property_Handler::get_property (plan.infoProperty[q]));
-          }
-
-
-        // We are assuming there is a realizes for the moment
-        // @@ We may want to change this at a later date by creating a sequence of
-        // @@ ComponentInterfaceDescriptions in the DeploymentPlan in ../DAnCE/Deployment/Deployment_Data.idl
-        // @@ so we can check for length
-        this->xsc_dp_->realizes(CCD_Handler::component_interface_descr(plan.realizes));
-        if (!this->xsc_dp_->realizes_p())
-          {
-            DANCE_DEBUG (1, (LM_ERROR,
-                        "(%P|%t) DP_Handler: "
-                        "Error parsing Component Interface Descriptor."));
-            return false;
-          }
-
-        //Take care of the artifact(s) if they exist
-        len = plan.artifact.length();
-        for(size_t k = 0;
-            k < len;
-            k++)
-          {
-            //this->xsc_dp_->add_artifact (ADD_Handler::artifact_deployment_descr (plan.artifact[k]));
-          }
-
-        //Take care of the implementation(s) if they exist
-        len = plan.implementation.length();
-        for(size_t l = 0;
-            l < len;
-            l++)
-          {
-            //this->xsc_dp_->add_implementation (MDD_Handler::mono_deployment_description (plan.implementation[l]));
-          }
-
-        //Ditto for the instance(s)
-        len = plan.instance.length();
-        for(size_t m = 0;
-            m < len;
-            m++)
-          {
-            //this->xsc_dp_->add_instance (IDD_Handler::instance_deployment_descr (plan.instance[m]));
-          }
-
-        //Finally, take care of the Connection Planning
-        len = plan.connection.length();
-        for(size_t n = 0; n < len; n++)
-          {
-            //this->xsc_dp_->add_connection (PCD_Handler::get_PlanConnectionDescription (plan.connection[n]));
-          }
-
-        retval_ = true;
-        return true;
-      }
+      dance_trace ("dp_handler::build_xsc");
+
+      // initialize the uuid generator.
+      ace_utils::uuid_generator::instance ()->init ();
+
+      // clear idref tables
+      idd_handler::idref.unbind_refs ();
+      mdd_handler::idref.unbind_refs ();
+      add_handler::idref.unbind_refs ();
+
+
+      size_t len; //used for checking the length of struct data members
+
+      // read in the label, if present, since minoccurs = 0
+      if (plan.label != 0)
+        {
+          xmlschema::string< ace_tchar > i(ace_text_char_to_tchar (plan.label));
+          this->xsc_dp_->label(i);
+        }
+
+      // read in the uuid, if present
+      if (plan.uuid != 0)
+        {
+          xmlschema::string< ace_tchar > j(ace_text_char_to_tchar(plan.uuid));
+          this->xsc_dp_->uuid(j);
+        }
+
+      // similar thing for dependson
+      len = plan.dependson.length();
+      for (size_t j = 0;
+            j < len;
+            ++j)
+        {
+          //this->xsc_dp_->add_dependson(id_handler::impl_dependency(plan.dependson[j]));
+        }
+
+      // ... and the property stuff
+      len = plan.infoproperty.length();
+      for (size_t q = 0;
+            q < len;
+            q++)
+        {
+          if (ace_os::strcmp (plan.infoproperty[q].name.in (),
+                              "ciaoserverresources") == 0)
+            {
+              dance_debug (1, (lm_error,
+                          "(%p|%t) dp_handler: dumping of serverresources not currently supported."));
+              continue;
+            }
+
+          //this->xsc_dp_->add_infoproperty (property_handler::get_property (plan.infoproperty[q]));
+        }
+
+
+      // we are assuming there is a realizes for the moment
+      // @@ we may want to change this at a later date by creating a sequence of
+      // @@ componentinterfacedescriptions in the deploymentplan in ../dance/deployment/deployment_data.idl
+      // @@ so we can check for length
+      this->xsc_dp_->realizes(ccd_handler::component_interface_descr(plan.realizes));
+      if (!this->xsc_dp_->realizes_p())
+        {
+          dance_debug (1, (lm_error,
+                      "(%p|%t) dp_handler: "
+                      "error parsing component interface descriptor."));
+          return false;
+        }
+
+      //take care of the artifact(s) if they exist
+      len = plan.artifact.length();
+      for(size_t k = 0;
+          k < len;
+          k++)
+        {
+          //this->xsc_dp_->add_artifact (add_handler::artifact_deployment_descr (plan.artifact[k]));
+        }
+
+      //take care of the implementation(s) if they exist
+      len = plan.implementation.length();
+      for(size_t l = 0;
+          l < len;
+          l++)
+        {
+          //this->xsc_dp_->add_implementation (mdd_handler::mono_deployment_description (plan.implementation[l]));
+        }
+
+      //ditto for the instance(s)
+      len = plan.instance.length();
+      for(size_t m = 0;
+          m < len;
+          m++)
+        {
+          //this->xsc_dp_->add_instance (idd_handler::instance_deployment_descr (plan.instance[m]));
+        }
+
+      //finally, take care of the connection planning
+      len = plan.connection.length();
+      for(size_t n = 0; n < len; n++)
+        {
+          //this->xsc_dp_->add_connection (pcd_handler::get_planconnectiondescription (plan.connection[n]));
+        }
+
+      retval_ = true;
+      return true;
     }
   }
+}
diff --git a/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp b/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp
index 3aa858c39e2..7523febbbee 100644
--- a/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp
+++ b/CIAO/DAnCE/Config_Handlers/DnC_Dump_T.cpp
@@ -1,90 +1,89 @@
 // $Id$
 #ifndef DNC_DUMP_T_C
 #define DNC_DUMP_T_C
+
 #include "DnC_Dump.h"
 #include "DnC_Dump_T.h"
 #include "Dump_Obj.h"
 #include "Logger/Log_Macros.h"
-ACE_RCSID (Config_Handlers,
-           DnC_Dump_T,
-           "$Id$")
-  namespace Deployment
+
+namespace Deployment
+{
+  namespace DnC_Dump_T
   {
-    namespace DnC_Dump_T
+    // Dumps a reference
+    template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
+              typename CLASS>
+    void
+    dump_ref (const char* caption, REFERENCE& ref,
+              const char* root, DATA_TYPE CLASS::*data)
+    {
+      DANCE_DEBUG (1, (LM_DEBUG, "%s%s:\n",
+                  Dump_Obj::indent(), caption));
+
+      const CORBA::Any &val = Dump_Obj::desc (root);
+
+      ROOT *t = 0;
+
+      val >>= t;
+
+      const ROOT &root_obj = *t;
+
+      int value = ref;
+      DANCE_DEBUG (1, (LM_DEBUG, "%s%s.name: %s\n",
+                  Dump_Obj::indent(), caption,
+                  (root_obj.*data)[value].name.in()));
+    }
+
+    // Dumps a reference sequence
+    template <typename ROOT, typename SEQUENCE, typename DATA_TYPE,
+              typename CLASS>
+    void
+    dump_ref_seq (const char* caption, SEQUENCE& seq,
+                  const char* root, DATA_TYPE CLASS::*data)
     {
-      // Dumps a reference
-      template <typename ROOT, typename REFERENCE, typename DATA_TYPE,
-                typename CLASS>
-      void
-      dump_ref (const char* caption, REFERENCE& ref,
-                const char* root, DATA_TYPE CLASS::*data)
-      {
-        DANCE_DEBUG (1, (LM_DEBUG, "%s%s:\n",
-                    Dump_Obj::indent(), caption));
-
-        const CORBA::Any &val = Dump_Obj::desc (root);
-
-        ROOT *t = 0;
-
-        val >>= t;
-
-        const ROOT &root_obj = *t;
-
-        int value = ref;
-        DANCE_DEBUG (1, (LM_DEBUG, "%s%s.name: %s\n",
-                    Dump_Obj::indent(), caption,
-                    (root_obj.*data)[value].name.in()));
-      }
-
-      // Dumps a reference sequence
-      template <typename ROOT, typename SEQUENCE, typename DATA_TYPE,
-                typename CLASS>
-      void
-      dump_ref_seq (const char* caption, SEQUENCE& seq,
-                    const char* root, DATA_TYPE CLASS::*data)
-      {
-        DANCE_DEBUG (1, (LM_DEBUG,
-                    "%s%s:\n",
-                    Dump_Obj::indent(), caption));
-
-        CORBA::Any val;
-        val <<= root;
-
-        for (size_t i = 0; i < seq.length(); ++i)
-          {
-            const CORBA::Any &val = Dump_Obj::desc (root);
-
-            ROOT *t = 0;
-
-            val >>= t;
-
-            const ROOT &root_obj = *t;
-            int value = seq[i];
-            DANCE_DEBUG (1, (LM_DEBUG, "%s%s[%d].name: %s\n",
-                        Dump_Obj::indent(), caption, i,
-                        (root_obj.*data)[value].name.in()));
-          }
-      }
-
-      // Dumps a sequence
-      template <typename SEQUENCE>
-      void
-      dump_sequence (const char* caption, const SEQUENCE &seq)
-      {
-        CORBA::ULong size = seq.length ();
-
-        if (size != 0)
-          {
-            Dump_Obj dump_obj(caption);
-
-            for (CORBA::ULong i = 0; i < size; ++i)
-              {
-                DANCE_DEBUG (1, (LM_DEBUG, "%s%s %d:\n", Dump_Obj::indent(),
-                            caption, i));
-                DnC_Dump::dump (seq[i]);
-              }
-          }
-      }
+      DANCE_DEBUG (1, (LM_DEBUG,
+                  "%s%s:\n",
+                  Dump_Obj::indent(), caption));
+
+      CORBA::Any val;
+      val <<= root;
+
+      for (size_t i = 0; i < seq.length(); ++i)
+        {
+          const CORBA::Any &val = Dump_Obj::desc (root);
+
+          ROOT *t = 0;
+
+          val >>= t;
+
+          const ROOT &root_obj = *t;
+          int value = seq[i];
+          DANCE_DEBUG (1, (LM_DEBUG, "%s%s[%d].name: %s\n",
+                      Dump_Obj::indent(), caption, i,
+                      (root_obj.*data)[value].name.in()));
+        }
+    }
+
+    // Dumps a sequence
+    template <typename SEQUENCE>
+    void
+    dump_sequence (const char* caption, const SEQUENCE &seq)
+    {
+      CORBA::ULong size = seq.length ();
+
+      if (size != 0)
+        {
+          Dump_Obj dump_obj(caption);
+
+          for (CORBA::ULong i = 0; i < size; ++i)
+            {
+              DANCE_DEBUG (1, (LM_DEBUG, "%s%s %d:\n", Dump_Obj::indent(),
+                          caption, i));
+              DnC_Dump::dump (seq[i]);
+            }
+        }
     }
   }
+}
 #endif /* DNC_DUMP_C */
diff --git a/CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp b/CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp
index 0c411db8e74..f893f1ee927 100644
--- a/CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp
+++ b/CIAO/DAnCE/Config_Handlers/Dump_Obj.cpp
@@ -3,64 +3,59 @@
 #include "ace/Log_Msg.h"
 #include "Logger/Log_Macros.h"
 
-ACE_RCSID (Config_Handlers,
-           Dump_Obj,
-           "$Id$")
-
-  namespace Deployment
+namespace Deployment
+{
+  // static member initialization
+  std::string Dump_Obj::indent_ = "-";
+  std::map<std::string, CORBA::Any> Dump_Obj::desc_map_;
+
+  Dump_Obj::Dump_Obj(const char* caption)
+    : desc_()
   {
-    // static member initialization
-    std::string Dump_Obj::indent_ = "-";
-    std::map<std::string, CORBA::Any> Dump_Obj::desc_map_;
-
-    Dump_Obj::Dump_Obj(const char* caption)
-      : desc_()
-    {
-      DANCE_DEBUG (1, (LM_DEBUG, "%C%C:\n", indent_.c_str(), caption));
-      indent_.append("  ");
-    }
-
-
-    Dump_Obj::Dump_Obj(const char* caption,
-                       CORBA::Any &val)
-      : desc_(caption)
-    {
-      DANCE_DEBUG (1, (LM_DEBUG, "%C%C:\n",
-                  indent_.c_str(),
-                  caption));
-
-      indent_.append("   ");
+    DANCE_DEBUG (1, (LM_DEBUG, "%C%C:\n", indent_.c_str(), caption));
+    indent_.append("  ");
+  }
 
-      if (desc_map_.find (std::string (caption)) != desc_map_.end())
-        {
-          DANCE_DEBUG (1, (LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-The item with name %C is already in \
-the node map.\n", caption));
-          throw Node_Exist();
-        }
-      else
-        {
-          desc_map_[std::string(caption)] = val;
-        }
-    }
 
-    Dump_Obj::~Dump_Obj()
-    {
-      indent_.erase(indent_.size() - 2, 2);
-      if (desc_.size() != 0)
-        {
-          if (desc_map_.find(desc_) != desc_map_.end())
-            {
-              desc_map_.erase(desc_map_.find(desc_));
-            }
-          else
-            {
-              DANCE_DEBUG (1, (LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
-The item with name %C is not in the node map.\n",
-                          desc_.c_str()));
-              throw Node_Not_Exist();
-            }
-        }
-    }
+  Dump_Obj::Dump_Obj(const char* caption,
+                      CORBA::Any &val)
+    : desc_(caption)
+  {
+    DANCE_DEBUG (1, (LM_DEBUG, "%C%C:\n",
+                indent_.c_str(),
+                caption));
+
+    indent_.append("   ");
+
+    if (desc_map_.find (std::string (caption)) != desc_map_.end())
+      {
+        DANCE_DEBUG (1, (LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
+                          The item with name %C is already in \
+                          the node map.\n", caption));
+        throw Node_Exist();
+      }
+    else
+      {
+        desc_map_[std::string(caption)] = val;
+      }
+  }
 
+  Dump_Obj::~Dump_Obj()
+  {
+    indent_.erase(indent_.size() - 2, 2);
+    if (desc_.size() != 0)
+      {
+        if (desc_map_.find(desc_) != desc_map_.end())
+          {
+            desc_map_.erase(desc_map_.find(desc_));
+          }
+        else
+          {
+            DANCE_DEBUG (1, (LM_DEBUG, "DnC_Dump.cpp:Dump_Obj - \
+                        The item with name %C is not in the node map.\n",
+                        desc_.c_str()));
+            throw Node_Not_Exist();
+          }
+      }
   }
+}
diff --git a/CIAO/DAnCE/Config_Handlers/IDREF_Base.cpp b/CIAO/DAnCE/Config_Handlers/IDREF_Base.cpp
index 9f11efb7535..f96698e9c63 100644
--- a/CIAO/DAnCE/Config_Handlers/IDREF_Base.cpp
+++ b/CIAO/DAnCE/Config_Handlers/IDREF_Base.cpp
@@ -7,11 +7,6 @@
 #include "IDREF_Base.h"
 #include <iostream>
 
-
-ACE_RCSID (DAnCE,
-           IDREF_Base,
-           "$Id$")
-
 namespace CIAO
   {
     namespace Config_Handlers
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
index 94702c170d4..c5d6a06f6d1 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
@@ -12,10 +12,6 @@
 #include "ExecutionManager_Impl.h"
 #include "DAnCE/Logger/Log_Macros.h"
 
-ACE_RCSID (DAnCE,
-           DAnCE_ExecutionManager_Module,
-           "$Id$")
-
 namespace DAnCE
 {
   namespace ExecutionManager
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index 11a9a958ecc..8818fdaaadb 100644
--- a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -18,10 +18,6 @@
 #include "Artifact_Installation/File_Installation_Handler.h"
 #include "Artifact_Installation/Http_Installation_Handler.h"
 
-ACE_RCSID (DAnCE,
-           Node_Manager_Module,
-           "$Id$")
-
 namespace DAnCE
 {
   namespace Node_Manager
diff --git a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
index 676d937df3d..a702aa311ca 100644
--- a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
+++ b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
@@ -18,10 +18,6 @@
 
 #include "RepositoryManager_Impl.h"
 
-ACE_RCSID (DAnCE,
-           Repository_Manager_Module,
-           "$Id$")
-
 namespace DAnCE
 {
   namespace Repository_Manager
diff --git a/CIAO/DAnCE/TargetManager/Target_Manager_Module.cpp b/CIAO/DAnCE/TargetManager/Target_Manager_Module.cpp
index fdadc3aaca0..357f2b26f80 100644
--- a/CIAO/DAnCE/TargetManager/Target_Manager_Module.cpp
+++ b/CIAO/DAnCE/TargetManager/Target_Manager_Module.cpp
@@ -13,10 +13,6 @@
 
 #include "TargetManager_Impl.h"
 
-ACE_RCSID (DAnCE,
-           Targer_Manager_Module,
-           "$Id$")
-
 namespace DAnCE
 {
   namespace Target_Manager
diff --git a/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.cpp b/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.cpp
index 485cb891053..b69dd377cba 100644
--- a/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.cpp
+++ b/CIAO/DAnCE/tools/Completion/Completion_Counter_Base.cpp
@@ -4,8 +4,6 @@
 
 #include "Completion/Completion_Counter_Base.h"
 
-ACE_RCSID(DAnCE, Completion_Counter_Base, "$Id$")
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/CIAO/ciao/Servants/Port_Activator.cpp b/CIAO/ciao/Servants/Port_Activator.cpp
index 68e253dea13..b30dde7b1ee 100644
--- a/CIAO/ciao/Servants/Port_Activator.cpp
+++ b/CIAO/ciao/Servants/Port_Activator.cpp
@@ -1,9 +1,5 @@
 #include "Port_Activator.h"
 
-ACE_RCSID (ciao,
-           Servant_Activator,
-           "$Id$")
-
 namespace CIAO
 {
   Port_Activator_i::Port_Activator_i (const char *oid,
diff --git a/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp b/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp
index 30a12b438b3..946783977a1 100644
--- a/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp
+++ b/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp
@@ -1,9 +1,6 @@
 // $Id$
-#include "ConfigValue.h"
 
-ACE_RCSID (ciao,
-           ConfigValue,
-           "$Id$")
+#include "ConfigValue.h"
 
 namespace CIAO
 {
diff --git a/CIAO/ciao/Valuetype_Factories/Cookies.cpp b/CIAO/ciao/Valuetype_Factories/Cookies.cpp
index 0d32ffe9d89..7332cb6a4a1 100644
--- a/CIAO/ciao/Valuetype_Factories/Cookies.cpp
+++ b/CIAO/ciao/Valuetype_Factories/Cookies.cpp
@@ -6,10 +6,6 @@
 #include "Cookies.inl"
 #endif /* !defined INLINE */
 
-ACE_RCSID (ciao,
-           Cookies,
-           "$Id$")
-
 namespace CIAO
 {
   Cookie_Impl::Cookie_Impl (ptrdiff_t const &key)
diff --git a/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp b/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp
index bb503a6728f..155d0516de5 100644
--- a/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp
+++ b/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.cpp
@@ -4,10 +4,6 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Strategies,
-           Custom_Network_Priority_Mapping,
-           "$Id$")
-
 #define IPDSFIELD_DSCP_DEFAULT  0x00
 #define IPDSFIELD_DSCP_CS1      0x08
 #define IPDSFIELD_DSCP_CS2      0x10
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp
index e8b0d683415..e497ccc7bf2 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp
@@ -5,10 +5,6 @@
 
 #include "XML_Helper.h"
 
-ACE_RCSID (IDL2XMI_Test,
-           xmlvalidator,
-           "$Id$")
-
 const ACE_TCHAR *inp_file = ACE_TEXT ("");
 
 int
diff --git a/CIAO/tools/IDL3_to_IDL2/be_helper.cpp b/CIAO/tools/IDL3_to_IDL2/be_helper.cpp
index db3968af3c5..2957a04ed36 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_helper.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/be_helper.cpp
@@ -26,10 +26,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_ctype.h"
 
-ACE_RCSID (be,
-           be_helper,
-           "$Id$")
-
 static const char copyright[] =
 "// -*- C++ -*-\n"
 "//\n"
diff --git a/CIAO/tools/IDL3_to_XMI/be_helper.cpp b/CIAO/tools/IDL3_to_XMI/be_helper.cpp
index 4a7b28096c6..a1853d703ee 100644
--- a/CIAO/tools/IDL3_to_XMI/be_helper.cpp
+++ b/CIAO/tools/IDL3_to_XMI/be_helper.cpp
@@ -25,10 +25,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
 
-ACE_RCSID (be,
-           be_helper,
-           "$Id$")
-
 static const char copyright[] =
 " <--\n"
 " -*- XML -*-\n"
diff --git a/CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp b/CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp
index 30126f74451..3de8aedd0b6 100644
--- a/CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp
+++ b/CIAO/tools/IDL3_to_XMI/be_sunsoft.cpp
@@ -9,10 +9,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_ctype.h"
 
-ACE_RCSID (be,
-           be_sunsoft,
-           "$Id$")
-
 TAO_SunSoft_OutStream::TAO_SunSoft_OutStream (void)
   : TAO_OutStream ()
 {