ChangeLogTag: Mon Apr 10 12:06:00 2006 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 21 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 0f69441ad04..f76d29141fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 10 12:28:00 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ciao_server_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
+          Added ciao_events_dnc
+
 Mon Apr 10 12:06:00 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb:
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index dd60d268883..7e5ffea6540 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -1,12 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(ExecutionManager): ciao_deployment_stub, dance_extension_stub {
-
+project(ExecutionManager): ciao_server_dnc, dance_extension_stub, ciao_domainapplicationmanager_dnc {
   exename = Execution_Manager
 
-  after += DomainApplicationManager ExecutionManager_stub
-  libs += DomainApplicationManager ExecutionManager_stub
+  after += ExecutionManager_stub
+  libs += ExecutionManager_stub
 
   IDL_Files {
   }
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index 1d9b07d6cb7..79952a516dc 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(NodeApplication): ciao_component_dnc {
+project(NodeApplication): ciao_server_dnc {
   after += NoOp_Configurator
   libs  += CIAO_NoOp_Configurator
   exename   = NodeApplication
@@ -23,8 +23,8 @@ project(NoOp_Configurator): ciao_component_dnc {
     NoOp_Configurator.cpp
   }
 }
-    
-project(RTNA_Configurator): ciao_component_dnc, rt_server {
+
+project(RTNA_Configurator): ciao_deployment_stub, rt_server {
   sharedname   = CIAO_RTNA_Configurator
   dynamicflags = CIAO_RTNA_CONFIGURATOR_BUILD_DLL
 
@@ -32,4 +32,4 @@ project(RTNA_Configurator): ciao_component_dnc, rt_server {
     RTNodeApp_Configurator.cpp
     RTConfig_Manager.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index 4f4e2e6478a..de258cedd5a 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(NodeApplicationManager): ciao_component_dnc, ciao_deployment_svnt, dance_extension_stub {
+project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_extension_stub {
 
   sharedname   = NodeApplicationManager
   after       += NodeManager_stub CIAO_TargetManager_stub
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
index 65c26b4adaf..d5338b6c140 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 //For static D&C, the NodeManager should be available as a linkable library
-project(NodeManager_svnt): ciao_component_dnc, iortable, ifr_client, dance_extension_stub  {
+project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub  {
   sharedname = NodeManager
   after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NoOp_Configurator
   libs += NodeManager_stub NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator
@@ -21,7 +21,7 @@ project(NodeManager_svnt): ciao_component_dnc, iortable, ifr_client, dance_exten
   }
 }
 
-project(NodeManager): ciao_component_dnc, iortable, ifr_client, dance_extension_stub  {
+project(NodeManager): ciao_server_dnc, iortable, ifr_client, dance_extension_stub  {
   after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NodeManager_svnt
   libs += NodeManager_stub NodeManager NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator
   includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/TargetManager
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
index a44a4039749..0a8a72fdb43 100644
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
+++ b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
@@ -1,12 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers {
+project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions {
   exename   = StaticDAnCEParser
-  requires += exceptions
   includes += ..
-  libs     += TAO_IORTable NodeApplicationManager DomainApplicationManager
-  after    += TAO_IORTable NodeApplicationManager DomainApplicationManager NodeManager 
+  libs     += NodeApplicationManager
+  after    += NodeApplicationManager NodeManager
 
   Source_Files {
     StaticDAnCEParser.cpp
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 869d416e7f2..8a3a2f5ef51 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -50,7 +50,6 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype,
     CCM_Container_Ex.idl
     SwapExec.idl
     UpgradeableContext.idl
-    // ServerResources.idl
   }
 
   Source_Files {
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
index 8af458326d8..0ea0c5e2275 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_deployment_stub, portableserver {
+project : ciao_deployment_stub, portableserver, ciao_events_dnc {
   after += Deployment_svnt
   libs  += CIAO_Deployment_svnt
   includes += $(CIAO_ROOT)/DAnCE/ciao
diff --git a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
index 37cc21b79e5..380c9d22c90 100644
--- a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : ciao_client_dnc, ciao_deployment_svnt, utils, naming {
+project : ciao_client_dnc, ciao_deployment_svnt, utils, naming, ciao_events_dnc {
   after += CIAO_DnC_Server
   libs  += CIAO_DnC_Server
 }