Wed Mar 23 13:50:37 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>

        * dance/RepositoryManager/PC_Updater.cpp:
        * dance/RepositoryManager/RepositoryManager.cpp:
        * dance/RepositoryManager/RepositoryManager_Impl.cpp:
        * dance/RepositoryManager/Repository_Manager.cpp:
        * dance/RepositoryManager/Repository_Manager_Module.cpp:
        * dance/RepositoryManager/URL_Parser.cpp:
        * dance/RepositoryManager/ZIP_Wrapper.cpp:
        * dance/RepositoryManager/repository_manager_admin.cpp:
        * dance/RepositoryManager/repository_manager_admin_exec.cpp:

          New logging macros.

10 files changed, 289 insertions, 178 deletions

diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index f107c9c390d..eb06c5a7d24 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,17 @@
+Wed Mar 23 13:50:37 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/RepositoryManager/PC_Updater.cpp:
+        * dance/RepositoryManager/RepositoryManager.cpp:
+        * dance/RepositoryManager/RepositoryManager_Impl.cpp:
+        * dance/RepositoryManager/Repository_Manager.cpp:
+        * dance/RepositoryManager/Repository_Manager_Module.cpp:
+        * dance/RepositoryManager/URL_Parser.cpp:
+        * dance/RepositoryManager/ZIP_Wrapper.cpp:
+        * dance/RepositoryManager/repository_manager_admin.cpp:
+        * dance/RepositoryManager/repository_manager_admin_exec.cpp:
+
+          New logging macros.
+
 Tue Mar 22 18:54:09 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * dance/DAnCE_Utility.cpp:
diff --git a/DAnCE/dance/RepositoryManager/PC_Updater.cpp b/DAnCE/dance/RepositoryManager/PC_Updater.cpp
index 8b6dcb16464..36aaeedd686 100644
--- a/DAnCE/dance/RepositoryManager/PC_Updater.cpp
+++ b/DAnCE/dance/RepositoryManager/PC_Updater.cpp
@@ -191,7 +191,7 @@ void PC_Updater::update (::Deployment::ImplementationArtifactDescription &iad)
     iter++;
   }
 
-  DANCE_ERROR (1, (LM_ERROR,
+  DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
              "[PC_Updater::update] Unable to update: %s!\n",
              location));
 
diff --git a/DAnCE/dance/RepositoryManager/RepositoryManager.cpp b/DAnCE/dance/RepositoryManager/RepositoryManager.cpp
index a03601797e7..fa28901b90a 100644
--- a/DAnCE/dance/RepositoryManager/RepositoryManager.cpp
+++ b/DAnCE/dance/RepositoryManager/RepositoryManager.cpp
@@ -189,7 +189,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     worker.thr_mgr ()->wait ();
 
-    DANCE_DEBUG (6, (LM_DEBUG, "event loop finished\n"));
+    DANCE_TRACE_LOG (DANCE_LOG_TRACE, (LM_DEBUG, "event loop finished\n"));
 
     orb->destroy ();
   }
@@ -231,7 +231,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             DAnCE::RepositoryManager::nthreads = ACE_OS::atoi (get_opts.opt_arg ());
             break;
           case '?':  // display help for use of the server.
-            DANCE_DEBUG (8, (LM_INFO,
+            DANCE_ERROR (DANCE_LOG_EMERGENCY, (LM_INFO,
                         ACE_TEXT("usage: %s\n")
                         ACE_TEXT("-o <using ior file>\n")
                         ACE_TEXT("-v <name of naming service>\n")
diff --git a/DAnCE/dance/RepositoryManager/RepositoryManager_Impl.cpp b/DAnCE/dance/RepositoryManager/RepositoryManager_Impl.cpp
index 354760181d6..549f131e267 100644
--- a/DAnCE/dance/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/DAnCE/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 ()))
-          DANCE_ERROR (1, (LM_ERROR, "Failed to add the type\n"));
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, "Failed to add the type\n"));
       }
 
     DAnCE::Config_Handlers::XML_Helper::
@@ -194,7 +194,8 @@ namespace DAnCE
     PCEntry *entry = 0;
     if (this->names_.find (ACE_CString (installationName), entry) == 0)
       {
-        DANCE_DEBUG (8, (LM_INFO, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+        DANCE_DEBUG (DANCE_LOG_MINOR_EVENT,
+                     (LM_INFO, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                       "Found package %s already installed.\n"));
         if (!replace)
           throw Deployment::NameExists ();
@@ -220,10 +221,12 @@ namespace DAnCE
     ACE_CString descriptor_dir (path);
     descriptor_dir += "/descriptors/"; //location of the descriptor directory
 
-    DANCE_DEBUG (6, (LM_DEBUG, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+    DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                 (LM_DEBUG, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                   "Package Path: %s\n",
                   package_path.c_str ()));
-    DANCE_DEBUG (6, (LM_DEBUG, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+    DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                 (LM_DEBUG, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                   "Descriptor path: %s\n",
                   descriptor_dir.c_str ()));
 
@@ -232,7 +235,8 @@ namespace DAnCE
 
     if (ACE_OS::strstr (location, "http://"))
       {
-        DANCE_DEBUG (8, (LM_INFO, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+        DANCE_DEBUG (DANCE_LOG_MINOR_EVENT,
+                     (LM_INFO, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                       "Downloading package over HTTP: %s\n",
                       location));
 
@@ -257,7 +261,8 @@ namespace DAnCE
           }
         catch (...)
           {
-            DANCE_ERROR (1, (LM_ERROR, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+            DANCE_ERROR (DANCE_LOG_ERROR,
+                         (LM_ERROR, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                           "Caught unexpected exception while fetching path %s\n",
                           location));
 
@@ -272,7 +277,8 @@ namespace DAnCE
       }
 
 
-    DANCE_DEBUG (9, (LM_TRACE, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+    DANCE_DEBUG (DANCE_LOG_MINOR_EVENT,
+                 (LM_TRACE, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                   "Uncompressing file %s to directory %s\n",
                   package_path.c_str (),
                   this->install_root_.c_str ()));
@@ -291,7 +297,8 @@ namespace DAnCE
     //if the PackageConfiguration name cannot be found, then there is nothing to install
     if (pc_name == "")
       {
-        DANCE_ERROR (1, (LM_ERROR, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+        DANCE_ERROR (DANCE_LOG_ERROR,
+                     (LM_ERROR, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                       "Unable to find PC name %s in path %s\n",
                       pc_name.c_str (),
                       package_path.c_str ()));
@@ -340,7 +347,8 @@ namespace DAnCE
 
     if (!updater.update (pc))
       {
-        DANCE_DEBUG (6, (LM_ERROR, DLINFO "[RM] problem updating the PackageConfiguration!\n"));
+        DANCE_ERROR (DANCE_LOG_ERROR,
+                     (LM_ERROR, DLINFO "[RM] problem updating the PackageConfiguration!\n"));
 
         //clean the extracted files
         remove_extracted_package (path.c_str ());
@@ -358,7 +366,7 @@ namespace DAnCE
     //insert the package into the database
     if (this->names_.bind (ACE_CString (installationName), path) == -1)
       {
-        DANCE_ERROR (1, (LM_ERROR,
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                     "[RM] could not bind %s.\n",
                     installationName));
 
@@ -376,7 +384,7 @@ namespace DAnCE
     //ALSO NEED THE UUID here
     if (this->uuids_.bind (ACE_CString (pc->UUID), path) == -1)
       {
-        DANCE_ERROR (1, (LM_ERROR,
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                     "[RM] could not bind %s.\n",
                     ACE_CString (pc->UUID).c_str ()));
 
@@ -396,13 +404,13 @@ namespace DAnCE
 
     //now add the type interface
     if(!this->add_type (pc, installationName))
-      DANCE_ERROR (1, (LM_ERROR, "Failed to add the type\n"));
+      DANCE_ERROR (DANCE_LOG_ERRO, (LM_ERROR, "Failed to add the type\n"));
 
     this->dump ();
 
     this->save ();
 
-    DANCE_DEBUG (8, (LM_INFO,
+    DANCE_DEBUG (DANCE_LOG_MAJOR_EVENT, (LM_INFO,
                 "Installed PackageConfiguration \n\tname: %s \n\tuuid: %s\n",
                 installationName, ACE_CString (pc->UUID).c_str ()));
   }
@@ -494,7 +502,7 @@ namespace DAnCE
 
     if (!updater.update (pc))
       {
-        DANCE_ERROR (1, (LM_ERROR, "[RM] problem updating the PackageConfiguration!\n"));
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, "[RM] problem updating the PackageConfiguration!\n"));
         //clean the extracted files
         remove_extracted_package (path.c_str ());
         //remove the package
@@ -510,7 +518,7 @@ namespace DAnCE
     // Insert the name of the package.
     if (this->names_.bind (ACE_CString (installationName), path) == -1)
       {
-        DANCE_ERROR (1, (LM_ERROR,
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                     "[RM] could not bind %s.\n",
                     installationName));
 
@@ -528,7 +536,7 @@ namespace DAnCE
     // Insert the UUID of the package.
     if (this->uuids_.bind (ACE_CString (pc.UUID), path) == -1)
       {
-        DANCE_ERROR (1, (LM_ERROR,
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                     "[RM] could not bind %s.\n",
                     ACE_CString (pc.UUID).c_str ()));
 
@@ -549,13 +557,14 @@ namespace DAnCE
     //now add the type interface
     //TODO: CHECK if successful
     if(!this->add_type (pc, installationName))
-      DANCE_ERROR (1, (LM_ERROR, "Failed to add the type\n"));
+      DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, "Failed to add the type\n"));
 
     this->dump ();
 
     this->save ();
 
-    DANCE_DEBUG (8, (LM_INFO,
+    DANCE_DEBUG (DANCE_LOG_MINOR_EVENT,
+                 (LM_INFO,
                 "Created PackageConfiguration \n  directory: %s \n  name: %s \n  uuid: %s\n",
                 path.c_str (), installationName, ACE_CString (pc.UUID).c_str ()));
   }
@@ -591,7 +600,8 @@ namespace DAnCE
     if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
       throw CORBA::INTERNAL ();
 
-    DANCE_DEBUG (8, (LM_INFO, "Successfully looked up \'%s\'.\n", name));
+    DANCE_DEBUG (DANCE_LOG_MINOR_EVENT,
+                 (LM_INFO, "Successfully looked up \'%s\'.\n", name));
 
     return pc._retn ();
   }
@@ -627,7 +637,8 @@ namespace DAnCE
     if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
       throw CORBA::INTERNAL ();
 
-    DANCE_DEBUG (8, (LM_INFO, "Successfully looked up %s.\n", UUID));
+    DANCE_DEBUG (DANCE_LOG_MINOR_EVENT,
+                 (LM_INFO, "Successfully looked up %s.\n", UUID));
 
     return pc._retn ();
   }
@@ -714,7 +725,8 @@ namespace DAnCE
         seq[index] = CORBA::string_dup (element.ext_id_.c_str ());
       }
 
-    DANCE_DEBUG (8, (LM_INFO, "The number of packages %d\n", seq->length ()));
+    DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                 (LM_INFO, "The number of packages %d\n", seq->length ()));
 
     return seq._retn ();    //release the underlying CORBA::StringSeq
   }
@@ -757,7 +769,8 @@ namespace DAnCE
         seq[index] = CORBA::string_dup (element.ext_id_.c_str ());
       }
 
-    DANCE_DEBUG (6, (LM_DEBUG, "The number of types: %d\n", num_entries));
+    DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                 (LM_DEBUG, "The number of types: %d\n", num_entries));
 
     return seq._retn ();    //release the underlying CORBA::StringSeq
   }
@@ -783,7 +796,7 @@ namespace DAnCE
     //remove the name association
     if (this->names_.unbind (installationName) == -1)
       {
-        DANCE_ERROR (1, (LM_ERROR,
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                     "Unable to unbind %s.\n",
                     installationName));
         internal_err = true;
@@ -805,20 +818,20 @@ namespace DAnCE
 
     if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
       {
-        DANCE_ERROR (1, (LM_ERROR, "Could not reincarnate PC\n"));
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, "Could not reincarnate PC\n"));
         internal_err = true;
       }
 
     if (this->uuids_.unbind (ACE_CString (pc->UUID)) == -1)
       {
-        DANCE_ERROR (1, (LM_ERROR, "Could not remove UUID\n"));
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, "Could not remove UUID\n"));
         internal_err = true;
       }
 
     //remove the type from the interface map
     if (!this->remove_type (pc, installationName))
       {
-        DANCE_ERROR (1, (LM_ERROR, "Could not remove type\n"));
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, "Could not remove type\n"));
         internal_err = true;
       }
 
@@ -838,7 +851,8 @@ namespace DAnCE
     if (internal_err)
       throw CORBA::INTERNAL ();
     else
-      DANCE_DEBUG (8, (LM_INFO, "Successfully deleted \'%s\'\n", installationName));
+      DANCE_DEBUG (DANCE_LOG_MINOR_EVENT,
+                   (LM_INFO, "Successfully deleted \'%s\'\n", installationName));
 
   }
 
@@ -865,7 +879,7 @@ namespace DAnCE
                                   pcd_name) < 0)
       {
         ACE_OS::chdir (this->cwd_);
-        DANCE_ERROR (1, (LM_ERROR,
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                     "(%P|%t) RepositoryManager: error extracting necessary files\n"));
         throw CORBA::INTERNAL ();
       }
@@ -879,7 +893,7 @@ namespace DAnCE
       }
     catch (...)
       {
-        DANCE_ERROR (1, (LM_ERROR,
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                     "(%P|%t) RepositoryManager: Error parsing the PCD\n"));
 
         //change back the the old working dir
@@ -955,7 +969,7 @@ namespace DAnCE
       }
     catch (...)
       {
-        DANCE_ERROR (1, (LM_ERROR,
+        DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                     "(%P|%t) [RM::retrieve_PC_from_descriptors] Error parsing the PCD\n"));
 
         //change back the the old working dir
@@ -1033,7 +1047,7 @@ namespace DAnCE
                                        const_cast<char*> (inf->name_.c_str ()),
                                        *file))
               {
-                DANCE_ERROR (1, (LM_ERROR,
+                DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                             "[RM::extract_descriptor_files] Unable to retrieve file!\n"));
                 //release the message block chain
                 file->release ();
@@ -1044,7 +1058,7 @@ namespace DAnCE
             //write the file to disk
             if(!RM_Helper::write_to_disk (inf->name_.c_str () + skip_len, *file))
               {
-                DANCE_ERROR (1, (LM_ERROR,
+                DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                             "[RM::extract_descriptor_files] Unable to write out descriptor to disk!\n"));
                 //release the message block chain
                 file->release ();
@@ -1084,7 +1098,7 @@ namespace DAnCE
             //delete disk
             if(remove (inf->name_.c_str () + skip_len))
               {
-                DANCE_ERROR (1, (LM_ERROR,
+                DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR,
                             "[RM::remove_descriptor_files] Unable to remove file from disk!\n"));
                 return_code = 0;
               }
@@ -1194,9 +1208,9 @@ namespace DAnCE
             for (CORBA::ULong i = 0; i < len; ++i)
               {
                 if (this->types_.unbind (ACE_CString (supportedTypes[i]), ACE_CString (name)) != 0)
-                  DANCE_DEBUG (6, (LM_DEBUG, "Could not find type %s with package name %s!\n",
-                              ACE_CString (supportedTypes[i]).c_str (),
-                              name));
+                  DANCE_ERROR (DANCE_LOG_ERROR, (LM_DEBUG, "Could not find type %s with package name %s!\n",
+                                                 ACE_CString (supportedTypes[i]).c_str (),
+                                                 name));
               }
           }
       }
diff --git a/DAnCE/dance/RepositoryManager/Repository_Manager.cpp b/DAnCE/dance/RepositoryManager/Repository_Manager.cpp
index bf7f4ee87a6..a2616d59db2 100644
--- a/DAnCE/dance/RepositoryManager/Repository_Manager.cpp
+++ b/DAnCE/dance/RepositoryManager/Repository_Manager.cpp
@@ -24,37 +24,42 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           dlf->init (argc, argv);
         }
 
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
+      DANCE_TRACE_LOG (DANCE_LOG_TRACE,
+                       (LM_TRACE, DLINFO
                     ACE_TEXT("RepositoryManager - initializing ORB\n")));
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                   ACE_TEXT("RepositoryManager - initializing module instance\n")));
+      DANCE_TRACE_LOG (DANCE_LOG_TRACE, (LM_TRACE, DLINFO
+                                         ACE_TEXT("RepositoryManager - initializing module instance\n")));
 
       DAnCE_RepositoryManager_Module rm;
       CORBA::Object_var obj = rm.init (orb.in (), argc, argv);
 
       if (!CORBA::is_nil (obj.in ()))
         {
-          DANCE_DEBUG (6, (LM_TRACE, DLINFO
+          DANCE_TRACE_LOG (DANCE_LOG_TRACE, (LM_TRACE, DLINFO
                     ACE_TEXT("RepositoryManager - running ORB\n")));
           orb->run ();
         }
 
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
+      DANCE_TRACE_LOG (DANCE_LOG_TRACE (LM_TRACE, DLINFO
                     ACE_TEXT("RepositoryManager - destroying ORB\n")));
 
       orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("RepositoryManager");
+      DANCE_ERROR (DANCE_LOG_EMERGENCY,
+                   (LM_ERROR, DLINFO
+                    ACE_TEXT ("Caught CORBA Exception: %C\n"),
+                    ex._info ().c_str ()
       retval = -1;
     }
   catch (...)
     {
-      DANCE_ERROR (1, (LM_ERROR, "RepositoryManager - Error: Unknown exception.\n"));
+      DANCE_ERROR (DANCE_LOG_EMERGENCY,
+                   (LM_ERROR, "RepositoryManager - Error: Unknown exception.\n"));
       retval = -1;
     }
 
diff --git a/DAnCE/dance/RepositoryManager/Repository_Manager_Module.cpp b/DAnCE/dance/RepositoryManager/Repository_Manager_Module.cpp
index d1263a5ca83..e0822e2f97c 100644
--- a/DAnCE/dance/RepositoryManager/Repository_Manager_Module.cpp
+++ b/DAnCE/dance/RepositoryManager/Repository_Manager_Module.cpp
@@ -55,22 +55,24 @@ namespace DAnCE
 
         try
           {
-            DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ")
+            DANCE_DEBUG (DANCE_LOG_MINOR_EVENT,
+                         (LM_INFO, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ")
                           ACE_TEXT("Spawning thread %u for the ORB.\n"), thread_id));
             this->orb_->run ();
-            DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ")
+            DANCE_DEBUG (DANCE_LOG_EVENT_TRACE,
+                         (LM_INFO, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ")
                           ACE_TEXT("ORB event loop for thread %u completed successfully.\n"), thread_id));
           }
         catch (const CORBA::Exception &ex)
           {
-            DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ")
+            DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ")
                           ACE_TEXT("Caught CORBA exception from ORB event loop for thread %u: %C\n"),
                           thread_id, ex._info ().c_str ()));
             return -1;
           }
         catch (...)
           {
-            DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ")
+            DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT("DAnCE::Repository_Manager::Worker::svc - ")
                           ACE_TEXT("Caught unknown C++ exception from ORB event loop for thread %u\n"),
                           thread_id));
             return -1;
@@ -157,41 +159,53 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
       switch (c)
         {
         case 'd':
-          DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+          DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                         ACE_TEXT("Binding to provided Domain Naming Context: '%s'\n"),
                         get_opts.opt_arg ()));
           this->options_.domain_nc_ = get_opts.opt_arg ();
           break;
 
         case 'f':
-          DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+          DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                         ACE_TEXT("Output filename for IOR is %s\n"),
                         get_opts.opt_arg ()));
           this->options_.ior_file_ = get_opts.opt_arg ();
           break;
 
         case 't':
-          DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+          DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                         ACE_TEXT("Number of threads is %s\n"), get_opts.opt_arg ()));
           this->options_.threads_ = (ACE_OS::atoi (get_opts.opt_arg ()));
           break;
 
         case 'p':
-          DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+          DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                         ACE_TEXT("Package directory is %s\n"),
                         get_opts.opt_arg ()));
           this->options_.package_dir_ = get_opts.opt_arg ();
           break;
 
         case 'n':
-          DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+          DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                         ACE_TEXT("Name is %s\n"),
                         get_opts.opt_arg ()));
           this->options_.name_ = get_opts.opt_arg ();
           break;
 
         case 's':
-          DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+          DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                         ACE_TEXT("Server address is %s\n"),
                         get_opts.opt_arg ()));
           this->options_.server_address_ = get_opts.opt_arg ();
@@ -200,13 +214,17 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
         case 0:
           if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("spawn-http")) == 0)
             {
-              DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+              DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                             ACE_TEXT("Found option to spawn in-process HTTP server\n")));
               this->options_.spawn_http_ = true;
             }
           else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-port")) == 0)
             {
-              DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+              DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                             ACE_TEXT("Using %s as the spawned HTTP server port\n"),
                             get_opts.opt_arg ()));
               this->options_.spawn_http_ = true;
@@ -214,7 +232,9 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
             }
           else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-threads")) == 0)
             {
-              DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+              DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                             ACE_TEXT("Using %s as the spawned HTTP number of threads\n"),
                             get_opts.opt_arg ()));
               this->options_.spawn_http_ = true;
@@ -222,7 +242,9 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
             }
           else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-threading")) == 0)
             {
-              DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+              DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                             ACE_TEXT("Using %s as the spawned HTTP server threading model\n"),
                             get_opts.opt_arg ()));
               this->options_.spawn_http_ = true;
@@ -230,7 +252,9 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
             }
           else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-io")) == 0)
             {
-              DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+              DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                             ACE_TEXT("Using %s as the spawned HTTP server IO strategy\n"),
                             get_opts.opt_arg ()));
               this->options_.spawn_http_ = true;
@@ -238,7 +262,9 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
             }
           else if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("http-caching")) == 0)
             {
-              DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+              DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_DEBUG, DLINFO
+                        ACE_TEXT("Repository_Manager_Module::parse_args - ")
                             ACE_TEXT("Using %s as the spawned HTTP server caching strategy\n"),
                             get_opts.opt_arg ()));
               this->options_.spawn_http_ = true;
@@ -246,7 +272,8 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
             }
           else
             {
-              DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+              DANCE_ERROR (DANCE_LOG_ERROR,
+                           (LM_ERROR, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
                             ACE_TEXT("ERROR: unknown long option %s\n"),
                             get_opts.long_option ()));
             }
@@ -267,7 +294,7 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
 
   if (this->options_.server_address_ == 0)
     {
-      DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
+      DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR, (LM_ERROR, DLINFO ACE_TEXT("Repository_Manager_Module::parse_args - ")
                     ACE_TEXT("Must provide server address using --server-address option.\n")));
       return false;
     }
@@ -286,7 +313,8 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
     {
       if (CORBA::is_nil(orb))
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+          DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR,
+                       (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
                        ACE_TEXT("Attempted to create Repository Manager with a nil orb.\n")));
           return CORBA::Object::_nil();
         }
@@ -297,8 +325,9 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
 
       if (ACE_OS::strcmp(orb->id(), this->orb_->id()) != 0)
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
-                       ACE_TEXT("Resetting NM's orb.\n")));
+          DANCE_TRACE_LOG (DANCE_LOG_TRACE,
+                           (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+                            ACE_TEXT("Resetting NM's orb.\n")));
           this->orb_ = CORBA::ORB::_duplicate (orb);
           this->domain_nc_ = CosNaming::NamingContext::_nil();
         }
@@ -317,15 +346,17 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
         {
           try
             {
-              DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
-                           ACE_TEXT("Resolving DomainNC.\n")));
+              DANCE_TRACE_LOG (DANCE_LOG_TRACE,
+                               (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+                                ACE_TEXT("Resolving DomainNC.\n")));
               CORBA::Object_var domain_obj = this->orb_->string_to_object (this->options_.domain_nc_);
               if (!CORBA::is_nil (domain_obj.in ()))
                 {
                   this->domain_nc_ = CosNaming::NamingContext::_narrow (domain_obj.in());
                   if (CORBA::is_nil (this->domain_nc_.in ()))
                     {
-                      DANCE_ERROR (1, (LM_ERROR,DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+                      DANCE_ERROR (DANCE_LOG_ERROR,
+                                   (LM_ERROR,DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
                                     ACE_TEXT("Narrow to NamingContext return nil for DomainNC.\n")));
                       return CORBA::Object::_nil ();
                     }
@@ -333,14 +364,16 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
             }
           catch (const CORBA::Exception&)
             {
-              DANCE_DEBUG (6, (LM_WARNING, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
-                             ACE_TEXT("DomainNC context not found!\n")));
+              DANCE_DEBUG (DANCE_LOG_ERROR,
+                           (LM_WARNING, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+                            ACE_TEXT("DomainNC context not found!\n")));
             }
         }
 
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
-                    ACE_TEXT("Initializing the IOR Table\n")));
+      DANCE_TRACE_LOG (DANCE_LOG_TRACE,
+                       (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+                        ACE_TEXT("Initializing the IOR Table\n")));
       // Initialize IOR table
       CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable");
 
@@ -348,8 +381,9 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
 
       if (CORBA::is_nil (adapter.in ()))
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
-                         ACE_TEXT("Unable to RIR the IORTable.\n")));
+          DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR,
+                       (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+                        ACE_TEXT("Unable to RIR the IORTable.\n")));
           return CORBA::Object::_nil ();
         }
 
@@ -390,8 +424,9 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
             ns_name = "RepositoryManager";
           else ns_name = this->options_.name_;
 
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
-                       ACE_TEXT("Registering NM in NC as \"%C\".\n"), ns_name.c_str ()));
+          DANCE_DEBUG (DANCE_LOG_MINOR_EVENT,
+                       (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+                        ACE_TEXT("Registering NM in NC as \"%C\".\n"), ns_name.c_str ()));
           CosNaming::Name name (1);
           name.length (1);
           name[0].id = CORBA::string_dup (ns_name.c_str ());
@@ -402,10 +437,10 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
       // Writing ior to file
       if (0 != this->options_.ior_file_)
         {
-          DANCE_DEBUG (9, (LM_TRACE,  DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+          DANCE_TRACE_LOG (DANCE_LOG_TRACE, (LM_TRACE,  DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
                         ACE_TEXT("Writing RM IOR %C to file %C.\n"), this->options_.ior_file_, ior.in ()));
           if (!DAnCE::Repository_Manager::write_IOR (this->options_.ior_file_, ior.in ()))
-            DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+            DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
                           ACE_TEXT("Error: Unable to write IOR to file %C\n"),
                           this->options_.ior_file_));
         }
@@ -415,10 +450,12 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
       mgr->activate ();
 
       // Finishing Deployment part
-      DANCE_DEBUG (6, (LM_NOTICE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+      DANCE_DEBUG (DANCE_LOG_MAJOR_EVENT,
+                   (LM_NOTICE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
                     ACE_TEXT("DAnCE_RepositoryManager is running...\n")));
 
-      DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+      DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                   (LM_DEBUG, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
                     ACE_TEXT("RepositoryManager IOR: %C\n"), ior.in ()));
 
       return nm_obj._retn ();
@@ -435,14 +472,16 @@ DAnCE_RepositoryManager_Module::create_poas (void)
 {
   DANCE_TRACE("DAnCE_RepositoryManager_Module::create_poas");
   // Get reference to Root POA.
-  DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ")
-                ACE_TEXT("Resolving root POA\n")));
+  DANCE_TRACE_LOG (DANCE_LOG_TRACE,
+                   (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ")
+                    ACE_TEXT("Resolving root POA\n")));
   CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA");
 
   this->root_poa_ = PortableServer::POA::_narrow (obj.in ());
 
-  DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ")
-                ACE_TEXT("Obtaining the POAManager\n")));
+  DANCE_TRACE_LOG (DANCE_LOG_TRACE,
+                   (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ")
+                    ACE_TEXT("Obtaining the POAManager\n")));
   PortableServer::POAManager_var mgr = this->root_poa_->the_POAManager ();
 
   TAO::Utils::PolicyList_Destroyer policies (2);
@@ -450,9 +489,10 @@ DAnCE_RepositoryManager_Module::create_poas (void)
 
   try
     {
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ")
-                    ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ")
-                    ACE_TEXT("Creating the \"Repository\" POA.\n")));
+      DANCE_TRACE_LOG (DANCE_LOG_TRACE,
+                       (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ")
+                        ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ")
+                        ACE_TEXT("Creating the \"Repository\" POA.\n")));
 
       policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
       policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
@@ -462,8 +502,9 @@ DAnCE_RepositoryManager_Module::create_poas (void)
     }
   catch (const PortableServer::POA::AdapterAlreadyExists &)
     {
-      DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ")
-                    ACE_TEXT("Using existing \"Repository\" POA\n")));
+      DANCE_TRACE_LOG (DANCE_LOG_TRACE,
+                       (LM_INFO, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_poas - ")
+                        ACE_TEXT("Using existing \"Repository\" POA\n")));
       this->rm_poa_ = this->root_poa_->find_POA ("Repository", 0);
     }
 }
diff --git a/DAnCE/dance/RepositoryManager/URL_Parser.cpp b/DAnCE/dance/RepositoryManager/URL_Parser.cpp
index 430a3d02400..78eab1e43ae 100644
--- a/DAnCE/dance/RepositoryManager/URL_Parser.cpp
+++ b/DAnCE/dance/RepositoryManager/URL_Parser.cpp
@@ -91,7 +91,8 @@ bool URL_Parser::parseURL (ACE_TCHAR* url)
 
 void URL_Parser::Error (void)
 {
-  DANCE_DEBUG (6, (LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n"));
+  DANCE_ERROR (DANCE_LOG_ERROR,
+               (LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n"));
 }
 
 URL_Parser::~URL_Parser()
diff --git a/DAnCE/dance/RepositoryManager/ZIP_Wrapper.cpp b/DAnCE/dance/RepositoryManager/ZIP_Wrapper.cpp
index e2018fdc9b4..04bacb11b28 100644
--- a/DAnCE/dance/RepositoryManager/ZIP_Wrapper.cpp
+++ b/DAnCE/dance/RepositoryManager/ZIP_Wrapper.cpp
@@ -73,16 +73,18 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
   /* If zipfile could not be opened still, return */
   if (uf==0)
     {
-      DANCE_DEBUG (6, (LM_DEBUG, ACE_TEXT("There is some problem in opening")
-                 ACE_TEXT(" %s or %s.zip using unzOpen\n"), zip_name, zip_name));
+      DANCE_ERROR (DANCE_LOG_ERROR,
+                   (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;
     }
   unz_global_info gi;
   /* get information about all the files in zip file*/
   int err = unzGetGlobalInfo(uf, &gi);
   if (err!=UNZ_OK)
-    DANCE_DEBUG (6, (LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed while trying")
-               ACE_TEXT(" to get global information about zipfile\n"), err));
+    DANCE_ERROR (DANCE_LOG_ERROR,
+                 (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 */
   for (uLong i=0;i<gi.number_entry;i++)
@@ -94,9 +96,10 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
                                   sizeof(filename_inzip), 0, 0, 0, 0);
       if (err!=UNZ_OK)
         {
-          DANCE_DEBUG (6, (LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed")
-                               ACE_TEXT(" while trying to get information")
-                               ACE_TEXT(" about current file\n"), err));
+          DANCE_ERROR (DANCE_LOG_ERROR,
+                       (LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed")
+                        ACE_TEXT(" while trying to get information")
+                        ACE_TEXT(" about current file\n"), err));
           break;
         }
       ZIP_File_Info* next = 0;
@@ -109,10 +112,11 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
           err = unzGoToNextFile(uf);
           if (err!=UNZ_OK)
           {
-            DANCE_DEBUG (6, (LM_DEBUG,
-                       ACE_TEXT(" unzGoToNextFile failed")
-                       ACE_TEXT(" while trying to go to next file\n"),
-                       err));
+            DANCE_ERROR (DANCE_LOG_ERROR,
+                         (LM_DEBUG,
+                          ACE_TEXT(" unzGoToNextFile failed")
+                          ACE_TEXT(" while trying to go to next file\n"),
+                          err));
             break;
           }
         }
@@ -133,7 +137,8 @@ bool ZIP_Wrapper::get_file (char* archive_path, char* filename,
   int j=unzLocateFile(uf, filename, 0);
   if (j==UNZ_END_OF_LIST_OF_FILE)
     {
-      DANCE_DEBUG (6, (LM_DEBUG, ACE_TEXT("File not found in zip archive")));
+      DANCE_ERROR (DANCE_LOG_ERROR,
+                   (LM_DEBUG, ACE_TEXT("File not found in zip archive")));
       return false;
     }
   else if (j==UNZ_OK)
@@ -141,8 +146,9 @@ bool ZIP_Wrapper::get_file (char* archive_path, char* filename,
       int k=unzOpenCurrentFile(uf);
       if (k!=UNZ_OK)
         {
-          DANCE_DEBUG (6, (LM_DEBUG, ACE_TEXT("Error in opening the current")
-                               ACE_TEXT(" file using unzOpenCurrentFile")));
+          DANCE_ERROR (DANCE_LOG_ERROR,
+                       (LM_DEBUG, ACE_TEXT("Error in opening the current")
+                        ACE_TEXT(" file using unzOpenCurrentFile")));
           return false;
         }
       else
@@ -188,8 +194,9 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
   uf = unzOpen(zip_archive);
   if (uf==0)
     {
-      DANCE_DEBUG (6, (LM_DEBUG,ACE_TEXT("unzOpen failed to open the")
-                 ACE_TEXT(" zipfile\n")));
+      DANCE_EROR (DANCE_LOG_ERROR,
+                  (LM_DEBUG,ACE_TEXT("unzOpen failed to open the")
+                   ACE_TEXT(" zipfile\n")));
       return false;
     }
   //get the name of the archive
@@ -213,14 +220,14 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
   int err = unzGetGlobalInfo(uf, &gi);
   if (err!=UNZ_OK)
     {
-      DANCE_DEBUG (6, (LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed to get global")
+      DANCE_ERROR (DANCE_LOG_ERROR, (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)
     {
-      DANCE_DEBUG (6, (LM_DEBUG,ACE_TEXT("error %d with zipfile in"
+      DANCE_ERROR (DANCE_LOG_ERROR, (LM_DEBUG,ACE_TEXT("error %d with zipfile in"
                  ACE_TEXT(" unzGoToFirstFile\n")), err));
       return false;
     }
@@ -235,9 +242,10 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
                                   sizeof(filename_inzip), 0, 0, 0, 0);
       if (err!=UNZ_OK)
         {
-          DANCE_DEBUG (6, (LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed")
-                               ACE_TEXT(" while trying to get information")
-                               ACE_TEXT(" about currentfile\n"), err));
+          DANCE_ERROR (DANCE_LOG_ERROR,
+                       (LM_DEBUG, ACE_TEXT("unzGetCurrentFileInfo failed")
+                        ACE_TEXT(" while trying to get information")
+                        ACE_TEXT(" about currentfile\n"), err));
           break;
         }
       int direc = checkdir(filename_inzip);
@@ -257,9 +265,10 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
           err = unzGoToNextFile(uf);
           if (err!=UNZ_OK)
             {
-              DANCE_ERROR (1, (LM_ERROR,ACE_TEXT("unzGoToNextFile failed")
-                                  ACE_TEXT(" while trying to go to")
-                                  ACE_TEXT(" nextfile\n"), err));
+              DANCE_ERROR (DANCE_LOG_ERROR,
+                           (LM_ERROR,ACE_TEXT("unzGoToNextFile failed")
+                            ACE_TEXT(" while trying to go to")
+                            ACE_TEXT(" nextfile\n"), err));
               break;
             }
         }
@@ -325,8 +334,9 @@ int ZIP_Wrapper::handlethefile (char* filename_inzip, unzFile uf,
   int k = unzOpenCurrentFile(uf);
   if (k!=UNZ_OK)
     {
-      DANCE_ERROR (1, (LM_ERROR,ACE_TEXT("unzOpenCurrentFile failed in"
-                                    " opening the current file")));
+      DANCE_ERROR (DANCE_LOG_ERROR,
+                   (LM_ERROR,ACE_TEXT("unzOpenCurrentFile failed in"
+                                      " opening the current file")));
       return false;
     }
   else
@@ -357,7 +367,7 @@ int ZIP_Wrapper::handlethefile (char* filename_inzip, unzFile uf,
       if (handle == ACE_INVALID_HANDLE)
         {
           unzClose(uf);
-          DANCE_ERROR_RETURN (1, (LM_ERROR,
+          DANCE_ERROR_RETURN (DANCE_LOG_ERROR, (LM_ERROR,
                              ACE_TEXT ("%p\n"),
                              ACE_TEXT ("[uncompress] file creation error")),
                              0);
@@ -366,10 +376,11 @@ int ZIP_Wrapper::handlethefile (char* filename_inzip, unzFile uf,
       if (ACE_OS::write (handle, &(*buffer), file_size) == -1)
         {
           unzClose(uf);
-          DANCE_ERROR_RETURN (1, (LM_ERROR,
-                             ACE_TEXT ("%p\n"),
-                             ACE_TEXT ("[uncompress] file write error")),
-                             0);
+          DANCE_ERROR_RETURN (DANCE_LOG_ERROR,
+                              (LM_ERROR,
+                               ACE_TEXT ("%p\n"),
+                               ACE_TEXT ("[uncompress] file write error")),
+                              0);
         }
       // Close the file handle
       ACE_OS::close (handle);
diff --git a/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp b/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp
index a60a62f9e54..c75d6f3a144 100644
--- a/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp
+++ b/DAnCE/dance/RepositoryManager/repository_manager_admin.cpp
@@ -24,32 +24,34 @@ namespace DAnCE
 
       try
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("Admin::install_package - ")
+          DANCE_DEBUG (DANCE_LOG_MAJOR_EVENT,
+                       (LM_TRACE, DLINFO ACE_TEXT ("Admin::install_package - ")
                         ACE_TEXT ("Installing package with URI: %s, name: %s\n"),
                         uri, name));
           this->rm_->installPackage (ACE_TEXT_ALWAYS_CHAR (name),
                                      ACE_TEXT_ALWAYS_CHAR (uri),
                                      replace);
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("Admin::install_package - ")
+          DANCE_DEBUG (DANCE_LOG_EVENT_TRACE,
+                       (LM_TRACE, DLINFO ACE_TEXT ("Admin::install_package - ")
                         ACE_TEXT ("Package installed successfully\n")));
         }
       catch (Deployment::NameExists &)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::install_package - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::install_package - ")
                         ACE_TEXT ("Package with name %s already installed.\n"),
                         name));
           return false;
         }
       catch (Deployment::PackageError &ex)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::install_package - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::install_package - ")
                         ACE_TEXT ("Internal error while installing package with name %s: %C - %C\n"),
                         name, ex.source.in (), ex.reason.in ()));
           return false;
         }
       catch (CORBA::Exception &ex)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::install_package - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::install_package - ")
                         ACE_TEXT ("Unexpected CORBA Exception while installing package with name: %s.  Reason: %C\n"),
                         name,
                         ex._info ().c_str ()));
@@ -57,7 +59,7 @@ namespace DAnCE
         }
       catch (...)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::install_package - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::install_package - ")
                         ACE_TEXT ("Unexpected C++ exception while installing package with name: %s\n"),
                         name));
           return false;
@@ -87,24 +89,26 @@ namespace DAnCE
 
       try
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
+          DANCE_DEBUG (DANCE_LOG_MAJOR_EVENT,
+                       (LM_TRACE, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
                         ACE_TEXT ("Attempting to uninstall package %s\n"),
                         uuid));
           this->rm_->deletePackage (ACE_TEXT_ALWAYS_CHAR (uuid));
-          DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
+          DANCE_DEBUG (DANCE_LOG_EVENT_TRACE,
+                       (LM_INFO, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
                         ACE_TEXT ("Successfully uninstalled package %s\n"),
                         uuid));
         }
       catch (Deployment::NoSuchName &)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
                         ACE_TEXT ("No package with the given UUID found: %s\n"),
                         uuid));
           return false;
         }
       catch (CORBA::Exception &ex)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
                         ACE_TEXT ("Unexpected CORBA Exception while uninstalling package with uuid: %s. Reason: %C\n"),
                         uuid,
                         ex._info ().c_str ()));
@@ -112,7 +116,7 @@ namespace DAnCE
         }
       catch (...)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::uninstall_package - ")
                         ACE_TEXT ("Unexpected C++ exception while installing package with uuid: %C\n"),
                         uuid));
           return false;
@@ -134,14 +138,14 @@ namespace DAnCE
         }
       catch (CORBA::Exception &ex)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::list_packages - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::list_packages - ")
                         ACE_TEXT ("Unexpected CORBA Exception while listing packages: %C\n"),
                         ex._info ().c_str ()));
           return 0;
         }
       catch (...)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::list_package - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::list_package - ")
                         ACE_TEXT ("Unexpected C++ exception while listing packages\n")));
           return 0;
         }
@@ -162,14 +166,14 @@ namespace DAnCE
         }
       catch (CORBA::Exception &ex)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::list_types - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::list_types - ")
                         ACE_TEXT ("Unexpected CORBA Exception while listing package types: %C\n"),
                         ex._info ().c_str ()));
           return 0;
         }
       catch (...)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::list_types - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::list_types - ")
                         ACE_TEXT ("Unexpected C++ exception while listing package types\n")));
           return 0;
         }
@@ -185,8 +189,8 @@ namespace DAnCE
 
       if (type == 0)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::find_by_type - ")
-                        ACE_TEXT ("Nill type passed to find_by_type\n")));
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::find_by_type - ")
+                                         ACE_TEXT ("Nill type passed to find_by_type\n")));
           return 0;
         }
 
@@ -197,7 +201,7 @@ namespace DAnCE
         }
       catch (CORBA::Exception &ex)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::find_by_type - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::find_by_type - ")
                         ACE_TEXT ("Unexpected CORBA Exception while listing packages of type %C: %C\n"),
                         type,
                         ex._info ().c_str ()));
@@ -205,7 +209,7 @@ namespace DAnCE
         }
       catch (...)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::find_by_type - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Admin::find_by_type - ")
                         ACE_TEXT ("Unexpected C++ exception while listing packages by type %C\n"),
                         type));
           return 0;
@@ -220,15 +224,18 @@ namespace DAnCE
     {
       DANCE_TRACE ("Admin::shutdown");
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("Admin::shutdown - ")
+      DANCE_DEBUG (DANCE_LOG_MAJOR_EVENT,
+                   (LM_TRACE, DLINFO ACE_TEXT ("Admin::shutdown - ")
                     ACE_TEXT ("Attempting to shut down Repository Manager\n")));
       CIAO::RepositoryManagerDaemon_var rmd =
         CIAO::RepositoryManagerDaemon::_narrow (this->rm_.in ());
-      DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT ("Admin::shutdown - ")
+      DANCE_DEBUG (DANCE_LOG_EVENT_TRACE,
+                   (LM_INFO, DLINFO ACE_TEXT ("Admin::shutdown - ")
                     ACE_TEXT ("Repository Manager shut down.\n")));
       if (CORBA::is_nil (rmd.in ()))
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Admin::shutdown - ")
+          DANCE_ERROR (DANCE_LOG_ERROR,
+                       (LM_ERROR, DLINFO ACE_TEXT ("Admin::shutdown - ")
                         ACE_TEXT ("Unable to narrow provided RM reference to a CIAO::RepositoryManagerDaemon\n")));
           return false;
         }
diff --git a/DAnCE/dance/RepositoryManager/repository_manager_admin_exec.cpp b/DAnCE/dance/RepositoryManager/repository_manager_admin_exec.cpp
index 0134f3d87e6..7f2f6a99e02 100644
--- a/DAnCE/dance/RepositoryManager/repository_manager_admin_exec.cpp
+++ b/DAnCE/dance/RepositoryManager/repository_manager_admin_exec.cpp
@@ -44,9 +44,11 @@ struct Options
         path_ = tmp.substring (begin, pos - begin);
       else
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Options::Installation::init - ")
-                      ACE_TEXT ("Installation directive missing name and replace parameters, ")
-                      ACE_TEXT ("must have form path,name,replace\n")));
+          DANCE_ERROR (DANCE_LOG_ERROR,
+                       (LM_ERROR, DLINFO
+                        ACE_TEXT ("Options::Installation::init - ")
+                        ACE_TEXT ("Installation directive missing name and replace parameters, ")
+                        ACE_TEXT ("must have form path,name,replace\n")));
           return false;
         }
 
@@ -58,9 +60,11 @@ struct Options
         name_ = tmp.substring (begin, pos - begin);
       else
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Options::Installation::init - ")
-                      ACE_TEXT ("Installation directive mssing replace parameter, ")
-                      ACE_TEXT ("must have form path,name,replace\n")));
+          DANCE_ERROR (DANCE_LOG_ERROR,
+                       (LM_ERROR, DLINFO
+                        ACE_TEXT ("Options::Installation::init - ")
+                        ACE_TEXT ("Installation directive mssing replace parameter, ")
+                        ACE_TEXT ("must have form path,name,replace\n")));
           return false;
         }
 
@@ -70,7 +74,7 @@ struct Options
       else if (tmp[begin] == '1') replace_ = true;
       else
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Options::Installation::init - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Options::Installation::init - ")
                       ACE_TEXT ("Replace directive muse be 1 or 0.\n")));
           return false;
         }
@@ -107,7 +111,7 @@ struct Options
         path_ = tmp.substring (begin, pos - begin);
       else
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Options::Creation::init - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Options::Creation::init - ")
                       ACE_TEXT ("Creation directive missing name, base location,  and replace parameters, ")
                       ACE_TEXT ("must have form path,name,base,replace\n")));
           return false;
@@ -121,7 +125,7 @@ struct Options
         name_ = tmp.substring (begin, pos - begin);
       else
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Options::Creation::init - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Options::Creation::init - ")
                       ACE_TEXT ("Creation directive mssing base location and replace parameter, ")
                       ACE_TEXT ("must have form path,name,base,replace\n")));
           return false;
@@ -134,7 +138,7 @@ struct Options
         base_location_ = tmp.substring (begin, pos - begin);
       else
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Options::Creation::init - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Options::Creation::init - ")
                       ACE_TEXT ("Creation directive mssing replace parameter, ")
                       ACE_TEXT ("must have form path,name,base,replace\n")));
           return false;
@@ -146,7 +150,7 @@ struct Options
       else if (tmp[begin] == '1') replace_ = true;
       else
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Options::Creation::init - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Options::Creation::init - ")
                       ACE_TEXT ("Replace directive muse be 1 or 0.\n")));
           return false;
         }
@@ -175,7 +179,8 @@ struct Options
 
   void usage (void)
   {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage:\n")
+    DANCE_ERROR (DANCE_LOG_EMERGENCY,
+                 (LM_DEBUG, ACE_TEXT ("usage:\n")
                 ACE_TEXT ("\t-h,--help\t\t\tThis message.\n")
                 ACE_TEXT ("\t-r,--rm-ior <ior>\t\tIOR where the RM instance may be found\n")
                 ACE_TEXT ("\t-i,--install <path>,<name>,<1|0>\tInstall package found at <path> into the RM, with <name>,\n")
@@ -222,7 +227,9 @@ struct Options
             break;
 
           case 'r':
-            DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Options::parse_args - ")
+            DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                         (LM_DEBUG, DLINFO
+                          ACE_TEXT ("Options::parse_args - ")
                           ACE_TEXT ("Using provided RM IOR: %C\n"),
                           get_opt.opt_arg ()));
             rm_ior_ = get_opt.opt_arg ();
@@ -236,11 +243,13 @@ struct Options
               }
 
             if (inst.replace_)
-              DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Options::parse_args - ")
+              DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                         (LM_DEBUG, DLINFO
                             ACE_TEXT ("Replacing installed package from path %C with name %C.\n"), inst.path_.c_str (),
                             inst.name_.c_str ()));
             else
-              DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Options::parse_args - ")
+              DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                         (LM_DEBUG, DLINFO
                             ACE_TEXT ("Installing package from path %C with name %C.\n"), inst.path_.c_str (),
                             inst.name_.c_str ()));
 
@@ -255,13 +264,15 @@ struct Options
               }
 
             if (create.replace_)
-              DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Options::parse_args - ")
+              DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                         (LM_DEBUG, DLINFO
                             ACE_TEXT ("Replacing installed package from path %C with name %C and base location %C.\n"),
                             create.path_.c_str (),
                             create.name_.c_str (),
                             create.base_location_.c_str ()));
             else
-              DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Options::parse_args - ")
+              DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                         (LM_DEBUG, DLINFO
                             ACE_TEXT ("Installing new package from path %C with name %C and base location %C.\n"),
                             create.path_.c_str (),
                             create.name_.c_str (),
@@ -271,25 +282,29 @@ struct Options
             break;
 
           case 'u':
-            DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Options::parse_args - ")
+            DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                         (LM_DEBUG, DLINFO
                           ACE_TEXT ("Removing package with UUID %C\n"), get_opt.opt_arg ()));
             this->uninstall_.insert (get_opt.opt_arg ());
             break;
 
           case 'l':
-            DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Options::parse_args - ")
+            DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                         (LM_DEBUG, DLINFO
                           ACE_TEXT ("Listing all packages.\n")));
             this->list_ = true;
             break;
 
           case 's':
-            DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Options::parse_args - ")
+            DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                         (LM_DEBUG, DLINFO
                           ACE_TEXT ("Shutting down the RM instance.\n")));
             this->shutdown_ = true;
             break;
 
           case 'd':
-            DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Options::parse_args - ")
+            DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                         (LM_DEBUG, DLINFO
                           ACE_TEXT ("Using provided Domain NC: %C\n"),
                           get_opt.opt_arg ()));
             domain_nc_ = get_opt.opt_arg ();
@@ -300,7 +315,7 @@ struct Options
               }
             else
               {
-                DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Options::parse_args - ")
+                DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("Options::parse_args - ")
                               ACE_TEXT ("Unknown long option: %C\n"),
                               get_opt.long_option ()));
                 this->usage ();
@@ -330,7 +345,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv)
           dlf->init (argc, argv);
         }
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO
+      DANCE_TRACE_LOG (DANCE_LOG_TRACE,
+                       (LM_TRACE, DLINFO
                     ACE_TEXT ("Module_main.h - initializing ORB\n")));
 
       CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
@@ -339,7 +355,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv)
       int const error = options.parse_args (argc, argv);
       if (error == -1)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
                         ACE_TEXT ("Failed to parse command line arguments.\n")));
         }
       else if (error == 1)
@@ -349,7 +365,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv)
 
       if (options.rm_ior_ == 0)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
                         ACE_TEXT ("No RepositoryManager IOR provided\n")));
           return -1;
         }
@@ -362,7 +378,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv)
 
       if (CORBA::is_nil (obj))
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
+          DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
                         ACE_TEXT ("Provided IOR was invalid or could not be narrowed: %s\n"),
                         options.rm_ior_));
           return -1;
@@ -411,17 +427,18 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv)
           ::CORBA::StringSeq * packages = admin.list_packages ();
           if (packages == 0)
             {
-              DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
+              DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
                             ACE_TEXT ("No packages returned from list_packages\n")));
               retval = -1;
             }
 
-          DANCE_DEBUG (6, (LM_EMERGENCY, ACE_TEXT ("Listing %u packages installed on server:\n")));
+          DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
+                       (LM_EMERGENCY, ACE_TEXT ("Listing %u packages installed on server:\n")));
 
           for (CORBA::ULong i = 0; i < packages->length (); ++i)
             {
-              DANCE_DEBUG (6, (LM_EMERGENCY, "\t%s\n",
-                            (*packages)[i].in ()));
+              DANCE_TRACE_LOG (DANCE_LOG_DETAILED_TRACE, (LM_TRACE, "\t%s\n",
+                                                          (*packages)[i].in ()));
             }
 
           delete packages;
@@ -429,7 +446,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv)
 
       if (options.shutdown_)
         {
-          DANCE_DEBUG (6, (LM_EMERGENCY, ACE_TEXT ("Shutting down the Repository Manager\n")));
+          DANCE_DEBUG (DANCE_LOG_MAJOR_EVENT,
+                       (LM_EMERGENCY, ACE_TEXT ("Shutting down the Repository Manager\n")));
           if (!admin.shutdown ())
             retval = -1;
         }
@@ -438,14 +456,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv)
     }
   catch (const CORBA::Exception &ex)
     {
-      DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
+      DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
                     ACE_TEXT ("Caught unexpected CORBA Exception: %s\n"),
                     ex._info ().c_str ()));
       return -1;
     }
   catch (...)
     {
-      DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
+      DANCE_ERROR (DANCE_LOG_ERROR, (LM_ERROR, DLINFO ACE_TEXT ("repository_manager_admin_exec::main - ")
                     ACE_TEXT ("Caught unexpected C++ exception.\n")));
       return -1;
     }