Thu Jul 8 16:59:26 2004 Jaiganesh B <jai@dre.vanderbilt.edu>

4 files changed, 25 insertions, 14 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 4e821ebd8c1..216ad0a2624 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,7 +1,16 @@
+Thu Jul  8 16:59:26 2004  Jaiganesh B  <jai@dre.vanderbilt.edu>
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
+        *
+          DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+        * DAnCE/NodeManager/NodeDaemon_Impl.cpp:
+
+          Fix build errors.
+
 Thu Jul  8 16:53:06 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * CIDLC/ServantSourceGenerator.cpp:
-        
+
           Moved the call to populate_port_tables() from the
           component servant constructor to the end of
           the ciao_postactivate() method in the component servant,
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
index 0224dda614f..648a4e7d053 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
@@ -6,7 +6,7 @@ project (DomainApplicationManager): taolib, ciao_deployment_stub, ciao_deploymen
   
   sharedname = DomainApplicationManager
   dynamicflags   = DOMAINAPPLICATIONMANAGER_BUILD_DLL
-  libs += TAO_Valuetype CIAO_DnC_Client CIAO_DnC_Server Config_Handlers TAO_IFR_Client
+  libs += TAO_Valuetype CIAO_DnC_Client CIAO_DnC_Server TAO_IFR_Client
  
   Source_Files {
     DomainApplicationManager_Impl.cpp
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index fc7b1409177..7f07705f78a 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -3,9 +3,6 @@
 #include "DomainApplicationManager_Impl.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
-
-#include "CIAO/DAnCE/Config_Handlers/DnC_Dump.h"
-
 #include "NodeManager/NodeDaemonC.h"
 
 #if !defined (__ACE_INLINE__)
@@ -33,6 +30,7 @@ DomainApplicationManager_Impl (CORBA::ORB_ptr orb,
     deployment_file_ (CORBA::string_dup (deployment_file)),
     deployment_config_ (orb)
 {
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_NEW_THROW_EX (this->all_connections_,
                     Deployment::Connections (),
                     CORBA::NO_MEMORY ());
@@ -90,7 +88,7 @@ init (ACE_ENV_SINGLE_ARG_DECL)
           if (CIAO::debug_level () > 1)
             {
               // The dump() function is broken.
-              Deployment::DnC_Dump::dump (artifacts.child_plan_);
+              //Deployment::DnC_Dump::dump (artifacts.child_plan_);
             }
 
           // Call preparePlan() method on the NodeManager with the
@@ -411,7 +409,7 @@ startLaunch (const ::Deployment::Properties & configProperty,
     }
   ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK;
 }
 
 void
@@ -476,7 +474,7 @@ finishLaunch (::CORBA::Boolean start
     }
   ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK;
 }
 
 void
@@ -503,7 +501,7 @@ start (ACE_ENV_SINGLE_ARG_DECL)
           ::Deployment::NodeApplication_var my_na =
             (entry->int_id_).node_application_.in ();
 
-          my_na->start (ACE_ENV_ARG_PARAMETER);
+          my_na->start ();
           ACE_TRY_CHECK;
         }
     }
@@ -515,7 +513,7 @@ start (ACE_ENV_SINGLE_ARG_DECL)
     }
   ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK;
 }
 
 void
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp
index 1012a9bf4b3..c63e468cc04 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp
@@ -20,6 +20,7 @@ CIAO::NodeDaemon_Impl::NodeDaemon_Impl (const char *name,
     spawn_delay_ (spawn_delay),
     manager_ (Deployment::NodeApplicationManager::_nil ())
 {
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
   {
     //create the call back poa for NAM.
@@ -74,7 +75,8 @@ CIAO::NodeDaemon_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 void
 CIAO::NodeDaemon_Impl::joinDomain (const Deployment::Domain & ,
                                    Deployment::TargetManager_ptr ,
-                                   Deployment::Logger_ptr)
+                                   Deployment::Logger_ptr
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::NO_IMPLEMENT ());
@@ -90,7 +92,8 @@ CIAO::NodeDaemon_Impl::leaveDomain (ACE_ENV_SINGLE_ARG_DECL)
 
 
 Deployment::NodeApplicationManager_ptr
-CIAO::NodeDaemon_Impl::preparePlan (const Deployment::DeploymentPlan &plan)
+CIAO::NodeDaemon_Impl::preparePlan (const Deployment::DeploymentPlan &plan
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError,
                    Deployment::PlanError))
@@ -130,7 +133,7 @@ CIAO::NodeDaemon_Impl::preparePlan (const Deployment::DeploymentPlan &plan)
       if (CORBA::is_nil (this->manager_.in ()))
         {
           ACE_DEBUG ((LM_DEBUG, "NodeDaemon_Impl:preparePlan: NodeApplicationManager ref is nil\n"));
-          ACE_THROW (Deployment::StartError ());
+          ACE_THROW_RETURN (Deployment::StartError (), 0);
         }
     }
 
@@ -149,7 +152,8 @@ CIAO::NodeDaemon_Impl::preparePlan (const Deployment::DeploymentPlan &plan)
 }
 
 void
-CIAO::NodeDaemon_Impl::destroyManager (Deployment::NodeApplicationManager_ptr)
+CIAO::NodeDaemon_Impl::destroyManager (Deployment::NodeApplicationManager_ptr
+                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError))
 {
   ACE_TRY