Mon Dec 21 18:26:04 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp
        * ciao/ComponentServer/CIAO_ComponentServer.cpp
        * ciao/ComponentServer/CIAO_ComponentServer.mpc
        * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp
        * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp
        * ciao/ComponentServer/CIAO_Container_Impl.cpp
        * ciao/ComponentServer/CIAO_RTComponentServer.cpp
        * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp
        * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp
        * ciao/ComponentServer/Client_init.cpp
        * ciao/Containers/CIAO_Servant_Activator.mpc
        * ciao/Containers/Servant_Activator.cpp
        * ciao/Containers/Session/Session_Container.cpp
        * ciao/Logger/File_Logger_Backend.cpp
        * ciao/Logger/File_Logger_Backend.h
        * ciao/Logger/Log_Macros.cpp
        * ciao/Logger/Log_Macros.h
        * ciao/Logger/Logger.mpc
        * ciao/Logger/Logger_Service.cpp
        * ciao/Logger/Logger_Service.h
        * ciao/Servants/Home_Servant_Impl_T.cpp
        * ciao/Servants/Servant_Impl_Base.cpp
        * ciao/Servants/Servant_Impl_T.cpp
        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp
        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp
        * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp
        * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp
        * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp
        * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp
        * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp
        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp
        * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp
        * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
        * connectors/dds4ccm/impl/ndds/Getter_T.cpp
        * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp
        * connectors/dds4ccm/impl/ndds/ndds_impl.mpc
        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp
        * connectors/dds4ccm/impl/ndds/Publisher.cpp
        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
        * connectors/dds4ccm/impl/ndds/Reader_T.cpp
        * connectors/dds4ccm/impl/ndds/Subscriber.cpp
        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp
        * connectors/dds4ccm/impl/ndds/Writer_T.cpp
        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp
        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
        * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
        * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp
        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp
        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
        * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
        * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp
        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
        * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
        * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
        * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
        * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
        * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp
        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
        * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
        * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp
        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
        * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp
        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
        * DAnCE/Deployment/Module_Main.h
        * DAnCE/DomainApplication/Domain_Application_Impl.cpp
        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
        * DAnCE/DomainApplicationManager/Node_Locator.cpp
        * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp
        * DAnCE/Logger/File_Logger_Backend.cpp
        * DAnCE/Logger/Log_Macros.cpp
        * DAnCE/Logger/Log_Macros.h
        * DAnCE/Logger/Logger.mpc
        * DAnCE/Logger/Logger_Service.cpp
        * DAnCE/Logger/Logger_Service.h
        * DAnCE/MPC/config/dance_cdmw_idl.mpb
        * DAnCE/MPC/config/dance_mocks.mpb
        * DAnCE/MPC/config/dance_plan_generator.mpb
        * DAnCE/MPC/config/dance_plan_launcher.mpb
        * DAnCE/MPC/config/dance_plan_launcher_base.mpb
        * DAnCE/MPC/config/dance_repositorymanager.mpb
        * DAnCE/MPC/config/dance_targetmanager.mpb
        * DAnCE/MPC/config/dance_utils.mpb
        * DAnCE/NodeApplication/ComponentAttributesSetter.cpp
        * DAnCE/NodeApplication/Name_Utilities.cpp
        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
        * DAnCE/NodeApplication/ServerActivator_Impl.cpp
        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
        * DAnCE/NodeManager/Node_Manager_Module.cpp
        * DAnCE/NodeManager/NodeManager_Impl.cpp
        * DAnCE/Plan_Generator/PCVisitor.cpp
        * DAnCE/Plan_Generator/Plan_Generator.mpc
        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp
        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
        * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp
        * DAnCE/RedirectionService/CCMObjectLocator.cpp
        * DAnCE/RedirectionService/NameServiceRedirection.cpp
        * DAnCE/RedirectionService/RedirectionService.cpp
        * DAnCE/RepositoryManager/PC_Updater.cpp
        * DAnCE/RepositoryManager/repository_manager_admin.cpp
        * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
        * DAnCE/RepositoryManager/Repository_Manager_Module.cpp
        * DAnCE/RepositoryManager/RepositoryManager.cpp
        * DAnCE/RepositoryManager/RepositoryManager.mpc
        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
        * DAnCE/RepositoryManager/RM_Helper.cpp
        * DAnCE/RepositoryManager/URL_Parser.cpp
        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp
        * DAnCE/Starter/Starter.cpp
        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
        * DAnCE/TargetManager/CmpClient.cpp
        * DAnCE/TargetManager/DomainDataManager.cpp
        * DAnCE/TargetManager/Target_Manager_Module.cpp
        * DAnCE/TargetManager/TargetManager.mpc
        * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp
        * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp
        * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp
        * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp
        * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp
        * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp
        * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp
        * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp
        * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp
        * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp
        * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp
        * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp
        * DAnCE/tests/DeploymentPlanDump/test.cpp
        * DAnCE/tests/DeploymentPlanTestReferences/test.cpp
        * DAnCE/tests/DeploymentTest1/test.cpp
        * DAnCE/tests/NameServiceTest/clt_main.cpp
        * DAnCE/tests/NameServiceTest/srv_main.cpp
        * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp
        * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp
        * DAnCE/tests/ObjectLocatorTest/clt_main.cpp
        * DAnCE/tests/ObjectLocatorTest/srv_main.cpp
        * DAnCE/tests/RedirectionServiceTest/clt_main.cpp
        * DAnCE/tests/RedirectionServiceTest/srv_main.cpp
        * DAnCE/Utils/DAnCE_Utils.mpc
        * DAnCE/Utils/Plan_Handler.cpp
        * MPC/config/ciao_cs_client.mpb
        * MPC/config/ciao_servant_activator.mpb
        * MPC/config/dds4ccm_impl.mpb
        * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
        * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
        * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
        * tools/Config_Handlers/XML_File_Intf.cpp
          CIAO_DEBUG/CIAO_ERROR/DANCE_DEBUG/DANCE_ERROR now have a level
          as first argument. This controls at which level (and higher) the
          message is printed. DDS4CCM will get its own level very soon.
          All example/test code should use ACE_ERROR/ACE_DEBUG, these
          are always printed.
          Also cleaned up several base projects and various global search
          and replace on layout, typos, and more

1 files changed, 48 insertions, 48 deletions

diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index 5a15c0f2d85..8818a84e61f 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -63,7 +63,7 @@ namespace
 
 namespace DAnCE
 {
-  
+
   //-----------------------------------------------------------------
   //Constructor
   //
@@ -140,12 +140,12 @@ 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 ((LM_ERROR, "Failed to add the type\n"));
+          DANCE_ERROR (1, (LM_ERROR, "Failed to add the type\n"));
       }
-    
+
     CIAO::Config_Handlers::XML_Helper::_path_resolver.add_path (ACE_TEXT ("CIAO_ROOT"),
                                                                 ACE_TEXT ("/docs/schema/"));
-    
+
   }
 
   //-----------------------------------------------------------------
@@ -190,7 +190,7 @@ namespace DAnCE
     PCEntry *entry = 0;
     if (this->names_.find (ACE_CString (installationName), entry) == 0)
       {
-        DANCE_DEBUG ((LM_INFO, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+        DANCE_DEBUG (8, (LM_INFO, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                       "Found package %s already installed.\n"));
         if (!replace)
           throw Deployment::NameExists ();
@@ -215,23 +215,23 @@ namespace DAnCE
 
     ACE_CString descriptor_dir (path);
     descriptor_dir += "/descriptors/"; //location of the descriptor directory
-    
-    DANCE_DEBUG ((LM_DEBUG, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+
+    DANCE_DEBUG (6, (LM_DEBUG, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                   "Package Path: %s\n",
                   package_path.c_str ()));
-    DANCE_DEBUG ((LM_DEBUG, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+    DANCE_DEBUG (6, (LM_DEBUG, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                   "Descriptor path: %s\n",
                   descriptor_dir.c_str ()));
-    
+
     //check if URL or local file
     //download or load into memory
 
     if (ACE_OS::strstr (location, "http://"))
       {
-        DANCE_DEBUG ((LM_INFO, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+        DANCE_DEBUG (8, (LM_INFO, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                       "Downloading package over HTTP: %s\n",
                       location));
-        
+
         ACE_Message_Block* mb = 0;
         ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::NO_MEMORY ());
 
@@ -242,7 +242,7 @@ namespace DAnCE
               {
                 throw CORBA::INTERNAL ();
               }
-            
+
             // Write file to designated location on disk
             if (!RM_Helper::write_to_disk (package_path.c_str (), *mb))
               {
@@ -253,10 +253,10 @@ namespace DAnCE
           }
         catch (...)
           {
-            DANCE_ERROR ((LM_ERROR, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+            DANCE_ERROR (1, (LM_ERROR, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                           "Caught unexpected exception while fetching path %s\n",
                           location));
-            
+
             mb->release ();
             throw;
           }
@@ -267,12 +267,12 @@ namespace DAnCE
           throw CORBA::INTERNAL ();
       }
 
-    
-    DANCE_DEBUG ((LM_TRACE, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+
+    DANCE_DEBUG (9, (LM_TRACE, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                   "Uncompressing file %s to directory %s\n",
                   package_path.c_str (),
                   this->install_root_.c_str ()));
-    
+
     ZIP_Wrapper::uncompress (const_cast<char*> (package_path.c_str ()),
                              const_cast<char*> (this->install_root_.c_str ()),
                              false //not verbose
@@ -287,7 +287,7 @@ namespace DAnCE
     //if the PackageConfiguration name cannot be found, then there is nothing to install
     if (pc_name == "")
       {
-        DANCE_ERROR ((LM_ERROR, DLINFO "RepositoryManagerDaemon_i::installPackage - "
+        DANCE_ERROR (1, (LM_ERROR, DLINFO "RepositoryManagerDaemon_i::installPackage - "
                       "Unable to find PC name %s in path %s\n",
                       pc_name.c_str (),
                       package_path.c_str ()));
@@ -336,7 +336,7 @@ namespace DAnCE
 
     if (!updater.update (pc))
       {
-        DANCE_DEBUG ((LM_ERROR, DLINFO "[RM] problem updating the PackageConfiguration!\n"));
+        DANCE_DEBUG (6, (LM_ERROR, DLINFO "[RM] problem updating the PackageConfiguration!\n"));
 
         //clean the extracted files
         remove_extracted_package (path.c_str ());
@@ -354,7 +354,7 @@ namespace DAnCE
     //insert the package into the database
     if (this->names_.bind (ACE_CString (installationName), path) == -1)
       {
-        DANCE_ERROR ((LM_ERROR,
+        DANCE_ERROR (1, (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)
       {
-        DANCE_ERROR ((LM_ERROR,
+        DANCE_ERROR (1, (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))
-      DANCE_ERROR ((LM_ERROR, "Failed to add the type\n"));
+      DANCE_ERROR (1, (LM_ERROR, "Failed to add the type\n"));
 
     this->dump ();
 
     this->save ();
 
-    DANCE_DEBUG ((LM_INFO,
+    DANCE_DEBUG (8, (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))
       {
-        DANCE_ERROR ((LM_ERROR, "[RM] problem updating the PackageConfiguration!\n"));
+        DANCE_ERROR (1, (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)
       {
-        DANCE_ERROR ((LM_ERROR,
+        DANCE_ERROR (1, (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)
       {
-        DANCE_ERROR ((LM_ERROR,
+        DANCE_ERROR (1, (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))
-      DANCE_ERROR ((LM_ERROR, "Failed to add the type\n"));
+      DANCE_ERROR (1, (LM_ERROR, "Failed to add the type\n"));
 
     this->dump ();
 
     this->save ();
 
-    DANCE_DEBUG ((LM_INFO,
+    DANCE_DEBUG (8, (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 ();
 
-    DANCE_DEBUG ((LM_INFO, "Successfully looked up \'%s\'.\n", name));
+    DANCE_DEBUG (8, (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 ();
 
-    DANCE_DEBUG ((LM_INFO, "Successfully looked up %s.\n", UUID));
+    DANCE_DEBUG (8, (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 ());
       }
 
-    DANCE_DEBUG ((LM_INFO, "The number of packages %d\n", seq->length ()));
+    DANCE_DEBUG (8, (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 ());
       }
 
-    DANCE_DEBUG ((LM_DEBUG, "The number of types: %d\n", num_entries));
+    DANCE_DEBUG (6, (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)
       {
-        DANCE_ERROR ((LM_ERROR,
+        DANCE_ERROR (1, (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 ()))
       {
-        DANCE_ERROR ((LM_ERROR, "Could not reincarnate PC\n"));
+        DANCE_ERROR (1, (LM_ERROR, "Could not reincarnate PC\n"));
         internal_err = true;
       }
 
     if (this->uuids_.unbind (ACE_CString (pc->UUID)) == -1)
       {
-        DANCE_ERROR ((LM_ERROR, "Could not remove UUID\n"));
+        DANCE_ERROR (1, (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 ((LM_ERROR, "Could not remove type\n"));
+        DANCE_ERROR (1, (LM_ERROR, "Could not remove type\n"));
         internal_err = true;
       }
 
@@ -834,7 +834,7 @@ namespace DAnCE
     if (internal_err)
       throw CORBA::INTERNAL ();
     else
-      DANCE_DEBUG ((LM_INFO, "Successfully deleted \'%s\'\n", installationName));
+      DANCE_DEBUG (8, (LM_INFO, "Successfully deleted \'%s\'\n", installationName));
 
   }
 
@@ -861,7 +861,7 @@ namespace DAnCE
                                   pcd_name) < 0)
       {
         ACE_OS::chdir (this->cwd_);
-        DANCE_ERROR ((LM_ERROR,
+        DANCE_ERROR (1, (LM_ERROR,
                     "(%P|%t) RepositoryManager: error extracting necessary files\n"));
         throw CORBA::INTERNAL ();
       }
@@ -875,7 +875,7 @@ namespace DAnCE
       }
     catch (...)
       {
-        DANCE_ERROR ((LM_ERROR,
+        DANCE_ERROR (1, (LM_ERROR,
                     "(%P|%t) RepositoryManager: Error parsing the PCD\n"));
 
         //change back the the old working dir
@@ -942,7 +942,7 @@ namespace DAnCE
   {
     //change the working dir
     ACE_OS::chdir (descriptor_dir);
-    
+
     Deployment::PackageConfiguration_var pc = new Deployment::PackageConfiguration ();
     //parse the PCD to make sure that there are no package errors
     try
@@ -951,7 +951,7 @@ namespace DAnCE
       }
     catch (...)
       {
-        DANCE_ERROR ((LM_ERROR,
+        DANCE_ERROR (1, (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))
               {
-                DANCE_ERROR ((LM_ERROR,
+                DANCE_ERROR (1, (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))
               {
-                DANCE_ERROR ((LM_ERROR,
+                DANCE_ERROR (1, (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))
               {
-                DANCE_ERROR ((LM_ERROR,
+                DANCE_ERROR (1, (LM_ERROR,
                             "[RM::remove_descriptor_files] Unable to remove file from disk!\n"));
                 return_code = 0;
               }
@@ -1114,7 +1114,7 @@ namespace DAnCE
         temp += directory->d_name;
         switch (stat_buf.st_mode & S_IFMT)
           {
-          case S_IFREG: // Either a regular file or an executable.   
+          case S_IFREG: // Either a regular file or an executable.
             remove (temp.c_str ());
             break;
 
@@ -1126,9 +1126,9 @@ namespace DAnCE
             break;
           }
       }
-    
+
     ACE_OS::chdir (full_path);
-    
+
     ACE_OS::rmdir (path);
 
     return 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)
-                  DANCE_DEBUG ((LM_DEBUG, "Could not find type %s with package name %s!\n",
+                  DANCE_DEBUG (6, (LM_DEBUG, "Could not find type %s with package name %s!\n",
                               ACE_CString (supportedTypes[i]).c_str (),
                               name));
               }