ChangeLogTag: Thu Mar 09 08:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 14 insertions, 9 deletions

diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index 837c6b4291d..070e7da80bf 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -28,18 +28,23 @@
 #include "ace/Vector_T.h"
 #include "ace/Functor.h"
 #include "ace/OS_NS_string.h"
-#include "DeploymentS.h"
+#include "ciao/DomainApplicationManagerS.h"
+#include "ciao/Deployment_common.h"
 
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 
 #include "Deployment_Configuration.h"
 #include "DomainApplicationManager_Export.h"
-#include "ExecutionManager/Execution_Manager_Impl.h"
 #include "ciao/CIAO_common.h"
 
 namespace CIAO
 {
+  namespace Execution_Manager
+  {
+    class Execution_Manager_Impl;
+  }
+
   /**
    * @class DomainApplicationManager_Impl
    *
@@ -58,7 +63,7 @@ namespace CIAO
     // port objrefs of components within this plan
     enum Connection_Search_Type
       {
-        External_Connections, 
+        External_Connections,
         Internal_Connections
       };
 
@@ -220,7 +225,7 @@ namespace CIAO
 
     // The input parameter is a *new_plan* which has the
     // same UUID of the existing running plan.
-    virtual void 
+    virtual void
     perform_redeployment (
       const Deployment::DeploymentPlan & plan
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -256,12 +261,12 @@ namespace CIAO
 
     /**
      * Construct <Component_Binding_Info> struct for the component instance.
-     * 
+     *
      * @para name component instance name
      * @para child_uuid child plan uuid string
      */
     CIAO::Component_Binding_Info *
-      populate_binding_info (const ACE_CString& name, 
+      populate_binding_info (const ACE_CString& name,
                              const ACE_CString& child_uuid);
 
     /**
@@ -281,9 +286,9 @@ namespace CIAO
     void synchronize_shared_components_with_node_managers (void);
 
     /**
-     * A helper function to add a list of shared components into 
+     * A helper function to add a list of shared components into
      * the cached shared component list.
-     * 
+     *
      * @para shared A list of shared components to be added.
      */
     void add_shared_components (const Deployment::ComponentPlans & shared);
@@ -291,7 +296,7 @@ namespace CIAO
     /**
      * A private function to check whether a component is in the shared
      * component list.
-     * 
+     *
      * @para name The name of a component instance.
      */
     bool is_shared_component (const char * name);