merging fixes in from head.

21 files changed, 67 insertions, 56 deletions

diff --git a/modules/CIAO/DAnCE/DomainApplication/DomainApplication.mpc b/modules/CIAO/DAnCE/DomainApplication/DomainApplication.mpc
index 5db60b01235..902d494ccba 100644
--- a/modules/CIAO/DAnCE/DomainApplication/DomainApplication.mpc
+++ b/modules/CIAO/DAnCE/DomainApplication/DomainApplication.mpc
@@ -2,7 +2,8 @@
 // $Id$
 
 
-project: dance_lib, ciao_output, dance_domainapplication_skel, dance_logger {
+project: dance_lib, ciao_output, dance_domainapplication_skel, \
+    dance_nodeapplication_stub,  dance_nodeapplicationmanager_stub, dance_logger {
   sharedname   = DAnCE_DomainApplication
   dynamicflags = DOMAIN_APPLICATION_BUILD_DLL
 
diff --git a/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index cd56bd9754d..a67a779d686 100644
--- a/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/modules/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -440,7 +440,7 @@ DomainApplicationManager_Impl::preparePlan()
            ++iter_plans)
         {
           // Finding correspondent NodeManager
-          Deployment::NodeManager_var nm = this->nodes_.locate_node ((*iter_plans).ext_id_.c_str ());;
+          Deployment::NodeManager_var nm = this->nodes_.locate_node ((const ACE_TCHAR*)(*iter_plans).ext_id_.c_str ());;
           // If NodeManager not found throw StartError exception
           if (CORBA::is_nil (nm.in ()))
             {
diff --git a/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp b/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
index 0608609168d..387d217c431 100644
--- a/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
+++ b/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
@@ -16,11 +16,11 @@ namespace DAnCE
   ::Deployment::NodeManager_ptr
   Node_Locator::locate_node (const ACE_TCHAR *name)
   {
-    ACE_TString ior;
+    ACE_CString ior;
 
-    if (this->nodes_.find (name, ior) == 0)
+    if (this->nodes_.find ((char*)name, ior) == 0)
       {
-        return this->resolve_ior (name, ior.c_str ());
+        return this->resolve_ior (name, (const ACE_TCHAR *)ior.c_str ());
       }
     else
       {
@@ -116,7 +116,7 @@ namespace DAnCE
   Node_Locator::store_ior (const ACE_TCHAR *name, const ACE_TCHAR *ior)
   {
     DANCE_TRACE ("Node_Locator::store_ior");
-    this->nodes_.bind (name, ior);
+    this->nodes_.bind ((char *)name, (char *)ior);
   }
 
   ::Deployment::NodeManager_ptr
@@ -137,7 +137,7 @@ namespace DAnCE
         CosNaming::Name name;
         name.length (1);
 
-        name[0].id = nodename;
+        name[0].id = (char *)nodename;
         name[0].kind = "NodeManager";
 
         CORBA::Object_var obj = this->nc_->resolve (name);
diff --git a/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h b/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h
index f3255d0c230..43551a9c761 100644
--- a/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h
+++ b/modules/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h
@@ -41,8 +41,8 @@ namespace DAnCE
 
     ::Deployment::NodeManager_ptr ns_lookup (const ACE_TCHAR *name);
 
-    typedef ACE_Map_Manager<ACE_TString,
-                            ACE_TString,
+    typedef ACE_Map_Manager<ACE_CString,
+                            ACE_CString,
                             ACE_Null_Mutex> NODEMAP;
 
     NODEMAP nodes_;
diff --git a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index 0f2b3352b13..ef8a26027cf 100644
--- a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -11,7 +11,7 @@ project(ExecutionManager_Module): dance_lib, taolib, iortable, ciao_output, util
   }
 }
 
-project(Execution_Manager_Exec) : dance_exe, dance_domainapplicationmanager_stub, naming_serv, dance_executionmanager_stub, utils, avoids_minimum_corba  {
+project(Execution_Manager_Exec) : dance_exe, dance_domainapplicationmanager_stub, naming_serv, dance_executionmanager_stub, utils, dance_logger, avoids_minimum_corba  {
   exename = dance_execution_manager
   after += ExecutionManager_Module
   libs += DAnCE_ExecutionManager
diff --git a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
index 442532cad87..2b8fb58d878 100644
--- a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
+++ b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
@@ -100,7 +100,7 @@ DAnCE_ExecutionManager_Module::parse_args (int argc, ACE_TCHAR *argv[])
         case 'n':
           DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::parse_args - ")
                         ACE_TEXT("--node-mgr option was parsed out for EM\n")));
-          this->options_.node_managers_.push_back (get_opts.opt_arg ());
+          this->options_.node_managers_.push_back ((const char *)get_opts.opt_arg ());
           break;
 
         case 'p':
@@ -352,7 +352,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
             }
           */
           DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Placing node \"%C\" to EM's map.\n"), node_name.c_str()));
-          this->em_impl_->add_node_manager (node_name.c_str(), nm_ior.c_str ());
+          this->em_impl_->add_node_manager ((const ACE_TCHAR *)node_name.c_str(), (const ACE_TCHAR *)nm_ior.c_str ());
         }
 
       if (this->options_.node_map_ != 0)
diff --git a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
index 0f4488fdfea..0ecd5c57fd2 100644
--- a/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
+++ b/modules/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
@@ -54,11 +54,11 @@ class DAnCE_ExecutionManager_Module_Export DAnCE_ExecutionManager_Module
         bool rebind_plan_ns_;
         const ACE_TCHAR* rebind_plan_ns_ior_;
         bool port_indirection_;
-        ACE_Vector<ACE_TString> node_managers_;
+        ACE_Vector<ACE_CString> node_managers_;
         bool ignore_failure_;
-        const char *node_map_;
-        const char *domain_nc_;
-        
+        const ACE_TCHAR *node_map_;
+        const ACE_TCHAR *domain_nc_;
+
         SOptions()
             : exec_mgr_file_ (0),
               process_ns_ (false),
diff --git a/modules/CIAO/DAnCE/MPC/config/dance_domainapplication.mpb b/modules/CIAO/DAnCE/MPC/config/dance_domainapplication.mpb
index 91f19002a2b..44fa433ef79 100644
--- a/modules/CIAO/DAnCE/MPC/config/dance_domainapplication.mpb
+++ b/modules/CIAO/DAnCE/MPC/config/dance_domainapplication.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_deployment_svnt, dance_logger, dance_nodeapplication_stub, dance_nodemanager_stub, dance_nodemanager_stub {
+project : dance, dance_domainapplication_skel, dance_logger, dance_nodeapplication_stub, dance_nodemanager_stub, dance_nodemanager_stub {
   after += DomainApplication
   libs  += DAnCE_DomainApplication
 }
diff --git a/modules/CIAO/DAnCE/MPC/config/dance_nodeapplication.mpb b/modules/CIAO/DAnCE/MPC/config/dance_nodeapplication.mpb
index f8961af0fef..c955ef31710 100644
--- a/modules/CIAO/DAnCE/MPC/config/dance_nodeapplication.mpb
+++ b/modules/CIAO/DAnCE/MPC/config/dance_nodeapplication.mpb
@@ -1,8 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_deployment_svnt, dance_logger, \
+project : dance, dance_nodeapplication_skel, dance_logger, \
   ciao_client, ciao_cs_client, ciao_componentserver_stub, dynamicinterface, iortable, naming {
   after += NodeApplication
-  libs  += DAnCE_NodeApplication CIAO_Client
+  libs  += DAnCE_NodeApplication
 }
diff --git a/modules/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager.mpb b/modules/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager.mpb
index 0889d01a5a7..25bbb5148d0 100644
--- a/modules/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager.mpb
+++ b/modules/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_nodeapplication {
+project : dance, dance_nodeapplication, dance_nodeapplicationmanager_skel {
   after += NodeApplicationManager
   libs  += DAnCE_NodeApplicationManager
 }
diff --git a/modules/CIAO/DAnCE/MPC/config/dance_nodemanager.mpb b/modules/CIAO/DAnCE/MPC/config/dance_nodemanager.mpb
index 4678f510dc3..aab928298ba 100644
--- a/modules/CIAO/DAnCE/MPC/config/dance_nodemanager.mpb
+++ b/modules/CIAO/DAnCE/MPC/config/dance_nodemanager.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 // @todo, use nodeapplicationmanager_stb
-project : dance, dance_nodeapplicationmanager, dance_deployment_svnt, naming_serv {
+project : dance, dance_nodeapplicationmanager, dance_nodemanager_skel, naming_serv {
   after += Node_Manager_Module
   libs  += DAnCE_NodeManager
 }
diff --git a/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp b/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
index 9b4d8c92c18..04857d1df2e 100644
--- a/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
+++ b/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
@@ -26,7 +26,7 @@ namespace DAnCE
   }
 
   bool
-  Name_Utilities::bind_object (const char *name,
+  Name_Utilities::bind_object (const ACE_TCHAR *name,
                                CORBA::Object_ptr obj,
                                CosNaming::NamingContext_ptr ctx)
   {
@@ -121,7 +121,7 @@ namespace DAnCE
   }
 
   bool
-  Name_Utilities::unbind_object (const char *name,
+  Name_Utilities::unbind_object (const ACE_TCHAR *name,
                                  CosNaming::NamingContext_ptr ctx)
   {
     DANCE_TRACE ("Name_Utilities::unbind_object");
@@ -151,14 +151,14 @@ namespace DAnCE
   }
 
   void
-  Name_Utilities::build_name (const char *name,
+  Name_Utilities::build_name (const ACE_TCHAR *name,
                               CosNaming::Name &nm)
   {
     DANCE_TRACE ("Name_Utilities::build_name");
 
     /*ACE_Auto_Basic_Array_Ptr<ACE_TCHAR>*/  char *safe_array (new char[ACE_OS::strlen (name) + 1]);
 
-    ACE_Tokenizer_T<char> parser (ACE_OS::strcpy (safe_array/*.get ()*/, name));
+    ACE_Tokenizer_T<char> parser (ACE_OS::strcpy (safe_array/*.get ()*/, (const char *)name));
     parser.delimiter ('/');
 
     char *next (0);
diff --git a/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.h b/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.h
index 20a7efd5c45..98cab77574f 100644
--- a/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.h
+++ b/modules/CIAO/DAnCE/NodeApplication/Name_Utilities.h
@@ -21,19 +21,19 @@ namespace DAnCE
     
     /// Binds object to provided name, which may be formatted with / to indicate
     /// naming contexts, e.g. A/B/C. 
-    static bool bind_object (const char *name, 
+    static bool bind_object (const ACE_TCHAR *name,
                              CORBA::Object_ptr obj, 
                              CosNaming::NamingContext_ptr);
     
     /// Will unbind the provided name.  
-    static bool unbind_object (const char *name, 
+    static bool unbind_object (const ACE_TCHAR *name,
                                CosNaming::NamingContext_ptr);
     
   private:
     static void bind_context (CosNaming::Name &nm,
                               CosNaming::NamingContext_ptr);
     
-    static void build_name (const char *nm,
+    static void build_name (const ACE_TCHAR *nm,
                             CosNaming::Name &);
     
   };
diff --git a/modules/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/modules/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 14685c56e23..08836299010 100644
--- a/modules/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/modules/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -1019,7 +1019,7 @@ NodeApplication_Impl::store_instance_ior (Instance &inst)
 {
   DANCE_TRACE ("NodeApplication_impl::store_instance_ior");
 
-  const char *name = 0;
+  const ACE_TCHAR *name = 0;
 
   if (get_property_value (DAnCE::REGISTER_NAMING,
                           this->plan_.instance[inst.idd_idx].configProperty,
diff --git a/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index ab71e07e0c2..e94b2ca41da 100644
--- a/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/modules/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -1,7 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project: dance_lib, naming, dance_nodeapplicationmanager_skel, dynamicinterface, ccm_componentserver_svnt, ciao_cs_client {
+project: dance_lib, naming, dance_nodeapplicationmanager_skel, \
+        dynamicinterface, ccm_componentserver_svnt, ciao_cs_client, \
+        dance_nodeapplication {
   sharedname   = DAnCE_NodeApplicationManager
   dynamicflags = NODEAPPLICATIONMANAGER_BUILD_DLL
 
diff --git a/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index 62c8f4d506e..58b4ded17a6 100644
--- a/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/modules/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -407,7 +407,7 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb,
           else if (this->options_.process_ns_)
             {
               const int argc_ns = 1;
-              char* argv_ns[argc_ns];
+              ACE_TCHAR* argv_ns[argc_ns];
               argv_ns[0] = argv[0];
               naming_obj = orb->resolve_initial_references ("NameService");
               if (0 != this->options_.process_ns_file_)
@@ -467,7 +467,7 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb,
                     this->options_.node_managers_[0].c_str()));
 
       // Parsing Node name and node manager ior file name
-      ACE_CString node_name = this->options_.node_managers_[0].c_str ();
+      ACE_CString node_name = (const char *)this->options_.node_managers_[0].c_str ();
       ACE_CString node_file;
       size_t npos = node_name.find ('=');
       if (ACE_CString::npos != npos)
@@ -534,7 +534,7 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb,
         {
           DANCE_DEBUG ((LM_TRACE,  DLINFO "DAnCE_NodeManager_Module::create_object - "
                         "Writing node IOR %C to file %C.\n", node_file.c_str (), ior.in ()));
-          if (!DAnCE::Node_Manager::write_IOR (node_file.c_str (), ior.in ()))
+          if (!DAnCE::Node_Manager::write_IOR ((const ACE_TCHAR *)node_file.c_str (), ior.in ()))
             DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_NodeManager_Module::create_object - "
                           "Error: Unable to write IOR to file %C\n",
                           node_file.c_str ()));
@@ -618,7 +618,7 @@ DAnCE_NodeManager_Module::create_nm_properties (DAnCE::PROPERTY_MAP &props)
   }
   {
     CORBA::Any val;
-    val <<= CORBA::Any::from_string (CORBA::string_dup (this->options_.cs_path_),0);
+    val <<= CORBA::Any::from_string (CORBA::string_dup ((const char *)this->options_.cs_path_),0);
     props.bind (CIAO::Deployment::SERVER_EXECUTABLE, val);
   }
   {
@@ -628,19 +628,19 @@ DAnCE_NodeManager_Module::create_nm_properties (DAnCE::PROPERTY_MAP &props)
   }
   {
     CORBA::Any val;
-    val <<= CORBA::Any::from_string (CORBA::string_dup (this->options_.server_args_),0);
+    val <<= CORBA::Any::from_string (CORBA::string_dup ((const char *)this->options_.server_args_),0);
     props.bind (CIAO::Deployment::SERVER_ARGUMENTS, val);
   }
   if (this->options_.instance_nc_)
     {
       CORBA::Any val;
-      val <<= CORBA::Any::from_string (CORBA::string_dup (this->options_.instance_nc_), 0);
+      val <<= CORBA::Any::from_string (CORBA::string_dup ((const char *)this->options_.instance_nc_), 0);
       props.bind (DAnCE::INSTANCE_NC, val);
     }
   if (this->options_.domain_nc_)
     {
       CORBA::Any val;
-      val <<= CORBA::Any::from_string (CORBA::string_dup (this->options_.domain_nc_), 0);
+      val <<= CORBA::Any::from_string (CORBA::string_dup ((const char *)this->options_.domain_nc_), 0);
       props.bind (DAnCE::DOMAIN_NC, val);
     }
 }
diff --git a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
index 453734e08aa..9047d12e88b 100644
--- a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
+++ b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
@@ -36,7 +36,7 @@ project(Plan_Launcher) : dance_lib, taolib, ciao_output, xerces, naming, dance_d
   }
 }
 
-project(Plan_Launcher_Exec) : dance_exe, xerces, naming, dance_executionmanager_stub, ciao_config_handlers {
+project(Plan_Launcher_Exec) : dance_exe, dance_logger, xerces, naming, dance_executionmanager_stub, ciao_config_handlers {
   after += Plan_Launcher
   libs += DAnCE_Plan_Launcher DAnCE_Plan_Launcher_Base
   exename = dance_plan_launcher
diff --git a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
index 9ce1d3813ae..cd76a9b2022 100644
--- a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
+++ b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
@@ -514,13 +514,13 @@ void
 Plan_Launcher_Base_Impl::stop_plan()
 {
   bool stopped = false;
-  if (!is_empty (this->plan_uuid_))
+  if (ACE_OS::strlen (this->plan_uuid_) > 0)
     {
       stopped = true;
       DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ")
-                   ACE_TEXT("Stopping plan \"%C\"\n"), this->plan_uuid_.c_str()));
+                   ACE_TEXT("Stopping plan \"%C\"\n"), this->plan_uuid_));
 
-      if (!this->teardown_plan(this->plan_uuid_.c_str()))
+      if (!this->teardown_plan((const char *)this->plan_uuid_))
         {
           DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ")
                         ACE_TEXT("tear down assembly failed: unknown plan uuid.\n")));
@@ -761,7 +761,7 @@ Plan_Launcher_Base_Impl::check_mode_consistentness()
 ACE_CString
 Plan_Launcher_Base_Impl::expand_env_vars (const ACE_TCHAR * s)
   {
-    ACE_CString src = s;
+    ACE_CString src((const char *)s);
     ACE_CString res;
     size_t pos_done = 0;
     while (pos_done < (size_t) src.length())
@@ -799,7 +799,7 @@ Plan_Launcher_Base_Impl::expand_env_vars (const ACE_TCHAR * s)
 
             if (pos_end - pos_start > 1)
               {
-                ACE_Env_Value<const char*> val (src.substring (pos_start + 1, pos_end - pos_start - 1).c_str(), 0);
+                ACE_Env_Value<const ACE_TCHAR*> val ((ACE_TCHAR *)src.substring (pos_start + 1, pos_end - pos_start - 1).c_str(), 0);
                 res += val;
                 pos_done = pos_end;
               }
diff --git a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
index f960fc27d67..bba73a979bd 100644
--- a/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
+++ b/modules/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
@@ -81,7 +81,7 @@ public:
   {
     return 0 == s.length();
   }
-  ;
+
   void write_dam_ior(::Deployment::DomainApplicationManager_ptr dam);
 
   void create_external_connections(const ::Deployment::DeploymentPlan &plan,
@@ -97,7 +97,7 @@ public:
   ::DAnCE::ExecutionManagerDaemon_var em_;
 
   ACE_Vector<ACE_CString> cdr_plan_urls_;
-  ACE_CString plan_uuid_;
+  ACE_TCHAR* plan_uuid_;
   ACE_CString em_ior_;
   ACE_CString dam_ior_;
   ACE_Vector<ACE_CString> xml_plan_urls_;
diff --git a/modules/CIAO/DAnCE/TargetManager/TargetManager.mpc b/modules/CIAO/DAnCE/TargetManager/TargetManager.mpc
index 2fe4218c3ca..379d4a966b7 100644
--- a/modules/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/modules/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -14,7 +14,7 @@ project (DAnCE_TargetManagerDaemon_IDL) : ciaoidldefaults {
   }
 }
 
-project(DAnCE_TargetManagerDaemon_stub) : dance_lib, dance_deployment_stub {
+project(DAnCE_TargetManagerDaemon_stub) : dance_lib, dance_targetmanager_stub {
   sharedname = DAnCE_TargetManagerDaemon_stub
   dynamicflags = TARGETMANAGERDAEMON_STUB_BUILD_DLL
   after += DAnCE_TargetManagerDaemon_IDL
@@ -43,7 +43,8 @@ project(DAnCE_TargetManager_Impl) : dance_lib, ciao_config_handlers, naming, ior
   }
 }
 
-project(DAnCE_TargetManagerDaemon_svnt) : dance_lib, dance_deployment_svnt, ciao_config_handlers {
+project(DAnCE_TargetManagerDaemon_svnt) : dance_lib, dance_deployment_svnt, \
+    dance_targetmanager_stub, dance_targetmanager_skel, ciao_config_handlers {
   sharedname  = DAnCE_TargetManagerDaemon_svnt
 
   libs += DAnCE_TargetManagerDaemon_stub
diff --git a/modules/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp b/modules/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp
index 12f9f66302e..fa44d6b8b2f 100644
--- a/modules/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp
+++ b/modules/CIAO/DAnCE/tests/RedirectionServiceTest/srv_main.cpp
@@ -21,11 +21,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
       {
         argvm[i] = argv[i];
       }
-    char buf1[32];
-    ACE_OS::sprintf (buf1, "-ORBListenEndpoints");
+    ACE_TCHAR buf1[32];
+    ACE_OS::sprintf (buf1, ACE_TEXT("-ORBListenEndpoints"));
     argvm[argcm-2] = buf1;
-    char buf2[32];
-    ACE_OS::sprintf (buf2, "iiop://:12345");
+    ACE_TCHAR buf2[32];
+    ACE_OS::sprintf (buf2, ACE_TEXT("iiop://:12345"));
     argvm[argcm-1] = buf2;
     argvm[argcm] = 0;
 
@@ -41,20 +41,27 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 
     PortableServer::ObjectId_var id = root_poa->activate_object (&servant);
 
-    Dummy_var dummy_obj = Dummy::_narrow (root_poa->id_to_reference (id));//servant._this();
+    Dummy_var dummy_obj = Dummy::_narrow (root_poa->id_to_reference (id));
 
     TAO_Naming_Loader loader;
 
     CORBA::Object_var obj_tmp = loader.create_object (orb.in(), argcm, argvm);
-    CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService");
-    CosNaming::NamingContext_var naming = CosNaming::NamingContext::_narrow (naming_obj.in());
+    CORBA::Object_var naming_obj =
+      orb->resolve_initial_references ("NameService");
+    CosNaming::NamingContext_var naming =
+      CosNaming::NamingContext::_narrow (naming_obj.in());
 
-    DAnCE::RedirectionService redirection (orb.in(), root_poa.in(), naming.in(), CosNaming::NamingContext::_nil(), true, true);
+    DAnCE::RedirectionService redirection (orb.in(),
+                                           root_poa.in(),
+                                           naming.in(),
+                                           CosNaming::NamingContext::_nil(),
+                                           true,
+                                           true);
 
     redirection.registration_start (node_name, app_name);
     redirection.registration (node_name, app_name, inst_name, port_name, dummy_obj.in());
     DANCE_DEBUG((LM_DEBUG, "[%M] Registration for port have finished.\n\n"));
-    redirection.registration (node_name, app_name, inst_name, /*CORBA::Object::_nil()*/dummy_obj.in());
+    redirection.registration (node_name, app_name, inst_name, dummy_obj.in());
     DANCE_DEBUG((LM_DEBUG, "[%M] Registration for component have finished.\n\n"));
     redirection.registration_finish (node_name, app_name);
     orb->run();