Mon Dec 4 07:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 32 insertions, 19 deletions

diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
index 530cfe44e5a..4d3f01dde1f 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
@@ -33,13 +33,15 @@ CIAO::DomainDataManager * CIAO::DomainDataManager::create (CORBA::ORB_ptr orb,
 }
 
 
-CIAO::DomainDataManager* CIAO::DomainDataManager::get_data_manager ()
+CIAO::DomainDataManager*
+CIAO::DomainDataManager::get_data_manager ()
 {
   return global_data_manager_;
 }
 
 
-void CIAO::DomainDataManager::delete_data_manger ()
+void
+CIAO::DomainDataManager::delete_data_manger ()
 {
   if (global_data_manager_)
     delete global_data_manager_;
diff --git a/CIAO/DAnCE/TargetManager/TargetManagerExt.idl b/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
index 3336f3ffe5c..025d8188e39 100644
--- a/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
+++ b/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
@@ -18,7 +18,6 @@
  * @brief The CIAO module
  */
 
-//#include <ciao/Deployment.idl>
 #include "DAnCE/Interfaces/NodeManagerDaemon.idl"
 
 module CIAO
diff --git a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl b/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
index 4e1d4572504..705a3146a75 100644
--- a/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
+++ b/CIAO/DAnCE/TargetManager/TargetManagerImpl.idl
@@ -10,15 +10,11 @@
 #ifndef TARGETMGR_IDL
 #define TARGETMGR_IDL
 
-
-
 #include "ciao/Components.idl"
 #include "ciao/Deployment_Target_Data.idl"
 #include "TargetManagerExt.idl"
-
 #include "DomainEvents.idl"
 
-
 /**
  * @module CIAO
  *
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
index fa14fe655c0..f947e1944d7 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
+++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
@@ -16,8 +16,6 @@
 
 #include "DomainEventsC.h"
 
-using namespace std;
-
 namespace CIDL_TargetManager_i
 {
   //==================================================================
@@ -30,7 +28,7 @@ namespace CIDL_TargetManager_i
                         TargetManagerImpl_Context *context
                        )
     : _exec (exec),
-      orb_ (orb),
+      orb_ (CORBA::ORB::_duplicate (orb)),
       context_ (context)
   {
     // The DomainDataManager created here ...
@@ -62,7 +60,7 @@ namespace CIDL_TargetManager_i
   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return  CIAO::DomainDataManager::
+    return CIAO::DomainDataManager::
       get_data_manager ()->get_initial_domain ();
   }
 
@@ -127,7 +125,10 @@ namespace CIDL_TargetManager_i
     if (updateKind == ::Deployment::Delete ||
         updateKind == ::Deployment::Add)
       {
-        ACE_DEBUG ((LM_DEBUG , "TM::Creating the changed event\n"));
+        if (CIAO::debug_level () > 9)
+          {
+            ACE_DEBUG ((LM_DEBUG , "TM::Creating the changed event\n"));
+          }
 
         CIAO::Domain_Changed_Event_var changed_event =
           new OBV_CIAO::Domain_Changed_Event ();
@@ -135,13 +136,25 @@ namespace CIDL_TargetManager_i
         ::Deployment::Domain_var temp_domain =
           new ::Deployment::Domain (domainSubset);
 
-        ACE_DEBUG ((LM_DEBUG , "TM::After getting the current domain\n"));
+        if (CIAO::debug_level () > 9)
+          {
+            ACE_DEBUG ((LM_DEBUG , "TM::After getting the current domain\n"));
+          }
+
         changed_event->changes (temp_domain);
         changed_event->change_kind (updateKind);
 
-        ACE_DEBUG ((LM_DEBUG , "TM::Sending the event to the Planner_Manager\n"));
+        if (CIAO::debug_level () > 9)
+          {
+            ACE_DEBUG ((LM_DEBUG , "TM::Sending the event to the Planner_Manager\n"));
+          }
+
         context_->push_changes (changed_event);
-        ACE_DEBUG ((LM_DEBUG , "TM::After   Sending the event to the Planner_Manager\n"));
+
+        if (CIAO::debug_level () > 9)
+          {
+            ACE_DEBUG ((LM_DEBUG , "TM::After   Sending the event to the Planner_Manager\n"));
+          }
       }
 
   }
@@ -191,6 +204,9 @@ namespace CIDL_TargetManager_i
   {
     // Your code here.
     ACE_DEBUG ((LM_DEBUG, "Get component cpu :: Skeleton Impl"));
+
+    // todo
+
     return 0;
   }
 
@@ -312,7 +328,7 @@ namespace CIDL_TargetManager_i
     {
       ACE_DEBUG ((LM_DEBUG , "Inside CCM_ACTIVATE\n"));
     }
-    get_targetMgr ();
+    this->get_targetMgr ();
   }
 
   void
@@ -372,7 +388,7 @@ namespace CIDL_TargetManager_i
   ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
-    ::Components::EnterpriseComponent::_nil ();
+      ::Components::EnterpriseComponent::_nil ();
 
     ACE_NEW_THROW_EX (
     retval,
@@ -387,7 +403,7 @@ namespace CIDL_TargetManager_i
   create_CIAO_TargetManagerHome_Impl (void)
   {
     ::Components::HomeExecutorBase_ptr retval =
-    ::Components::HomeExecutorBase::_nil ();
+      ::Components::HomeExecutorBase::_nil ();
 
     ACE_NEW_RETURN (
     retval,
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.h b/CIAO/DAnCE/TargetManager/TargetManager_exec.h
index 1b3b7b0e470..7c23c047992 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager_exec.h
+++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.h
@@ -190,7 +190,7 @@ namespace CIDL_TargetManager_i
     TargetManagerImpl_exec_i * _exec;
 
     ///The pointer to the Domain Manager
-    std::auto_ptr<CIAO::DomainDataManager> dataManager_;
+    auto_ptr<CIAO::DomainDataManager> dataManager_;
 
     /// The CORBA ORB ...
     CORBA::ORB_var orb_;