Sun Jul 19 09:46:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * DAnCE/DomainApplication/Domain_Application_Impl.cpp:
          Layout changes

        * DAnCE/DomainApplication/Domain_Application_Impl.h:
          Made startLaunch public

        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
          Layout, const, datatype changes

        * DAnCE/MPC/config/dance_repositorymanagerbase.mpb:
          Added after JAWS

        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
          Layout changes

        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
          Layout, datatype, const changes

        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
          Layout changes

        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp:
          Corrected messages

        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp:
          Unicode fix

        * DAnCE/RepositoryManager/RepositoryManager.mpc:
          JAWS is added by the base project

        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h:
          Corrected base class

12 files changed, 116 insertions, 57 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e5a8a07d74d..e9b4329a167 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,38 @@
+Sun Jul 19 09:46:47 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/DomainApplication/Domain_Application_Impl.cpp:
+          Layout changes
+
+        * DAnCE/DomainApplication/Domain_Application_Impl.h:
+          Made startLaunch public
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+          Layout, const, datatype changes
+
+        * DAnCE/MPC/config/dance_repositorymanagerbase.mpb:
+          Added after JAWS
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+          Layout changes
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+          Layout, datatype, const changes
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
+          Layout changes
+
+        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp:
+          Corrected messages
+
+        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp:
+          Unicode fix
+
+        * DAnCE/RepositoryManager/RepositoryManager.mpc:
+          JAWS is added by the base project
+
+        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h:
+          Corrected base class
+
 Sat Jul 18 22:33:47 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/Starter/Starter.mpc:
@@ -5,7 +40,7 @@ Sat Jul 18 22:33:47 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
           Temporarily disable this project, there's no way it works properly
           at run-time, even if it compiles.  We will take another look at this
           after 0.7.2.
-        
+
 Sat Jul 18 17:41:10 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * tools/XML/XML_Schema_Resolver.cpp:
diff --git a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
index 0c65dfef0d3..b7178e54009 100644
--- a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
@@ -75,7 +75,8 @@ namespace DAnCE
   }
 
   void
-  DomainApplication_Impl::startLaunch (const Deployment::Properties & configProperty)
+  DomainApplication_Impl::startLaunch (
+    const Deployment::Properties & configProperty)
   {
     DANCE_TRACE ("DomainApplication_Impl::startLaunch");
 
@@ -95,7 +96,8 @@ namespace DAnCE
                          ACE_TEXT("Received nil object reference from  startLaunch on node managers.\n")));
             throw Deployment::StartError();
           }
-        DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplication_Impl::startLaunch - ")
+        DANCE_DEBUG ((LM_TRACE, DLINFO
+                      ACE_TEXT("DomainApplication_Impl::startLaunch - ")
                       ACE_TEXT("Application startLaunch succeeded, received %u connections\n"),
                       conn->length ()));
 
@@ -109,7 +111,8 @@ namespace DAnCE
           }
       }
 
-    DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplication_Impl::startLaunch - ")
+    DANCE_DEBUG ((LM_DEBUG, DLINFO
+                  ACE_TEXT("DomainApplication_Impl::startLaunch - ")
                   ACE_TEXT("Received %u connections from applications\n"),
                   this->connections_.length ()));
   }
diff --git a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h
index 8faeedd5ee9..69dea848e0b 100644
--- a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h
+++ b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h
@@ -29,7 +29,6 @@ namespace DAnCE
   {
 
   /**
-   *
    * @class DomainApplication_Impl
    *
    * @brief This class implements the DomainApplication interface.
@@ -51,6 +50,8 @@ namespace DAnCE
                               Deployment::Connections& conn);
       ~DomainApplication_Impl();
 
+      void startLaunch (const Deployment::Properties & configProperty);
+
       /**
       * The second step in launching an application in the
       * domain-level.  If the start parameter is true, the application
@@ -71,7 +72,6 @@ namespace DAnCE
       Deployment::Connections connections_;
       TNam2Nm & nams_;
       Deployment::Application_var na_;
-      void startLaunch (const Deployment::Properties & configProperty);
     };
 } // DAnCE
 
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index a67a779d686..0c35d04ff72 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -118,18 +118,21 @@ DomainApplicationManager_Impl::destroyApplication (Deployment::Application_ptr a
     }
   catch (const Deployment::StopError &e)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ")
+      ACE_ERROR ((LM_ERROR, DLINFO
+                  ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ")
                   ACE_TEXT("Propagating a received StopError exception\n")));
       throw e;
     }
   catch (...)
     {
-      DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ")
+      DANCE_ERROR ((LM_ERROR, DLINFO
+                    ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ")
                     ACE_TEXT("Caught unknown exception.")));
       throw Deployment::StopError();
     }
 
-  ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ")
+  ACE_ERROR ((LM_ERROR, DLINFO
+              ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ")
               ACE_TEXT("Provided application reference unknown\n")));
   throw Deployment::StopError();
 }
@@ -144,7 +147,7 @@ DomainApplicationManager_Impl::getApplications ()
                     Deployment::Applications(),
                     CORBA::NO_MEMORY());
   running_app->length (this->running_app_.size());
-  unsigned int index = 0;
+  CORBA::ULong index = 0;
   for (size_t i = 0; i < this->running_app_.size(); ++i)
     {
       CORBA::Object_var ref = this->poa_->servant_to_reference (this->running_app_[i]);
@@ -172,7 +175,7 @@ DomainApplicationManager_Impl::getPlan ()
   return plan;
 }
 
-// This methhod is commented because it requred rework for processing connections
+// This methhod is commented because it required rework for processing connections
 // sequence together with correspondent DeploymentPlan
 void
 DomainApplicationManager_Impl::
@@ -275,12 +278,14 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl
 
       sub_plans.bind (node, tmp_plan);
 
-      DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+      DANCE_DEBUG ((LM_TRACE, DLINFO
+                    ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
                     ACE_TEXT("Created sub-plan for node %C with UUID %C\n"),
                     node.c_str (), child_uuid.c_str ()));
     }
 
-  DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+  DANCE_DEBUG ((LM_DEBUG, DLINFO
+                ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
                 ACE_TEXT("First phase produced %u child plans, proceeding to second\n")));
 
   // (1) Iterate over the <instance> field of the global DeploymentPlan
@@ -289,7 +294,8 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl
   //     plans one by one.
   for (CORBA::ULong i = 0; i < plan.instance.length (); ++i)
     {
-      DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+      DANCE_DEBUG ((LM_TRACE, DLINFO
+                    ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
                     ACE_TEXT("Processing instance : %C\n"), plan.instance[i].name.in()));
       // @@TODO Fill in the child deployment plan in the map.
       // If the component instance already exists in the child plan,
@@ -304,7 +310,8 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl
 
       if (0 != sub_plans.find (ACE_CString (my_instance.node.in()), child_plan))
         {
-          DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+          DANCE_ERROR ((LM_ERROR, DLINFO
+                        ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
                         ACE_TEXT("ERROR: Unable to find sub-plan for instance %C\n"),
                         my_instance.node.in ()));
         }
@@ -341,7 +348,7 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl
           child_plan.artifact.length (++index_art);
           child_plan.artifact[index_art-1] = plan.artifact[artifact_ref];
 
-          // Fill in the <artifactRef> field of the MonolithicDeploymentDescription
+          // Fill in the artifactRef field of the MonolithicDeploymentDescription
           ulong_seq[iter] = index_art - 1;
         }
 
@@ -362,16 +369,19 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl
       // duplicate <implementation> for the optimization.
       child_plan.instance[index_ins-1].implementationRef = index_imp - 1;
 
-      DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+      DANCE_DEBUG ((LM_TRACE, DLINFO
+                    ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
                     ACE_TEXT("Processing connections.\n")));
       // Copy connections
       for (CORBA::ULong j = 0; j < plan.connection.length(); ++j)
         {
-          DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+          DANCE_DEBUG ((LM_TRACE, DLINFO
+                        ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
                         ACE_TEXT("For connection : %C\n"), plan.connection[j].name.in()));
           for (CORBA::ULong k = 0; k < plan.connection[j].internalEndpoint.length(); ++k)
             {
-              DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+              DANCE_DEBUG ((LM_TRACE, DLINFO
+                            ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
                             ACE_TEXT("For endpoint : %C(%C)\n"),
                             plan.connection[j].internalEndpoint[k].portName.in(),
                             plan.connection[j].internalEndpoint[k].provider ? "provider" : "client"));
@@ -409,14 +419,13 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl
     }
 
   //Debug
-  DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+  DANCE_DEBUG ((LM_DEBUG, DLINFO
+                ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
                 ACE_TEXT("Original plan connection count : %u\n"), plan.connection.length()));
   CORBA::ULong cnt = 0;
   for (TNodePlans::iterator it = sub_plans.begin(); it != sub_plans.end(); ++it)
     {
       cnt += (*it).int_id_.connection.length();
-      //        DANCE_DEBUG((LM_DEBUG, "[%M] Dumping deployment plan #%C:\n", (*it).ext_id_.c_str()));
-      //        Deployment::DnC_Dump::dump((*it).int_id_);
     }
   DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
                 ACE_TEXT("Child plans connection count : %u\n"), cnt));
@@ -461,7 +470,8 @@ DomainApplicationManager_Impl::preparePlan()
 
           if (CORBA::is_nil (nam))
             {
-              DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ")
+              DANCE_ERROR ((LM_ERROR, DLINFO
+                            ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ")
                             ACE_TEXT("PreparePlan failed for node %C, returning a nill ")
                             ACE_TEXT("NodeApplicationManager pointer.\n"),
                             (*iter_plans).ext_id_.c_str()));
@@ -470,27 +480,31 @@ DomainApplicationManager_Impl::preparePlan()
           // We save NAM reference ptr in TNodes vector were it places to var variable
           this->sub_app_mgr_.bind (nam, nm);
 
-          DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ")
+          DANCE_DEBUG ((LM_INFO, DLINFO
+                        ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ")
                         ACE_TEXT("Sucessfully prepared node %C for deployment\n"),
                         (*iter_plans).ext_id_.c_str()));
         }
     }
   catch (Deployment::StartError &e)
     {
-      DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ")
+      DANCE_ERROR ((LM_ERROR, DLINFO
+                    ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ")
                     ACE_TEXT("Propagating StartError exception caught here\n")));
       throw e;
     }
   catch (CORBA::Exception &ex)
     {
-      DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ")
+      DANCE_ERROR ((LM_ERROR, DLINFO
+                    ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ")
                     ACE_TEXT("Caught a CORBA exception, propagating StartError: %C\n"),
                     ex._info ().c_str ()));
       throw ::Deployment::StartError ();
     }
   catch (...)
     {
-      DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ")
+      DANCE_ERROR ((LM_ERROR, DLINFO
+                    ACE_TEXT("DomainApplicationManager_Impl::preparePlan - ")
                     ACE_TEXT("Caught unknown exception.  Propagating StartError\n")));
       throw ::Deployment::StartError ();
     }
diff --git a/CIAO/DAnCE/MPC/config/dance_repositorymanagerbase.mpb b/CIAO/DAnCE/MPC/config/dance_repositorymanagerbase.mpb
index d434bf487c2..b9dc96c12c9 100644
--- a/CIAO/DAnCE/MPC/config/dance_repositorymanagerbase.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_repositorymanagerbase.mpb
@@ -4,5 +4,6 @@
 feature(jaws) {
   includes += $(ACE_ROOT)/apps
   libs += JAWS
+  after += JAWS
   macros += DANCE_RM_USES_JAWS
-}
\ No newline at end of file
+}
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 08836299010..4e1f3eb3364 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -76,9 +76,9 @@ namespace
     if (properties.find (name, any) == 0)
       {
         if (any >>= CORBA::Any::to_boolean(val))
-                  {
+          {
             return true;
-                  }
+          }
         else
           {
             DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<T> - ")
@@ -106,9 +106,9 @@ namespace
     if (properties.find (name, any) == 0)
       {
         if (any >>= CORBA::Any::to_string(val, 0))
-                  {
+          {
             return true;
-                }
+          }
         else
           {
             DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("NodeApplicion::<anonymous>::get_property_value<const char *> - ")
@@ -361,7 +361,7 @@ NodeApplication_Impl::init()
   DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::init - ")
                 ACE_TEXT("Spawning server activator\n")));
 
-  CIAO::Deployment::ComponentInstallation_Impl *tmp_ci;
+  CIAO::Deployment::ComponentInstallation_Impl *tmp_ci = 0;
 
   ACE_NEW_THROW_EX (tmp_ci,
                     CIAO::Deployment::ComponentInstallation_Impl (),
@@ -377,7 +377,7 @@ NodeApplication_Impl::init()
                        this->plan_.artifact[i].location[0]);
     }
 
-  CIAO::Deployment::CIAO_ServerActivator_i *tmp_act;
+  CIAO::Deployment::CIAO_ServerActivator_i *tmp_act = 0;
   ACE_NEW_THROW_EX (tmp_act,
                     CIAO::Deployment::CIAO_ServerActivator_i (spawn,
                                                               cs_path,
@@ -422,7 +422,7 @@ NodeApplication_Impl::configuration_complete_components ()
 {
   DANCE_TRACE( "NodeApplication_Impl::configuration_complete_components");
 
-  bool error (false);
+  bool error = false;
   Deployment::StartError exception;
 
   for (size_t k = 0; k < this->instances_.size (); ++k)
@@ -594,8 +594,10 @@ NodeApplication_Impl::install_home (Container &cont, Instance &inst)
 {
   DANCE_TRACE( "NodeApplication_Impl::install_home");
 
-  const ::Deployment::MonolithicDeploymentDescription &mdd = this->plan_.implementation[inst.mdd_idx];
-  const ::Deployment::InstanceDeploymentDescription &idd = this->plan_.instance[inst.idd_idx];
+  const ::Deployment::MonolithicDeploymentDescription &mdd =
+    this->plan_.implementation[inst.mdd_idx];
+  const ::Deployment::InstanceDeploymentDescription &idd =
+    this->plan_.instance[inst.idd_idx];
 
   DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ")
                 ACE_TEXT("Starting installation of home %C on node %C\n"),
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index f0587fb8d50..a4fbcd940c8 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -37,7 +37,7 @@ NodeApplicationManager_Impl::NodeApplicationManager_Impl (CORBA::ORB_ptr orb,
   while (!i.done ())
     {
       DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeApplicationManager_Impl::NodeApplicationManager_Impl - ")
-                    ACE_TEXT("Binding value for property %s\n"), i->key ().c_str ()));
+                    ACE_TEXT("Binding value for property %C\n"), i->key ().c_str ()));
       this->properties_.bind (i->key (), i->item ());
       i.advance ();
     }
@@ -51,7 +51,8 @@ NodeApplicationManager_Impl::~NodeApplicationManager_Impl()
     {
       if (this->application_ != 0)
         {
-          CORBA::Object_var app = this->poa_->servant_to_reference (this->application_);
+          CORBA::Object_var app =
+            this->poa_->servant_to_reference (this->application_);
           PortableServer::ObjectId_var id = this->poa_->reference_to_id (app);
           this->poa_->deactivate_object (id);
 
@@ -61,7 +62,8 @@ NodeApplicationManager_Impl::~NodeApplicationManager_Impl()
     }
   catch (...)
     {
-      DANCE_ERROR ((LM_WARNING, DLINFO ACE_TEXT("NodeApplicationManager_Impl::~NodeApplicationManager_Impl - ")
+      DANCE_ERROR ((LM_WARNING, DLINFO
+                    ACE_TEXT("NodeApplicationManager_Impl::~NodeApplicationManager_Impl - ")
                     ACE_TEXT("Caught exception in NodeApplicationManager destructor\n")));
     }
 }
@@ -121,8 +123,7 @@ NodeApplicationManager_Impl::destroyApplication (Deployment::Application_ptr app
 
     CORBA::Any val;
 
-    if (this->properties_.find (DAnCE::STANDALONE_NM,
-                                val) == 0)
+    if (this->properties_.find (DAnCE::STANDALONE_NM, val) == 0)
       {
         DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_Impl::destroyApplication - ")
                       ACE_TEXT("Found STANDALONE_NM property\n")));
@@ -174,8 +175,9 @@ NodeApplicationManager_Impl::register_plan(void)
   DANCE_TRACE("NodeApplicationManager_Impl::register_plan()");
 
 //  this->redirection_.registration_start (this->node_name_, this->plan_.UUID.in());
-  DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_Impl::register_plan - registering objects...\n")));
-  for (unsigned int i = 0; i < this->plan_.instance.length(); i++)
+  DANCE_DEBUG((LM_TRACE, DLINFO
+               ACE_TEXT("NodeApplicationManager_Impl::register_plan - registering objects...\n")));
+  for (CORBA::ULong i = 0; i < this->plan_.instance.length(); i++)
     {
 //      this->redirection_.registration (this->node_name_,
   //                                     this->plan_.UUID.in(),
@@ -184,9 +186,9 @@ NodeApplicationManager_Impl::register_plan(void)
     }
 
   DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_Impl::register_plan - registering endpoints...\n")));
-  for (unsigned int i = 0; i < this->plan_.connection.length(); i++)
+  for (CORBA::ULong i = 0; i < this->plan_.connection.length(); i++)
     {
-      for (unsigned int j = 0; j < this->plan_.connection[i].internalEndpoint.length(); j++)
+      for (CORBA::ULong j = 0; j < this->plan_.connection[i].internalEndpoint.length(); j++)
         {
           if (this->plan_.connection[i].internalEndpoint[j].provider)
             {
@@ -203,7 +205,8 @@ NodeApplicationManager_Impl::register_plan(void)
             }
         }
     }
-  DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeApplicationManager_Impl::register_plan - ")
+  DANCE_DEBUG ((LM_TRACE, DLINFO
+                ACE_TEXT("NodeApplicationManager_Impl::register_plan - ")
                 ACE_TEXT("Finishing registration\n")));
   //this->redirection_.registration_finish (this->node_name_, this->plan_.UUID.in());
 }
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index 3d92663aa41..22add49ee62 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -27,7 +27,8 @@ namespace DAnCE
 
   class NodeManager_Impl;
 
-  class NodeApplicationManager_Export NodeApplicationManager_Impl : public virtual POA_Deployment::NodeApplicationManager
+  class NodeApplicationManager_Export NodeApplicationManager_Impl :
+    public virtual POA_Deployment::NodeApplicationManager
     {
     public:
       NodeApplicationManager_Impl (CORBA::ORB_ptr orb,
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
index 8fbe32eb696..5498df66af3 100644
--- a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
@@ -62,8 +62,8 @@ namespace CIAO
       if (CORBA::is_nil (this->rm_.in ()))
         {
           ACE_ERROR ((LM_ERROR,
-            "(%P|%t) CIAO_PlanGenerator: nil Repository "
-            "Manager reference, narrow failed\n"));
+                      "(%P|%t) Plan_Generator_i: nil Repository "
+                      "Manager reference, narrow failed\n"));
           return false;
         }
 
@@ -78,7 +78,7 @@ namespace CIAO
       if (CORBA::is_nil (rm_.in ()))
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) CIAO_Repoman: nil Execution\n"));
+                      "(%P|%t) Plan_Generator_i: nil Execution\n"));
           return false;
         }
 
@@ -129,7 +129,7 @@ namespace CIAO
       if (CORBA::is_nil (rm_.in ()))
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) CIAO_Repoman: nil Execution\n"));
+                      "(%P|%t) Plan_Generator_i: nil Execution\n"));
           return false;
         }
 
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp
index 65feab0df60..c3aa5227538 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp
@@ -30,7 +30,7 @@ DAnCE_Plan_Launcher_Base_Module::create_object (CORBA::ORB_ptr orb,
     }
   catch (const Plan_Launcher_Base_Impl::Deployment_Failure& e)
     {
-      DANCE_ERROR ( (LM_ERROR, "[%M] PlanLauncher error : %s.\n", e.error_.c_str()));
+      DANCE_ERROR ( (LM_ERROR, "[%M] PlanLauncher error : %C.\n", e.error_.c_str()));
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
index 2ffbeae1ab0..0ace033d8d4 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
@@ -8,10 +8,10 @@ project (DAnCE_RepositoryManagerDaemon_IDL) : ciaoidldefaults {
   }
 }
 
-project (DAnCE_RepositoryManager) : dance_deployment_svnt, ciao_config_handlers, ccm_stub, dance_repositorymanagerbase, naming, iortable, utils, minizip, zlib, dance_lib {
+project (DAnCE_RepositoryManager) : dance_repositorymanager_skel, ciao_config_handlers, ccm_stub, dance_repositorymanagerbase, naming, iortable, utils, minizip, zlib, dance_lib {
   requires += zlib
-  libs += Package_Config_Handlers JAWS
-  after += DAnCE_RepositoryManagerDaemon_IDL JAWS
+  libs += Package_Config_Handlers
+  after += DAnCE_RepositoryManagerDaemon_IDL
   dynamicflags = DANCE_REPOSITORYMANAGER_MODULE_BUILD_DLL
   IDL_Files {
   }
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
index 7b7ccb239db..edde190b4ff 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
@@ -28,7 +28,7 @@ namespace MyImpl
    * RateGen executor implementation class.
    */
   class NAVDISPLAY_EXEC_Export NavDisplayGUI_exec_impl
-    : public virtual CIDL_NavDisplay_Impl::NavDisplay_exec,
+    : public virtual CIAO_HUDisplay_NavDisplay_Impl::NavDisplay_exec,
       public virtual ::CORBA::LocalObject
   {
   public: