Tue Sep 8 08:38:10 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 73 insertions, 74 deletions

diff --git a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
index 1acd3d8c4b9..6266b211598 100644
--- a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
+++ b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/Log_Msg.h"
+#include "DAnCE/Logger/Log_Macros.h"
 #include "DAnCE/Deployment/Deployment_DataC.h"
 #include "PC_Updater.h"
 #include "PC_Updater_T.h"
@@ -200,7 +200,7 @@ void PC_Updater::clear_list ()
       iter++;
     }
 
-    ACE_ERROR ((LM_ERROR,
+    DANCE_ERROR ((LM_ERROR,
                "[PC_Updater::update] Unable to update: %s!\n",
                location));
 
diff --git a/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp b/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
index cd4b92669d0..553eac22893 100644
--- a/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_unistd.h"        //for close
 #include "ace/OS_NS_sys_stat.h"      //for filesize and mkdir
 #include "ace/OS_NS_string.h"
-
+#include "DAnCE/Logger/Log_Macros.h"
 
 void
 RM_Helper::pc_to_cdr (const Deployment::PackageConfiguration& pc, TAO_OutputCDR& cdr)
@@ -64,7 +64,7 @@ RM_Helper::copy_from_disk_to_disk (const char* from_path, const char* to_path)
   // Open the files
   ACE_HANDLE from_handle = ACE_OS::open (from_path, O_RDONLY);
   if (from_handle == ACE_INVALID_HANDLE)
-      ACE_ERROR_RETURN ((LM_ERROR,
+      DANCE_ERROR_RETURN ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("[RM::copy_from_disk_to_disk] file open error")),
                           0);
@@ -75,7 +75,7 @@ RM_Helper::copy_from_disk_to_disk (const char* from_path, const char* to_path)
 
   ACE_HANDLE to_handle = ACE_OS::open (to_path, O_CREAT | O_TRUNC | O_WRONLY);
   if (to_handle == ACE_INVALID_HANDLE)
-      ACE_ERROR_RETURN ((LM_ERROR,
+      DANCE_ERROR_RETURN ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("[RM::copy_from_disk_to_disk] file creation error")),
                           0);
@@ -100,7 +100,7 @@ RM_Helper::copy_from_disk_to_disk (const char* from_path, const char* to_path)
     mb = new ACE_Message_Block (length);
 
     if (ACE_OS::read_n (from_handle, mb->wr_ptr (), length) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        DANCE_ERROR_RETURN ((LM_ERROR,
                             ACE_TEXT ("%p\n"),
                             ACE_TEXT ("[RM::copy_from_disk_to_disk] file read error")),
                             0);
@@ -113,7 +113,7 @@ RM_Helper::copy_from_disk_to_disk (const char* from_path, const char* to_path)
       if (ACE_OS::write_n (to_handle, curr->rd_ptr (), curr->length ()) == -1)
       {
         mb->release ();
-        ACE_ERROR_RETURN ((LM_ERROR,
+        DANCE_ERROR_RETURN ((LM_ERROR,
                             ACE_TEXT ("%p\n"),
                             ACE_TEXT ("[RM::copy_from_disk_to_disk] file write error")),
                             0);
@@ -150,7 +150,7 @@ bool RM_Helper::write_to_disk (
   // Open a file handle to the local filesystem
   ACE_HANDLE handle = ACE_OS::open (full_path, O_CREAT | O_TRUNC | O_WRONLY);
   if (handle == ACE_INVALID_HANDLE)
-      ACE_ERROR_RETURN ((LM_ERROR,
+      DANCE_ERROR_RETURN ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("[RM::write_to_disk] file creation error")),
                           false);
@@ -158,7 +158,7 @@ bool RM_Helper::write_to_disk (
   // Write the data to the file
   for (ACE_Message_Block * curr = &mb; curr != 0; curr = curr->cont ())
     if (ACE_OS::write_n (handle, curr->rd_ptr(), curr->length()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        DANCE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("write error")),
                           false);
@@ -191,7 +191,7 @@ bool RM_Helper::write_pc_to_disk (
   // Open a file handle to the local filesystem
   ACE_HANDLE const handle = ACE_OS::open (full_path, O_CREAT | O_TRUNC | O_WRONLY);
   if (handle == ACE_INVALID_HANDLE)
-      ACE_ERROR_RETURN ((LM_ERROR,
+      DANCE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%p\n"),
                          ACE_TEXT ("[RM::write_to_disk] file creation error")),
                          false);
@@ -199,7 +199,7 @@ bool RM_Helper::write_pc_to_disk (
   // write the data to the file
   for (ACE_Message_Block * curr = &mb; curr != 0; curr = curr->cont ())
     if (ACE_OS::write_n (handle, curr->rd_ptr(), curr->length()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        DANCE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                            ACE_TEXT ("write error")),
                           0);
@@ -225,7 +225,7 @@ RM_Helper::read_pc_from_disk (
   // Open the file
   ACE_HANDLE const handle = ACE_OS::open (full_path, O_RDONLY);
   if (handle == ACE_INVALID_HANDLE)
-      ACE_ERROR_RETURN ((LM_ERROR,
+      DANCE_ERROR_RETURN ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("[RM::read_mb_from_disk] file open error")),
                           0);
@@ -240,7 +240,7 @@ RM_Helper::read_pc_from_disk (
   if (check != file_info.st_size)
   {
     length = 0;
-    ACE_ERROR_RETURN ((LM_ERROR,
+    DANCE_ERROR_RETURN ((LM_ERROR,
                           ACE_TEXT ("%p\n"),
                           ACE_TEXT ("[RM::read_mb_from_disk] file length error")),
                           0);
@@ -251,7 +251,7 @@ RM_Helper::read_pc_from_disk (
   ACE_NEW_RETURN (mb, ACE_Message_Block (length + 1), 0);
 
   if (ACE_OS::read_n (handle, mb->wr_ptr (), length) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        DANCE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("%p\n"),
                ACE_TEXT ("[RM::read_mb_from_disk] file read error")),
                            0);
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
index 3d8f07fa153..3b172b150b0 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
@@ -186,13 +186,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     Worker worker (orb.in ());
     if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
                          CIAO::RepositoryManager::nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        DANCE_ERROR_RETURN ((LM_ERROR,
                            "Cannot activate worker threads\n"),
                            1);
 
     worker.thr_mgr ()->wait ();
 
-    ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+    DANCE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
     // done
     return 0;
@@ -238,7 +238,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             CIAO::RepositoryManager::nthreads = ACE_OS::atoi (get_opts.opt_arg ());
             break;
           case '?':  // display help for use of the server.
-            ACE_DEBUG ((LM_INFO,
+            DANCE_DEBUG ((LM_INFO,
                         "usage:  %s\n"
                         "-o <using ior file>\n"
                         "-v <name of naming service>\n"
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index 96dead11bb0..5a15c0f2d85 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -140,7 +140,7 @@ namespace DAnCE
         ::Deployment::PackageConfiguration_var pc = this->findPackageByName (element.ext_id_.c_str ());
 
         if(!this->add_type (pc, element.ext_id_.c_str ()))
-          ACE_ERROR ((LM_ERROR, "Failed to add the type\n"));
+          DANCE_ERROR ((LM_ERROR, "Failed to add the type\n"));
       }
     
     CIAO::Config_Handlers::XML_Helper::_path_resolver.add_path (ACE_TEXT ("CIAO_ROOT"),
@@ -354,7 +354,7 @@ namespace DAnCE
     //insert the package into the database
     if (this->names_.bind (ACE_CString (installationName), path) == -1)
       {
-        ACE_ERROR ((LM_ERROR,
+        DANCE_ERROR ((LM_ERROR,
                     "[RM] could not bind %s.\n",
                     installationName));
 
@@ -372,7 +372,7 @@ namespace DAnCE
     //ALSO NEED THE UUID here
     if (this->uuids_.bind (ACE_CString (pc->UUID), path) == -1)
       {
-        ACE_ERROR ((LM_ERROR,
+        DANCE_ERROR ((LM_ERROR,
                     "[RM] could not bind %s.\n",
                     ACE_CString (pc->UUID).c_str ()));
 
@@ -392,13 +392,13 @@ namespace DAnCE
 
     //now add the type interface
     if(!this->add_type (pc, installationName))
-      ACE_ERROR ((LM_ERROR, "Failed to add the type\n"));
+      DANCE_ERROR ((LM_ERROR, "Failed to add the type\n"));
 
     this->dump ();
 
     this->save ();
 
-    ACE_DEBUG ((LM_INFO,
+    DANCE_DEBUG ((LM_INFO,
                 "Installed PackageConfiguration \n\tname: %s \n\tuuid: %s\n",
                 installationName, ACE_CString (pc->UUID).c_str ()));
   }
@@ -490,7 +490,7 @@ namespace DAnCE
 
     if (!updater.update (pc))
       {
-        ACE_ERROR ((LM_ERROR, "[RM] problem updating the PackageConfiguration!\n"));
+        DANCE_ERROR ((LM_ERROR, "[RM] problem updating the PackageConfiguration!\n"));
         //clean the extracted files
         remove_extracted_package (path.c_str ());
         //remove the package
@@ -506,7 +506,7 @@ namespace DAnCE
     // Insert the name of the package.
     if (this->names_.bind (ACE_CString (installationName), path) == -1)
       {
-        ACE_ERROR ((LM_ERROR,
+        DANCE_ERROR ((LM_ERROR,
                     "[RM] could not bind %s.\n",
                     installationName));
 
@@ -524,7 +524,7 @@ namespace DAnCE
     // Insert the UUID of the package.
     if (this->uuids_.bind (ACE_CString (pc.UUID), path) == -1)
       {
-        ACE_ERROR ((LM_ERROR,
+        DANCE_ERROR ((LM_ERROR,
                     "[RM] could not bind %s.\n",
                     ACE_CString (pc.UUID).c_str ()));
 
@@ -545,13 +545,13 @@ namespace DAnCE
     //now add the type interface
     //TODO: CHECK if successful
     if(!this->add_type (pc, installationName))
-      ACE_ERROR ((LM_ERROR, "Failed to add the type\n"));
+      DANCE_ERROR ((LM_ERROR, "Failed to add the type\n"));
 
     this->dump ();
 
     this->save ();
 
-    ACE_DEBUG ((LM_INFO,
+    DANCE_DEBUG ((LM_INFO,
                 "Created PackageConfiguration \n  directory: %s \n  name: %s \n  uuid: %s\n",
                 path.c_str (), installationName, ACE_CString (pc.UUID).c_str ()));
   }
@@ -587,7 +587,7 @@ namespace DAnCE
     if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
       throw CORBA::INTERNAL ();
 
-    ACE_DEBUG ((LM_INFO, "Successfully looked up \'%s\'.\n", name));
+    DANCE_DEBUG ((LM_INFO, "Successfully looked up \'%s\'.\n", name));
 
     return pc._retn ();
   }
@@ -623,7 +623,7 @@ namespace DAnCE
     if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
       throw CORBA::INTERNAL ();
 
-    ACE_DEBUG ((LM_INFO, "Successfully looked up %s.\n", UUID));
+    DANCE_DEBUG ((LM_INFO, "Successfully looked up %s.\n", UUID));
 
     return pc._retn ();
   }
@@ -710,7 +710,7 @@ namespace DAnCE
         seq[index] = CORBA::string_dup (element.ext_id_.c_str ());
       }
 
-    ACE_DEBUG ((LM_INFO, "The number of packages %d\n", seq->length ()));
+    DANCE_DEBUG ((LM_INFO, "The number of packages %d\n", seq->length ()));
 
     return seq._retn ();    //release the underlying CORBA::StringSeq
   }
@@ -753,7 +753,7 @@ namespace DAnCE
         seq[index] = CORBA::string_dup (element.ext_id_.c_str ());
       }
 
-    ACE_DEBUG ((LM_DEBUG, "The number of types: %d\n", num_entries));
+    DANCE_DEBUG ((LM_DEBUG, "The number of types: %d\n", num_entries));
 
     return seq._retn ();    //release the underlying CORBA::StringSeq
   }
@@ -779,7 +779,7 @@ namespace DAnCE
     //remove the name association
     if (this->names_.unbind (installationName) == -1)
       {
-        ACE_ERROR ((LM_ERROR,
+        DANCE_ERROR ((LM_ERROR,
                     "Unable to unbind %s.\n",
                     installationName));
         internal_err = true;
@@ -801,20 +801,20 @@ namespace DAnCE
 
     if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
       {
-        ACE_ERROR ((LM_ERROR, "Could not reincarnate PC\n"));
+        DANCE_ERROR ((LM_ERROR, "Could not reincarnate PC\n"));
         internal_err = true;
       }
 
     if (this->uuids_.unbind (ACE_CString (pc->UUID)) == -1)
       {
-        ACE_ERROR ((LM_ERROR, "Could not remove UUID\n"));
+        DANCE_ERROR ((LM_ERROR, "Could not remove UUID\n"));
         internal_err = true;
       }
 
     //remove the type from the interface map
     if (!this->remove_type (pc, installationName))
       {
-        ACE_ERROR ((LM_ERROR, "Could not remove type\n"));
+        DANCE_ERROR ((LM_ERROR, "Could not remove type\n"));
         internal_err = true;
       }
 
@@ -834,7 +834,7 @@ namespace DAnCE
     if (internal_err)
       throw CORBA::INTERNAL ();
     else
-      ACE_DEBUG ((LM_INFO, "Successfully deleted \'%s\'\n", installationName));
+      DANCE_DEBUG ((LM_INFO, "Successfully deleted \'%s\'\n", installationName));
 
   }
 
@@ -861,7 +861,7 @@ namespace DAnCE
                                   pcd_name) < 0)
       {
         ACE_OS::chdir (this->cwd_);
-        ACE_ERROR ((LM_ERROR,
+        DANCE_ERROR ((LM_ERROR,
                     "(%P|%t) RepositoryManager: error extracting necessary files\n"));
         throw CORBA::INTERNAL ();
       }
@@ -875,7 +875,7 @@ namespace DAnCE
       }
     catch (...)
       {
-        ACE_ERROR ((LM_ERROR,
+        DANCE_ERROR ((LM_ERROR,
                     "(%P|%t) RepositoryManager: Error parsing the PCD\n"));
 
         //change back the the old working dir
@@ -951,7 +951,7 @@ namespace DAnCE
       }
     catch (...)
       {
-        ACE_ERROR ((LM_ERROR,
+        DANCE_ERROR ((LM_ERROR,
                     "(%P|%t) [RM::retrieve_PC_from_descriptors] Error parsing the PCD\n"));
 
         //change back the the old working dir
@@ -1029,7 +1029,7 @@ namespace DAnCE
                                        const_cast<char*> (inf->name_.c_str ()),
                                        *file))
               {
-                ACE_ERROR ((LM_ERROR,
+                DANCE_ERROR ((LM_ERROR,
                             "[RM::extract_descriptor_files] Unable to retrieve file!\n"));
                 //release the message block chain
                 file->release ();
@@ -1040,7 +1040,7 @@ namespace DAnCE
             //write the file to disk
             if(!RM_Helper::write_to_disk (inf->name_.c_str () + skip_len, *file))
               {
-                ACE_ERROR ((LM_ERROR,
+                DANCE_ERROR ((LM_ERROR,
                             "[RM::extract_descriptor_files] Unable to write out descriptor to disk!\n"));
                 //release the message block chain
                 file->release ();
@@ -1080,7 +1080,7 @@ namespace DAnCE
             //delete disk
             if(remove (inf->name_.c_str () + skip_len))
               {
-                ACE_ERROR ((LM_ERROR,
+                DANCE_ERROR ((LM_ERROR,
                             "[RM::remove_descriptor_files] Unable to remove file from disk!\n"));
                 return_code = 0;
               }
@@ -1190,7 +1190,7 @@ namespace DAnCE
             for (CORBA::ULong i = 0; i < len; ++i)
               {
                 if (this->types_.unbind (ACE_CString (supportedTypes[i]), ACE_CString (name)) != 0)
-                  ACE_DEBUG ((LM_DEBUG, "Could not find type %s with package name %s!\n",
+                  DANCE_DEBUG ((LM_DEBUG, "Could not find type %s with package name %s!\n",
                               ACE_CString (supportedTypes[i]).c_str (),
                               name));
               }
@@ -1210,11 +1210,11 @@ namespace DAnCE
   {
 #if defined (ACE_HAS_DUMP)
 
-    ACE_DEBUG(LM_DEBUG, "NAMES:\n");
+    DANCE_DEBUG(LM_DEBUG, "NAMES:\n");
     this->names_.dump ();
-    ACE_DEBUG(LM_DEBUG, "UUIDs:\n");
+    DANCE_DEBUG(LM_DEBUG, "UUIDs:\n");
     this->uuids_.dump ();
-    ACE_DEBUG (LM_DEBUG, "Component Interface Types:\n");
+    DANCE_DEBUG (LM_DEBUG, "Component Interface Types:\n");
     this->types_.dump ();
 
 #endif /* ACE_HAS_DUMP */
diff --git a/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp b/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
index 47cf4fbb039..59bf39e073d 100644
--- a/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
+++ b/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
@@ -3,9 +3,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/ARGV.h"
 #include "URL_Parser.h"
-
 #include "ace/ACE.h"
-#include "ace/OS_NS_string.h"
+
+#include "DAnCE/Logger/Log_Macros.h"
 
 bool
 URL_Parser::parse_args (int argc, ACE_TCHAR *argv[])
@@ -91,7 +91,7 @@ bool URL_Parser::parseURL (ACE_TCHAR* url)
 
 void URL_Parser::Error (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n"));
+  DANCE_DEBUG ((LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n"));
 }
 
 URL_Parser::~URL_Parser()
diff --git a/CIAO/DAnCE/RepositoryManager/URL_Parser.h b/CIAO/DAnCE/RepositoryManager/URL_Parser.h
index 16805c390b7..c75d2f7bc1a 100644
--- a/CIAO/DAnCE/RepositoryManager/URL_Parser.h
+++ b/CIAO/DAnCE/RepositoryManager/URL_Parser.h
@@ -17,8 +17,6 @@
 #ifndef URL_PARSER_H
 #define URL_PARSER_H
 
-#include "ace/Get_Opt.h"
-#include "ace/ARGV.h"
 #include "ace/Singleton.h"  //for ACE_Singleton
 #include "ace/Null_Mutex.h" //for ACE_Null_Mutex
 
diff --git a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
index d5f130b828f..455af597847 100644
--- a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
+++ b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
@@ -21,6 +21,7 @@
 #include "ace/OS_NS_sys_stat.h"    //for stat
 #include "ace/OS_NS_sys_stat.h"    //for filesize and mkdir
 #include "ace/OS_Memory.h"         //for ACE_NEW* macros
+#include "DAnCE/Logger/Log_Macros.h"
 
 #include <string>
 #include "minizip/unzip.h"
@@ -72,7 +73,7 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
   /* If zipfile could not be opened still, return */
   if (uf==0)
     {
-      ACE_DEBUG((LM_DEBUG, ACE_TEXT("There is some problem in opening")
+      DANCE_DEBUG((LM_DEBUG, ACE_TEXT("There is some problem in opening")
                  ACE_TEXT(" %s or %s.zip using unzOpen\n"), zip_name, zip_name));
       return 1;
     }
@@ -80,7 +81,7 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
   /* get information about all the files in zip file*/
   int err = unzGetGlobalInfo(uf, &gi);
   if (err!=UNZ_OK)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed while trying")
+    DANCE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed while trying")
                ACE_TEXT(" to get global information about zipfile\n"), err));
   /* gi.number_entry corresponds to the number of directory entries
      in the zip file */
@@ -93,7 +94,7 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
                                   sizeof(filename_inzip), 0, 0, 0, 0);
       if (err!=UNZ_OK)
         {
-          ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed")
+          DANCE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed")
                                ACE_TEXT(" while trying to get information")
                                ACE_TEXT(" about current file\n"), err));
           break;
@@ -108,7 +109,7 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
           err = unzGoToNextFile(uf);
           if (err!=UNZ_OK)
           {
-            ACE_DEBUG((LM_DEBUG,
+            DANCE_DEBUG((LM_DEBUG,
                        ACE_TEXT(" unzGoToNextFile failed")
                        ACE_TEXT(" while trying to go to next file\n"),
                        err));
@@ -132,7 +133,7 @@ bool ZIP_Wrapper::get_file (char* archive_path, char* filename,
   int j=unzLocateFile(uf, filename, 0);
   if (j==UNZ_END_OF_LIST_OF_FILE)
     {
-      ACE_DEBUG((LM_DEBUG, ACE_TEXT("File not found in zip archive")));
+      DANCE_DEBUG((LM_DEBUG, ACE_TEXT("File not found in zip archive")));
       return false;
     }
   else if (j==UNZ_OK)
@@ -140,7 +141,7 @@ bool ZIP_Wrapper::get_file (char* archive_path, char* filename,
       int k=unzOpenCurrentFile(uf);
       if (k!=UNZ_OK)
         {
-          ACE_DEBUG((LM_DEBUG, ACE_TEXT("Error in opening the current")
+          DANCE_DEBUG((LM_DEBUG, ACE_TEXT("Error in opening the current")
                                ACE_TEXT(" file using unzOpenCurrentFile")));
           return false;
         }
@@ -187,7 +188,7 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
   uf = unzOpen(zip_archive);
   if (uf==0)
     {
-      ACE_DEBUG((LM_DEBUG,ACE_TEXT("unzOpen failed to open the")
+      DANCE_DEBUG((LM_DEBUG,ACE_TEXT("unzOpen failed to open the")
                  ACE_TEXT(" zipfile\n")));
       return false;
     }
@@ -212,14 +213,14 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
   int err = unzGetGlobalInfo(uf, &gi);
   if (err!=UNZ_OK)
     {
-      ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed to get global")
+      DANCE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed to get global")
                            ACE_TEXT(" information about zipfile\n"), err));
       return false;
     }
   err =unzGoToFirstFile(uf);
   if (err!=UNZ_OK)
     {
-      ACE_DEBUG((LM_DEBUG,ACE_TEXT("error %d with zipfile in"
+      DANCE_DEBUG((LM_DEBUG,ACE_TEXT("error %d with zipfile in"
                  ACE_TEXT(" unzGoToFirstFile\n")), err));
       return false;
     }
@@ -234,7 +235,7 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
                                   sizeof(filename_inzip), 0, 0, 0, 0);
       if (err!=UNZ_OK)
         {
-          ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed")
+          DANCE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed")
                                ACE_TEXT(" while trying to get information")
                                ACE_TEXT(" about currentfile\n"), err));
           break;
@@ -256,7 +257,7 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
           err = unzGoToNextFile(uf);
           if (err!=UNZ_OK)
             {
-              ACE_ERROR((LM_ERROR,ACE_TEXT("unzGoToNextFile failed")
+              DANCE_ERROR((LM_ERROR,ACE_TEXT("unzGoToNextFile failed")
                                   ACE_TEXT(" while trying to go to")
                                   ACE_TEXT(" nextfile\n"), err));
               break;
@@ -324,7 +325,7 @@ int ZIP_Wrapper::handlethefile (char* filename_inzip, unzFile uf,
   int k = unzOpenCurrentFile(uf);
   if (k!=UNZ_OK)
     {
-      ACE_ERROR((LM_ERROR,ACE_TEXT("unzOpenCurrentFile failed in"
+      DANCE_ERROR((LM_ERROR,ACE_TEXT("unzOpenCurrentFile failed in"
                                     " opening the current file")));
       return false;
     }
@@ -356,7 +357,7 @@ int ZIP_Wrapper::handlethefile (char* filename_inzip, unzFile uf,
       if (handle == ACE_INVALID_HANDLE)
         {
           unzClose(uf);
-          ACE_ERROR_RETURN ((LM_ERROR,
+          DANCE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("%p\n"),
                              ACE_TEXT ("[uncompress] file creation error")),
                              0);
@@ -365,7 +366,7 @@ int ZIP_Wrapper::handlethefile (char* filename_inzip, unzFile uf,
       if (ACE_OS::write (handle, &(*buffer), file_size) == -1)
         {
           unzClose(uf);
-          ACE_ERROR_RETURN ((LM_ERROR,
+          DANCE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("%p\n"),
                              ACE_TEXT ("[uncompress] file write error")),
                              0);
diff --git a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h
index cb1be6c2843..1506277e4f7 100644
--- a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h
+++ b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h
@@ -23,7 +23,7 @@
 #include "ace/Containers_T.h"     //for ACE_Double_Linked_List
 #include "ace/Message_Block.h"    //for ACE_Message_Block
 #include "ace/SString.h"          //for ACE_CString
-#include "ace/Log_Msg.h"
+
 #include "ace/Synch.h"
 #include "ace/OS_NS_fcntl.h"      //for open
 #include "ace/OS_NS_sys_stat.h"   //for filesize and mkdir
diff --git a/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp b/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
index f348ade098e..9250fec268d 100644
--- a/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
+++ b/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
@@ -44,7 +44,7 @@ struct Options
         path_ = tmp.substring (begin, pos - begin);
       else
         {
-          ACE_ERROR ((LM_ERROR, DLINFO "Options::Installation::init - "
+          DANCE_ERROR ((LM_ERROR, DLINFO "Options::Installation::init - "
                       "Installation directive missing name and replace parameters, "
                       "must have form path,name,replace\n"));
           return false;
@@ -58,7 +58,7 @@ struct Options
         name_ = tmp.substring (begin, pos - begin);
       else 
         {
-          ACE_ERROR ((LM_ERROR, DLINFO "Options::Installation::init - "
+          DANCE_ERROR ((LM_ERROR, DLINFO "Options::Installation::init - "
                       "Installation directive mssing replace parameter, "
                       "must have form path,name,replace\n"));
           return false;
@@ -70,7 +70,7 @@ struct Options
       else if (tmp[begin] == '1') replace_ = true;
       else
         {
-          ACE_ERROR ((LM_ERROR, DLINFO "Options::Installation::init - "
+          DANCE_ERROR ((LM_ERROR, DLINFO "Options::Installation::init - "
                       "Replace directive muse be 1 or 0.\n"));
           return false;
         }
@@ -106,7 +106,7 @@ struct Options
         path_ = tmp.substring (begin, pos - begin);
       else
         {
-          ACE_ERROR ((LM_ERROR, DLINFO "Options::Creation::init - "
+          DANCE_ERROR ((LM_ERROR, DLINFO "Options::Creation::init - "
                       "Creation directive missing name, base location,  and replace parameters, "
                       "must have form path,name,base,replace\n"));
           return false;
@@ -120,7 +120,7 @@ struct Options
         name_ = tmp.substring (begin, pos - begin);
       else 
         {
-          ACE_ERROR ((LM_ERROR, DLINFO "Options::Creation::init - "
+          DANCE_ERROR ((LM_ERROR, DLINFO "Options::Creation::init - "
                       "Creation directive mssing base location and replace parameter, "
                       "must have form path,name,base,replace\n"));
           return false;
@@ -133,7 +133,7 @@ struct Options
         base_location_ = tmp.substring (begin, pos - begin);
       else 
         {
-          ACE_ERROR ((LM_ERROR, DLINFO "Options::Creation::init - "
+          DANCE_ERROR ((LM_ERROR, DLINFO "Options::Creation::init - "
                       "Creation directive mssing replace parameter, "
                       "must have form path,name,base,replace\n"));
           return false;
@@ -145,7 +145,7 @@ struct Options
       else if (tmp[begin] == '1') replace_ = true;
       else
         {
-          ACE_ERROR ((LM_ERROR, DLINFO "Options::Creation::init - "
+          DANCE_ERROR ((LM_ERROR, DLINFO "Options::Creation::init - "
                       "Replace directive muse be 1 or 0.\n"));
           return false;
         }
@@ -174,7 +174,7 @@ struct Options
   
   void usage (void) 
   {
-    ACE_ERROR ((LM_EMERGENCY, "usage:\n"
+    DANCE_ERROR ((LM_EMERGENCY, "usage:\n"
                 "\t-h,--help\t\t\tThis message.\n"
                 "\t-r,--rm-ior <ior>\t\tIOR where the RM instance may be found\n"
                 "\t-i,--install <path>,<name>,<1|0>\tInstall package found at <path> into the RM, with <name>,\n"