4 files changed, 50 insertions, 29 deletions
diff --git a/DAnCE/TargetManager/DomainDataManager.cpp b/DAnCE/TargetManager/DomainDataManager.cpp
index 69ca5d6b9c7..663171c6981 100644
--- a/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/DAnCE/TargetManager/DomainDataManager.cpp
@@ -20,6 +20,17 @@ CIAO::DomainDataManager * CIAO::DomainDataManager::create (CORBA::ORB_ptr orb,
   return global_data_manager_;
 }
 
+//static DomainDataManager * CIAO::DomainDataManager::create (CORBA::ORB_ptr orb,
+//                            ::Deployment::TargetManagerExt_ptr target
+//                            )
+//{
+//  if (global_data_manager_ == 0)
+//    {
+//      global_data_manager_ = new DomainDataManager (orb , target);
+//    }
+//  return global_data_manager_;
+//}
+
 // Returns the pointer to the static variable
 CIAO::DomainDataManager*
 CIAO::DomainDataManager::get_data_manager ()
@@ -27,7 +38,6 @@ CIAO::DomainDataManager::get_data_manager ()
   return global_data_manager_;
 }
 
-
 void
 CIAO::DomainDataManager::delete_data_manger ()
 {
@@ -35,6 +45,30 @@ CIAO::DomainDataManager::delete_data_manger ()
     delete global_data_manager_;
 }
 
+CIAO::DomainDataManager::
+DomainDataManager (CORBA::ORB_ptr orb,
+                   ::Deployment::TargetManager_ptr target)
+  : orb_ (CORBA::ORB::_duplicate (orb)),
+    deployment_config_ (orb_.in()),
+    target_mgr_ (::Deployment::TargetManager::_duplicate(target))
+{
+  CIAO::Config_Handlers::DD_Handler dd (domain_file_name);
+  ::Deployment::Domain* dmn = dd.domain_idl ();
+
+  if (CIAO::debug_level () > 9)
+    ::Deployment::DnC_Dump::dump (*dmn);
+
+  current_domain_ = *dmn;
+  initial_domain_ = current_domain_;
+
+  // initialize the provisioning domain
+  provisioned_data_ = initial_domain_;
+
+  update_node_status ();
+
+  call_all_node_managers ();
+}
+
 int CIAO::DomainDataManager::update_domain (
                              const ::CORBA::StringSeq &,
                              const ::Deployment::Domain & domainSubset,
@@ -88,29 +122,6 @@ int CIAO::DomainDataManager::update_domain (
   return 0;
 }
 
-CIAO::DomainDataManager::
-DomainDataManager (CORBA::ORB_ptr orb,
-                   ::Deployment::TargetManager_ptr target)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    deployment_config_ (orb_.in()),
-    target_mgr_ (::Deployment::TargetManager::_duplicate(target))
-{
-  CIAO::Config_Handlers::DD_Handler dd (domain_file_name);
-  ::Deployment::Domain* dmn = dd.domain_idl ();
-
-  if (CIAO::debug_level () > 9)
-    ::Deployment::DnC_Dump::dump (*dmn);
-
-  current_domain_ = *dmn;
-  initial_domain_ = current_domain_;
-
-  // initialize the provisioning domain
-  provisioned_data_ = initial_domain_;
-
-  update_node_status ();
-
-  call_all_node_managers ();
-}
 
 ::Deployment::Domain* CIAO::DomainDataManager::get_current_domain ()
 {
diff --git a/DAnCE/TargetManager/DomainDataManager.h b/DAnCE/TargetManager/DomainDataManager.h
index e32ba09a6d0..7669b91d9de 100644
--- a/DAnCE/TargetManager/DomainDataManager.h
+++ b/DAnCE/TargetManager/DomainDataManager.h
@@ -79,6 +79,20 @@ namespace CIAO
                                   );
 
       /**
+       * This function calls the constructor of the
+       * class Domain Data Manager. It is the same as the function above
+       * only the parameter TargetManagerExt_ptr is different
+       *
+       * @brief This function is called to create the Datamanager
+       * @param orb The orb pointer
+       * @param target The Target Manager Extension Object Reference
+       *
+       */
+//      static DomainDataManager * create (CORBA::ORB_ptr orb,
+//                                  ::Deployment::TargetManagerExt_ptr target
+//                                  );
+
+      /**
        * @brief Returns the static pointer to the
        *        data manager.
        * @return DomainDataManager*
@@ -134,7 +148,7 @@ namespace CIAO
        void releaseResourceAllocation (
            const ::Deployment::ResourceAllocations & resources);
 
-      private:
+      protected:
 
       /**
        * The constructor made protected so that no one can create
diff --git a/DAnCE/TargetManager/TargetManager.mpc b/DAnCE/TargetManager/TargetManager.mpc
index a4a03cca6a4..c0d7f90c77a 100644
--- a/DAnCE/TargetManager/TargetManager.mpc
+++ b/DAnCE/TargetManager/TargetManager.mpc
@@ -10,13 +10,11 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub, ciao_no
 
   IDL_Files {
     TargetManagerImpl.idl
-    TargetManagerExt.idl
     DomainEvents.idl
   }
 
   Source_Files {
     TargetManagerImplC.cpp
-    TargetManagerExtC.cpp
     DomainEventsC.cpp
   }
 }
@@ -40,7 +38,6 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc, ciao_targetmanager_stub {
   Source_Files {
     TargetManagerEC.cpp
     TargetManagerImplS.cpp
-    TargetManagerExtS.cpp
     TargetManager_svnt.cpp
     DomainEventsS.cpp
   }
diff --git a/DAnCE/TargetManager/TargetManagerImpl.idl b/DAnCE/TargetManager/TargetManagerImpl.idl
index 484b1e53d20..cdd747a4228 100644
--- a/DAnCE/TargetManager/TargetManagerImpl.idl
+++ b/DAnCE/TargetManager/TargetManagerImpl.idl
@@ -12,7 +12,6 @@
 
 #include "ciao/Components.idl"
 #include "DAnCE/Deployment/Deployment_PlanError.idl"
-#include "DAnCE/TargetManager/TargetManagerExt.idl"
 #include "DAnCE/TargetManager/DomainEvents.idl"
 
 module CIAO