Wed Dec 30 10:31:39 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * DAnCE/NodeApplication/ComponentAttributesSetter.cpp:
          Removed commented out code

        * AnCE/NodeApplication/NodeApplication.mpc:
          Removed commented out lines

        * DAnCE/NodeApplication/ServerActivator_Impl.cpp:
        * DAnCE/NodeApplication/ServerActivator_Impl.h:
          Removed, not used

        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp:
          Removed commented out code

        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
          Const changes

        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp:
        * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp:
          Removed commented out code

9 files changed, 53 insertions, 446 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 38f76abbcad..46373cec675 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,25 @@
+Wed Dec 30 10:31:39 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeApplication/ComponentAttributesSetter.cpp:
+          Removed commented out code
+
+        * AnCE/NodeApplication/NodeApplication.mpc:
+          Removed commented out lines
+
+        * DAnCE/NodeApplication/ServerActivator_Impl.cpp:
+        * DAnCE/NodeApplication/ServerActivator_Impl.h:
+          Removed, not used
+
+        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp:
+          Removed commented out code
+
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
+          Const changes
+
+        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp:
+        * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp:
+          Removed commented out code
+
 Wed Dec 30 08:14:39 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/Deployment/Module_Main.h:
diff --git a/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp b/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp
index 625a5bfcd0f..9ea66fc9c78 100644
--- a/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp
+++ b/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp
@@ -10,27 +10,6 @@
 #include "DAnCE/Logger/Log_Macros.h"
 #include "Deployment/Deployment_ApplicationC.h"
 
-//bool read_config_value( const ACE_CString & name,
-//                        const Deployment::Properties & prop,
-//                        CORBA::Any_out value)
-//    throw()
-//{
-//    ACE_CString cdmw_name = name;
-//    bool found = false;
-//    CORBA::ULong len = prop.length();
-//    for (CORBA::ULong count = 0; count < len; ++count)
-//    {
-//        if ( cdmw_name.compare(prop[count].name.in()) == 0 )
-//        {
-//            value = new CORBA::Any(prop[count].value);
-//            found = true;
-//            break;
-//        }
-//    }
-//    return found;
-//}
-
-
 ComponentAttributesSetter::ComponentAttributesSetter()
 {
 }
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index e62ac746400..6892f1b534a 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -9,15 +9,11 @@ project(NodeApplication): dance_lib, dynamicinterface, dance_component_server_sv
   dynamicflags = NODEAPPLICATION_BUILD_DLL
 
 Source_Files {
-//    ComponentInstallation_Impl.cpp
-//    ServerActivator_Impl.cpp
     NodeApplication_Impl.cpp
     ComponentAttributesSetter.cpp
     Name_Utilities.cpp
   }
   Header_Files {
-//    ComponentInstallation_Impl.h
-//    ServerActivator_Impl.h
     NodeApplication_Impl.h
     ComponentAttributesSetter.h
     Name_Utilities.h
diff --git a/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.cpp b/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.cpp
deleted file mode 100644
index 13713acdb75..00000000000
--- a/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// $Id$
-
-#include "ServerActivator_Impl.h"
-#include "Cdmw/CDMW_IDL_ExtC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-
-const char* COMPONENT_SERVER_NAME = "ComponentServer";
-
-bool read_config_value (const ACE_CString & name,
-                        const Components::ConfigValues & config,
-                        CORBA::Any_out value)
-{
-  bool found = false;
-  CORBA::ULong const len = config.length();
-  for (CORBA::ULong count = 0; count < len; ++count)
-    {
-      if (name.compare (config[count]->name()) == 0)
-        {
-          value = new CORBA::Any (config[count]->value());
-          found = true;
-          break;
-        }
-    }
-
-  return found;
-}
-
-using namespace DAnCE;
-
-ServerActivator_Impl::ServerActivator_Impl (CORBA::ORB_ptr orb,
-                                            PortableServer::POA_ptr poa,
-                                            Components::Deployment::ComponentInstallation_ptr compInst)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-    , poa_ (PortableServer::POA::_duplicate (poa))
-    , compInst_ (Components::Deployment::ComponentInstallation::_duplicate (compInst))
-{
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::ServerActivator_Impl - started\n"));
-
-  CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("ProcessDestinationNC");
-  if (CORBA::is_nil(obj))
-    {
-      DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::ServerActivator_Impl - Failed to retrieve the \"ProcessDestinationNC\" object.\n"));
-      throw CORBA::ORB::InvalidName();
-    }
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::ServerActivator_Impl name service reference received\n"));
-  try
-  {
-    this->naming_ = CosNaming::NamingContext::_narrow (obj);
-  }
-  catch (...)
-  {
-    DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::ServerActivator_Impl - failed to narrow the \"ProcessDestinationNC\" NC.\n"));
-    throw;
-  }
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::ServerActivator_Impl - finished\n"));
-}
-
-ServerActivator_Impl::~ServerActivator_Impl()
-{
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::~ServerActivator_Impl - started\n"));
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::~ServerActivator_Impl - finished\n"));
-}
-
-::Components::Deployment::ComponentServer_ptr
-ServerActivator_Impl::create_component_server (const ::Components::ConfigValues & config)
-{
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::create_component_server - started\n"));
-
-  // NOTA: These are the configuration values understood by the server activator
-  // for component server creation
-  //
-  // +====================================+=============================+
-  // | Config Name                        | Type                        |
-  // +====================================+=============================+
-  // | PROCESS_DESTINATION (*)            | string                      |
-  // +------------------------------------+-----------------------------+
-  //
-  // (*) compulsory
-  //
-  //Extracting process destination
-  ACE_CString processDest;
-  {
-    CORBA::Any_var processDestAny;
-
-    if (read_config_value (Components::PROCESS_DESTINATION, config, processDestAny))
-      {
-        const char* szProcessDest = 0;
-        processDestAny.in() >>= szProcessDest;
-        processDest = szProcessDest;
-      }
-    else
-      {
-        DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::create_component_server - read_config_value() function fails\n"));
-        throw ::Components::Deployment::InvalidConfiguration();
-      }
-  }
-  ::Components::Deployment::ComponentServer_var srv;
-  if (0 == this->servers_.find (processDest, srv))
-    {
-      return srv._retn();//::Components::Deployment::ComponentServer::_duplicate (srv.in());
-    }
-  //Looking for ComponentServer
-  ACE_CString processName = processDest + "." + COMPONENT_SERVER_NAME;
-  CosNaming::Name name (1);
-  name.length (1);
-  name[0].id = CORBA::string_dup (processDest.c_str());
-  name[0].kind = CORBA::string_dup (COMPONENT_SERVER_NAME);
-  CORBA::Object_var obj;
-  CosNaming::NamingContext_var naming;
-  try
-    {
-      obj = this->naming_->resolve (name);
-    }
-  catch (const CosNaming::NamingContext::NotFound& )
-    {
-      DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::create_component_server - NotFound exception rised."
-                   "(Name : CDMW/SERVICES/ASSEMBLYANDDEPLOYMENT/%C)\n"
-                   , processDest.c_str()));
-      throw ::Components::CreateFailure();
-    }
-  catch (const CosNaming::NamingContext::CannotProceed& )
-    {
-      DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::create_component_server - NotFound exception rised."
-                   "(Name : CDMW/SERVICES/ASSEMBLYANDDEPLOYMENT/%C)\n"
-                   , processDest.c_str()));
-      throw ::Components::CreateFailure();
-    }
-  catch (const CosNaming::NamingContext::InvalidName& )
-    {
-      DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::create_component_server - NotFound exception rised."
-                   "(Name : CDMW/SERVICES/ASSEMBLYANDDEPLOYMENT/%C)\n"
-                   , processDest.c_str()));
-      throw ::Components::CreateFailure();
-    }
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::create_component_server - ComponentServer object resolved\n"));
-  //Casting founded object
-  ::Components::Deployment::ComponentServer_var server
-    = ::Components::Deployment::ComponentServer::_narrow (obj);
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::create_component_server - ComponentServer object narrowed\n"));
-  if (CORBA::is_nil (server))
-    {
-      DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::create_component_server - ComponentServer in process destination %s  could not be contacted\n", processDest.c_str()));
-      throw ::Components::CreateFailure (::Components::COMPONENT_SERVER_NOT_FOUND);
-    }
-
-  //ComponentServer initialization by ServerActivator and ComponentInstallation references
-  this->initializeComponentServer (server.in());
-
-  //Saving server reference
-  //TODO add checking on already present component server with exception CdmwDeployment::COMPONENT_SERVER_ALREADY_CREATED
-  if (0 != this->servers_.bind (processDest, ::Components::Deployment::ComponentServer::_duplicate (server.in())))
-    {
-      DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::create_component_server - ComponentServer in process destination %s already exists.\n", processDest.c_str()));
-      throw ::Components::CreateFailure (::Components::COMPONENT_SERVER_ALREADY_CREATED);
-    }
-
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::create_component_server - finished\n"));
-  return server._retn ();
-}
-
-void
-ServerActivator_Impl::remove_component_server (::Components::Deployment::ComponentServer_ptr server)
-{
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::remove_component_server - started\n"));
-
-  // Checking input parameters
-  if (CORBA::is_nil (server))
-    {
-      DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::remove_component_server - Wrong input parameter\n"));
-      throw CORBA::BAD_PARAM();
-    }
-
-  // find equivalent server in servers list
-  bool bFound = false;
-  for (TCompServers::iterator iter = this->servers_.begin();
-       iter != this->servers_.end();
-       ++iter)
-    {
-      if (server->_is_equivalent ( (*iter).int_id_.in()))
-        {
-          // remove ComponentServer from list
-          this->servers_.unbind ( (*iter).ext_id_);
-          bFound = true;
-          break;
-        }
-    }
-
-  // if no equivalent found, throw exception
-  if (!bFound)
-    {
-      DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::remove_component_server - equivalent server cannot be found in servers list\n"));
-      throw ::Components::RemoveFailure (::Components::UNKNOWN_COMPONENT_SERVER);
-    }
-
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::remove_component_server - finished\n"));
-}
-
-::Components::Deployment::ComponentServers *
-ServerActivator_Impl::get_component_servers ()
-{
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::get_component_servers - started\n"));
-
-  ::Components::Deployment::ComponentServers* pServers = 0;
-  ACE_NEW_THROW_EX (pServers,
-                    ::Components::Deployment::ComponentServers (this->servers_.current_size()),
-                    CORBA::NO_MEMORY());
-  int i = 0;
-  for (TCompServers::iterator iter = this->servers_.begin();
-       iter != this->servers_.end();
-       ++iter)
-    {
-      (*pServers) [i] = ::Components::Deployment::ComponentServer::_duplicate ( (*iter).int_id_.in());
-      i++;
-    }
-
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::get_component_servers - finished\n"));
-  return pServers;
-}
-
-void
-ServerActivator_Impl::initializeComponentServer (::Components::Deployment::ComponentServer_ptr server)
-{
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::initializeComponentServer - started\n"));
-
-  // the ComponentServer should be a Cdmw ComponentServer
-  Components::Deployment::ComponentServer_var cdmwServer =
-    Components::Deployment::ComponentServer::_narrow (server);
-
-  if (CORBA::is_nil (cdmwServer.in ())
-    {
-      // Component server is not Cdmw ComponentServer
-      DANCE_ERROR (1, (LM_ERROR, "ServerActivator_Impl::initializeComponentServer - ComponentServer is not CdmwComponentServer\n"));
-      throw ::Components::CreateFailure (::Components::COMPONENT_SERVER_NOT_FOUND);
-    }
-  if (CORBA::is_nil (this->compInst_.in()))
-    {
-      DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::initializeComponentServer - Reference on ComponentInstallation is nil!!!!\n"));
-    }
-  CdmwCcmComponentServer::ComponentServer_var proprietary_svr =
-    CdmwCcmComponentServer::ComponentServer::_narrow (cdmwServer);
-
-  // give it the ComponentInstallation
-  proprietary_svr->set_component_installation (this->compInst_.in());
-  // give it the ServerActivator
-  proprietary_svr->set_server_activator (Components::Deployment::ServerActivator::_narrow (this->poa_->servant_to_reference (this)));
-
-  DANCE_DEBUG (6, (LM_DEBUG, "ServerActivator_Impl::initializeComponentServer - finished\n"));
-}
diff --git a/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h b/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h
deleted file mode 100644
index b0a54087b35..00000000000
--- a/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ServerActivator_Impl.h
- *
- *  $Id$
- *
- * @brief  Implementation of Deployment::ServerActivator
- *
- * @author Erwin Gottlieb <eg@prismtech.com>
- */
-//=============================================================================
-
-#ifndef SERVERACTIVATOR_IMPL_H_
-#define SERVERACTIVATOR_IMPL_H_
-
-#include "ace/Map_Manager.h"
-#include "tao/ORB.h"
-#include "orbsvcs/orbsvcs/CosNamingC.h"
-
-#include "Cdmw/CDMW_IDLS.h"
-#include "ComponentServer/ComponentServerS.h"
-#include "NodeApplication_Export.h"
-
-namespace DAnCE
-  {
-
-  class NodeApplication_Export ServerActivator_Impl : public virtual POA_Components::Deployment::ServerActivator
-    {
-    public:
-      ServerActivator_Impl (CORBA::ORB_ptr orb,
-                            PortableServer::POA_ptr poa_,
-                            Components::Deployment::ComponentInstallation_ptr compInst);
-      virtual ~ServerActivator_Impl();
-
-
-      //
-      // IDL:omg.org/Components/Deployment/ServerActivator/create_component_server:1.0
-      //
-      /**
-       * Creates a ComponentServer object on the host on which the
-       * ServerActivator is located.
-       *
-       * @param  config  ConfigValues for creation of ComponentServer.
-       *                 For CDMW CCM, this sequence should contain a
-       *                 PROCESS_DESTINATION ConfigValue which specify the
-       *                 destination of an already started ComponentServer process.
-       *
-       * @throws  CreateFailure
-       *          INVALID_PROCESS_DESTINATION: raised if the destination
-       *          specified in PROCESS_DESTINATION ConfigValue is not valid.<br>
-       *          COMPONENT_SERVER_NOT_CREATED: raised if the ComponentServer could
-       *          not be contacted (it should be started by PlatformManagement before
-       *          the call to ServerActivator).<br>
-       *          COMPONENT_SERVER_ALREADY_CREATED: raised if this method has already
-       *          been called with the same PROCESS_DESTINATION ConfigValue.
-       * @throws  InvalidConfiguration
-       *          raised if the config parameter doesn't contain a single
-       *          PROCESS_DESTINATION ConfigValue.
-       */
-      virtual ::Components::Deployment::ComponentServer_ptr create_component_server (
-        const ::Components::ConfigValues & config
-      );
-
-      //
-      // IDL:omg.org/Components/Deployment/ServerActivator/remove_component_server:1.0
-      //
-      virtual void remove_component_server (
-        ::Components::Deployment::ComponentServer_ptr server
-      );
-
-      //
-      // IDL:omg.org/Components/Deployment/ServerActivator/get_component_servers:1.0
-      //
-      virtual ::Components::Deployment::ComponentServers * get_component_servers (
-      );
-
-    private:
-      typedef ACE_Map_Manager<ACE_CString, ::Components::Deployment::ComponentServer_var, ACE_Null_Mutex > TCompServers;
-      TCompServers servers_;
-
-      CORBA::ORB_var orb_;
-      PortableServer::POA_var poa_;
-      CosNaming::NamingContext_var naming_;
-      Components::Deployment::ComponentInstallation_var compInst_;
-
-    private:
-      void initializeComponentServer (::Components::Deployment::ComponentServer_ptr server);
-    };
-};
-
-#endif /*SERVERACTIVATOR_IMPL_H_*/
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
index 597890556ac..ba8bbb68b19 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
@@ -27,6 +27,7 @@ Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc,
                     ACE_TEXT("Creating internal ORB.\n")));
       this->orb_ = CORBA::ORB_init (argc, argv);
     }
+
   this->parse_args(argc, argv);
 
   DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_i::init - em_ior = \"%C\"\n")
@@ -197,11 +198,7 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan)
           DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ")
                         ACE_TEXT("DomainApplication was received from startLaunch\n")));
         }
-      //this is temporal workaround while cdmw checks object type in connect call
-      /*
-      DANCE_DEBUG (6, (LM_DEBUG, DLINFO "Press any key after deployment on other node finished\n"));
-      getchar();
-      */
+
       this->create_external_connections (plan, conns.inout());
 
       // Call finish Launch to complete the connections
@@ -431,7 +428,7 @@ void Plan_Launcher_Base_Impl::parse_args(int argc, ACE_TCHAR *argv[])
             // trim leading file://
             if (0 < s.length())
               {
-                ssize_t pos = s.find("file://");
+                ssize_t const pos = s.find("file://");
                 if (0 == pos)
                   {
                     s = s.substring(7);
@@ -552,7 +549,7 @@ Plan_Launcher_Base_Impl::stop_plan()
   if (0 < this->cdr_plan_urls_.size())
     {
       stopped = true;
-      size_t sz = this->cdr_plan_urls_.size();
+      size_t const sz = this->cdr_plan_urls_.size();
       for (size_t i = 0; i < sz; ++i)
         {
           DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ")
@@ -584,44 +581,7 @@ void Plan_Launcher_Base_Impl::create_external_connections(
     const ::Deployment::DeploymentPlan &plan, Deployment::Connections& conn)
 {
   DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("create_external_connections - start\n")));
-  /*    CORBA::Object_var obj = this->orb_->resolve_initial_references("NameService");
-   CosNaming::NamingContext_var naming = CosNaming::NamingContext::_narrow(obj.in());
-   CosNaming::BindingList_var bl;
-   CosNaming::BindingIterator_var bi;
-   //naming->list(10L, bl.out(), bi.out());
-   CosNaming::Name name(1);
-   name.length(3);
-   name[0].id = CORBA::string_dup("CDMW");//CORBA::string_dup("CcmDance1Test");
-   name[1].id = CORBA::string_dup ("SERVICES");
-   name[2].id = CORBA::string_dup("ASSEMBLYANDDEPLOYMENT");
-   obj = naming->resolve(name);
-   DANCE_DEBUG (6, (LM_DEBUG, "create_external_connections - After resolve\n"));
-   CosNaming::NamingContext_var CcmDance1Test = CosNaming::NamingContext::_narrow(obj.in());
-   CcmDance1Test->list(10L, bl.out(), bi.out());
-   bool exit = false;
-   while (!exit)
-   {
-   char buf[1024];
-   ACE_OS::sprintf(buf, "create_external_connections - naming size is %u\n", bl->length());
-   DANCE_DEBUG (6, (LM_DEBUG, buf));
-   for ( size_t i = 0; i< bl->length(); i++ )
-   {
-   for ( size_t j = 0; j < (*bl)[i].binding_name.length(); j++ )
-   {
-   ACE_OS::sprintf(buf, "create_external_connections - Binding name %s, binding kind %s, binding type %i\n"
-   , (*bl)[i].binding_name[j].id.in()
-   , (*bl)[i].binding_name[j].kind.in()
-   , (*bl)[i].binding_type);
-   DANCE_DEBUG (6, (LM_DEBUG, buf));
-   }
-   }
-   if(!bi->next_n(10L, bl.out()))
-   {
-   exit = true;
-   }
-   }
-   */
-  for (unsigned int i = 0; i < plan.connection.length(); i++)
+  for (CORBA::ULong i = 0; i < plan.connection.length(); i++)
     {
       if (plan.connection[i].externalReference.length() > 0
           && plan.connection[i].externalReference[0].provider)
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
index 0f36df1aef7..0abc59d555c 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
@@ -55,7 +55,7 @@ void Plan_Launcher_Impl::execute()
 
   if (this->mode_ & MODE_START_PLAN)
     {
-      size_t sz = this->xml_plan_urls_.size();
+      size_t const sz = this->xml_plan_urls_.size();
       for (size_t i= 0; i < sz; ++i)
         {
           DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::execute - ")
@@ -98,7 +98,7 @@ void Plan_Launcher_Impl::stop_plan()
 
   if (0 < this->xml_plan_urls_.size())
     {
-      size_t sz = this->xml_plan_urls_.size();
+      size_t const sz = this->xml_plan_urls_.size();
       for (size_t i= 0; i < sz; ++i)
         {
           DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::stop_plan - ")
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
index 336d3247584..7f20c461165 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
@@ -434,12 +434,6 @@ namespace CIAO
                 ACE_TEXT_CHAR_TO_TCHAR (node->supports ()[i]->repoID ())));
             }
 
-          /* NOTE: CDMW XMI generator ignores supports specifications.
-          // Supports
-          if (node->n_supports () != 0)
-          throw Error ("ValueTypes which support are not currently supported.", node);
-          */
-
           ES_Guard oe_guard (LITERALS[OWNEDELEMENT_TAG], this);
 
           this->cached_type_ = node;
diff --git a/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp
index 23b432b2dd8..12f786a77e9 100644
--- a/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp
+++ b/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp
@@ -212,12 +212,12 @@ namespace CIAO
     ir_simulator_visitor::visit_interface (AST_Interface *node)
     {
       XMI_TRACE ("interface");
-      
+
       if (!this->do_i_care (node))
         {
           return 0;
         }
-      
+
       Incr_Guard guard (this->associating_);
 
       if (!this->associating_)
@@ -279,12 +279,12 @@ namespace CIAO
     ir_simulator_visitor::visit_valuebox (AST_ValueBox *node)
     {
       XMI_TRACE ("valuebox");
-      
+
       if (!this->do_i_care (node))
         {
           return 0;
         }
-      
+
       Incr_Guard guard (this->associating_);
 
       if (!this->associating_)
@@ -335,12 +335,12 @@ namespace CIAO
     ir_simulator_visitor::visit_valuetype_impl (AST_ValueType *node)
     {
       Incr_Guard guard (this->associating_);
-      
+
       if (!this->do_i_care (node))
         {
           return;
         }
-          
+
       if (!this->associating_)
         {
           // not associating, imported, not my concern
@@ -365,7 +365,7 @@ namespace CIAO
           AST_Type *t = node->inherits_concrete ();
           AST_ValueType *v =
             AST_ValueType::narrow_from_decl (t);
-            
+
           if (v != 0)
             {
               this->visit_valuetype_impl (v);
@@ -410,12 +410,12 @@ namespace CIAO
     ir_simulator_visitor::visit_component (AST_Component *node)
     {
       XMI_TRACE ("component");
-      
+
       if (!this->do_i_care (node))
         {
           return 0;
         }
-      
+
       Incr_Guard guard (this->associating_);
 
       if (!this->associating_)
@@ -461,7 +461,7 @@ namespace CIAO
 
       return 0;
     }
-    
+
     int
     ir_simulator_visitor::visit_component_fwd (AST_ComponentFwd *node)
     {
@@ -565,12 +565,12 @@ namespace CIAO
     ir_simulator_visitor::visit_home (AST_Home *node)
     {
       XMI_TRACE ("home");
-      
+
       if (!this->do_i_care (node))
         {
           return 0;
         }
-      
+
       Incr_Guard guard (this->associating_);
 
       if (!this->associating_)
@@ -677,7 +677,7 @@ namespace CIAO
         {
           return;
         }
-      
+
       Incr_Guard guard (this->associating_);
 
       if (!this->associating_)
@@ -694,7 +694,7 @@ namespace CIAO
             }
         }
       // associating, import
-      else  
+      else
         {
           node->set_imported (false);
         }
@@ -770,12 +770,12 @@ namespace CIAO
     ir_simulator_visitor::visit_enum (AST_Enum *node)
     {
       XMI_TRACE ("enum");
-      
+
       if (!this->do_i_care (node))
         {
           return 0;
         }
-      
+
       Incr_Guard guard (this->associating_);
 
       if (!this->associating_)
@@ -845,11 +845,11 @@ namespace CIAO
               //              ACE_DEBUG ((LM_DEBUG, "bar"));
               node->return_type ()->ast_accept (this);
             }
-            
+
           // **** arguments
           // **** exceptions
           UTL_ExceptList *exceptions = node->exceptions ();
-          
+
           if (exceptions != 0 && exceptions->length () > 0)
             {
               for (UTL_ExceptlistActiveIterator ei (exceptions);
@@ -939,12 +939,12 @@ namespace CIAO
     ir_simulator_visitor::visit_union (AST_Union *node)
     {
       XMI_TRACE ("union");
-      
+
       if (!this->do_i_care (node))
         {
           return 0;
         }
-      
+
       Incr_Guard guard (this->associating_);
 
       if (!this->associating_)
@@ -1008,8 +1008,6 @@ namespace CIAO
     {
       XMI_TRACE ("constant");
 
-      // CDMW XMI generator does not generate XMI for constants.
-      // it, in
       return 0;
     }
 
@@ -1024,12 +1022,12 @@ namespace CIAO
     ir_simulator_visitor::visit_array (AST_Array *node)
     {
       XMI_TRACE ("array val");
-      
+
       if (!this->do_i_care (node))
         {
           return 0;
         }
-      
+
       Incr_Guard guard (this->associating_);
 
       if (!this->associating_)
@@ -1133,7 +1131,7 @@ namespace CIAO
     ir_simulator_visitor::visit_root (AST_Root *node)
     {
       XMI_TRACE ("root");
-      
+
       try
         {
           this->visit_scope (node);
@@ -1155,7 +1153,7 @@ namespace CIAO
 
           return -1;
         }
-        
+
       return 0;
     }