ChangeLogTag:Wed Jun 30 10:59:55 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

12 files changed, 65 insertions, 38 deletions

diff --git a/TAO/CIAO/CIAO.mwc b/TAO/CIAO/CIAO.mwc
index 3119b84da5e..55f66e36e8b 100644
--- a/TAO/CIAO/CIAO.mwc
+++ b/TAO/CIAO/CIAO.mwc
@@ -2,6 +2,7 @@
 // $Id$
 
 workspace {
+  DnC
   ciao
   tools
 }
diff --git a/TAO/CIAO/CIAOTAO.mwc b/TAO/CIAO/CIAOTAO.mwc
index ce57384d4c2..b0fbadafcee 100644
--- a/TAO/CIAO/CIAOTAO.mwc
+++ b/TAO/CIAO/CIAOTAO.mwc
@@ -11,6 +11,7 @@ workspace {
   ../orbsvcs/orbsvcs/Svc_Utils.mpc
   ../orbsvcs/orbsvcs/Security.mpc
   ../orbsvcs/orbsvcs/IFRService.mpc
+  DnC
   ciao
   tools
 }
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 38ed7fbdf38..e36e2d909c2 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,26 @@
+Wed Jun 30 10:59:55 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* CIAO.mwc:
+	* CIAOTAO.mwc:
+
+	  Added the new DnC directories. 
+
+	* DnC/ciao/CCM_Core.mpc:
+	
+	  Changed the name of the libraries generated. We should not
+	  overwrite the original ones. 
+	
+	* DnC/Config_Handlers/Config_Handlers.mpc:
+	* DnC/DomainApplicationManager/DomainApplicationManager.mpc:
+	* DnC/ExecutionManager/ExecutionManager.mpc:
+	* DnC/NodeApplication/NodeApplication.mpc:
+	* DnC/NodeApplicationManager/NodeApplicationManager.mpc:
+	* DnC/NodeManager/NodeDaemon.mpc:
+	* DnC/RepositoryManager/RepositoryManager.mpc:
+	* DnC/tests/NodeApplicationTest/NodeAppTest.mpc:
+
+	  Use the new libraries. 
+
 Wed Jun 30 09:26:42 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * examples/Hello/Sender/starter.cpp:
diff --git a/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc
index ba735627e5d..33855b5145c 100644
--- a/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/DnC/Config_Handlers/Config_Handlers.mpc
@@ -2,13 +2,12 @@
 
 project (Config_Handlers) : ciao_deployment_stub {
 
-  requires += dnc
   sharedname = Config_Handlers
   dynamicflags   = CONFIG_HANDLER_BUILD_DLL
   macros   += XML_USE_PTHREADS
   includes += /usr/include $(XERCESCROOT)/include 
   libpaths += /usr/lib $(XERCESCROOT)/lib
-  libs     += xerces-c CIAO_Server TAO_IFR_Client
+  libs     += xerces-c CIAO_DnC_Server TAO_IFR_Client
 
   Source_Files {
     Any_Handler.cpp
diff --git a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager.mpc b/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager.mpc
index 84e7d1967ba..0224dda614f 100644
--- a/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager.mpc
+++ b/TAO/CIAO/DnC/DomainApplicationManager/DomainApplicationManager.mpc
@@ -2,12 +2,11 @@
 // $Id$
 
 project (DomainApplicationManager): taolib, ciao_deployment_stub, ciao_deployment_svnt {
-  requires += dnc
   after += Config_Handlers Node_Daemon
   
   sharedname = DomainApplicationManager
   dynamicflags   = DOMAINAPPLICATIONMANAGER_BUILD_DLL
-  libs += TAO_Valuetype CIAO_Client CIAO_Server Config_Handlers TAO_IFR_Client
+  libs += TAO_Valuetype CIAO_DnC_Client CIAO_DnC_Server Config_Handlers TAO_IFR_Client
  
   Source_Files {
     DomainApplicationManager_Impl.cpp
diff --git a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager.mpc b/TAO/CIAO/DnC/ExecutionManager/ExecutionManager.mpc
index 8f2253703a3..067cad1415d 100644
--- a/TAO/CIAO/DnC/ExecutionManager/ExecutionManager.mpc
+++ b/TAO/CIAO/DnC/ExecutionManager/ExecutionManager.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project (ExecutionManager_stub): ciao_deployment_stub, ciao_server_dnc {
-  requires += dnc
   sharedname = ExecutionManager_stub
   idlflags += -Wb,stub_export_macro=ExecutionManager_stub_Export -Wb,stub_export_include=ExecutionManager_stub_export.h
   dynamicflags = EXECUTIONMANAGER_STUB_BUILD_DLL
@@ -17,7 +16,6 @@ project (ExecutionManager_stub): ciao_deployment_stub, ciao_server_dnc {
 }
 
 project(Execution_Manager): ciao_server_dnc, ciao_deployment_svnt, ciao_deployment_stub, iortable, naming {
-  requires += dnc
   exename = Execution_Manager
   after += DomainApplicationManager ExecutionManager_stub
   libs += DomainApplicationManager ExecutionManager_stub TAO_IFR_Client
diff --git a/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc
index 5783285136f..ab573cf44d0 100644
--- a/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc
+++ b/TAO/CIAO/DnC/NodeApplication/NodeApplication.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(NodeApplication): ciao_server_dnc, ciao_deployment_stub {
-  requires += dnc
   exename   = NodeApplication
 
     IDL_Files {
diff --git a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc
index 6e3469a8467..0adbadae578 100644
--- a/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/TAO/CIAO/DnC/NodeApplicationManager/NodeApplicationManager.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, ciao_deployment_stub {
-  requires    += dnc
+
   sharedname   = NodeApplicationManager
   idlflags    += -Wb,export_include=CIAO_NAM_Export.h -Wb,export_macro=CIAO_NAM_Export
   dynamicflags = CIAO_NAM_BUILD_DLL
diff --git a/TAO/CIAO/DnC/NodeManager/NodeDaemon.mpc b/TAO/CIAO/DnC/NodeManager/NodeDaemon.mpc
index aaf966109ab..39770cf0ef0 100644
--- a/TAO/CIAO/DnC/NodeManager/NodeDaemon.mpc
+++ b/TAO/CIAO/DnC/NodeManager/NodeDaemon.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project (NodeDaemon_stub): ciao_deployment_stub, ciao_server_dnc {
-  requires += dnc
   sharedname = NodeDaemon_stub
   idlflags += -Wb,stub_export_macro=NodeDaemon_stub_Export -Wb,stub_export_include=NodeDaemon_stub_export.h
   dynamicflags = NODEDAEMON_STUB_BUILD_DLL
@@ -18,7 +17,6 @@ project (NodeDaemon_stub): ciao_deployment_stub, ciao_server_dnc {
 }
 
 project(Node_Daemon): ciao_deployment_svnt, ciao_deployment_stub, iortable, naming {
-  requires += dnc
   after += NodeApplicationManager NodeDaemon_stub
   libs += NodeApplicationManager NodeDaemon_stub TAO_IFR_Client CIAO_Server
   exename = Node_Daemon
diff --git a/TAO/CIAO/DnC/RepositoryManager/RepositoryManager.mpc b/TAO/CIAO/DnC/RepositoryManager/RepositoryManager.mpc
index f4bb470890c..ffb391133e3 100644
--- a/TAO/CIAO/DnC/RepositoryManager/RepositoryManager.mpc
+++ b/TAO/CIAO/DnC/RepositoryManager/RepositoryManager.mpc
@@ -2,13 +2,13 @@
 // $Id$
 
 project(Repository_Manager): ciao_server_dnc,ciao_deployment_svnt, ciao_deployment_stub, taoexe {
-  requires += dnc
   exename = executor
   after += Config_Handlers ExecutionManager_stub NodeDaemon_stub
   macros   += XML_USE_PTHREADS
   includes += /usr/include $(XERCESCROOT)/include
   libpaths += /usr/lib $(XERCESCROOT)/lib
-  libs     += xerces-c Config_Handlers NodeDaemon_stub ExecutionManager_stub CIAO_Server
+  libs     += xerces-c Config_Handlers NodeDaemon_stub 
+  libs     += ExecutionManager_stub CIAO_DnC_Server
   after    += Config_Handlers
 
   IDL_Files {
diff --git a/TAO/CIAO/DnC/ciao/CCM_Core.mpc b/TAO/CIAO/DnC/ciao/CCM_Core.mpc
index 8d0ebd9afbe..3372afbf0f3 100644
--- a/TAO/CIAO/DnC/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/DnC/ciao/CCM_Core.mpc
@@ -1,10 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client {
-  requires += dnc
-  sharedname  = CIAO_Client
-  idlflags  += -Wb,stub_export_include=CIAO_Client_Export.h -Wb,stub_export_macro=CIAO_CLIENT_Export -Wb,skel_export_include=CIAO_Container_Export.h -Wb,skel_export_macro=CIAO_CONTAINER_Export
+project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
+  sharedname  = CIAO_DnC_Client
+  idlflags  += -Wb,stub_export_include=CIAO_Client_Export.h 
+  idlflags  += -Wb,stub_export_macro=CIAO_CLIENT_Export 
+  idlflags  += -Wb,skel_export_include=CIAO_Container_Export.h 
+  idlflags  += -Wb,skel_export_macro=CIAO_CONTAINER_Export
+
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
 
   IDL_Files {
@@ -28,12 +31,12 @@ project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client {
   }
 }
 
-project (CIAO_Container) : orbsvcslib, portableserver, security, iorinterceptor, objreftemplate, valuetype, ifr_client {
-  requires += dnc
-  after += CIAO_Client
-  sharedname  = CIAO_Container
-  libs       += CIAO_Client
-  idlflags  += -Wb,export_include=CIAO_Container_Export.h -Wb,export_macro=CIAO_CONTAINER_Export
+project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, iorinterceptor, objreftemplate, valuetype, ifr_client {
+  after += CIAO_DnC_Client
+  sharedname  = CIAO_DnC_Container
+  libs       += CIAO_DnC_Client
+  idlflags   += -Wb,export_include=CIAO_Container_Export.h 
+  idlflags   += -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
 
   IDL_Files {
@@ -55,11 +58,10 @@ project (CIAO_Container) : orbsvcslib, portableserver, security, iorinterceptor,
   }
 }
 
-project (CIAO_Server) : orbsvcslib, portableserver, iorinterceptor, objreftemplate, valuetype, ifr_client, security {
-  requires     += dnc
-  after        += CIAO_Container
-  sharedname   =  CIAO_Server
-  libs         += CIAO_Client CIAO_Container
+project (CIAO_DnC_Server) : orbsvcslib, portableserver, iorinterceptor, objreftemplate, valuetype, ifr_client, security {
+  after        += CIAO_DnC_Container
+  sharedname   =  CIAO_DnC_Server
+  libs         += CIAO_DnC_Client CIAO_DnC_Container
   idlflags     += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
   dynamicflags =  CIAO_SERVER_BUILD_DLL
 
@@ -87,9 +89,13 @@ project (CIAO_Server) : orbsvcslib, portableserver, iorinterceptor, objreftempla
 }
 
 project(Deployment_stub) : taolib_with_idl, valuetype , ciao_server_dnc {
-  requires     += dnc
   sharedname   =  Deployment_stub
-  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export -Wb,stub_export_include=Deployment_stub_export.h -Wb,skel_export_macro=Deployment_svnt_Export -Wb,skel_export_include=Deployment_svnt_export.h
+
+  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export 
+  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h 
+  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export 
+  idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
+
   dynamicflags =  DEPLOYMENT_STUB_BUILD_DLL
 
   IDL_Files {
@@ -104,12 +110,14 @@ project(Deployment_stub) : taolib_with_idl, valuetype , ciao_server_dnc {
 }
 
 project(Deployment_svnt) : taolib_with_idl, portableserver, ciao_server_dnc {
-  requires     += dnc
   after        += Deployment_stub
   sharedname   =  Deployment_svnt
   dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
   libs         += Deployment_stub
-  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export -Wb,stub_export_include=Deployment_stub_export.h -Wb,skel_export_macro=Deployment_svnt_Export -Wb,skel_export_include=Deployment_svnt_export.h
+  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export 
+  idlflags     += -Wb,stub_export_include=Deployment_stub_export.h 
+  idlflags     += -Wb,skel_export_macro=Deployment_svnt_Export 
+  idlflags     += -Wb,skel_export_include=Deployment_svnt_export.h
 
   IDL_Files {
   }
diff --git a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest.mpc b/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest.mpc
index a1e50def623..d5545c3c094 100644
--- a/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest.mpc
+++ b/TAO/CIAO/DnC/tests/NodeApplicationTest/NodeAppTest.mpc
@@ -2,10 +2,10 @@
 
 project(NodeAppTest_RoundTrip_stub): ciao_client_dnc {
   sharedname = NodeAppTest_RoundTrip_stub
-  requires += dnc
+
   idlflags += -Wb,stub_export_macro=NODEAPPTEST_ROUNDTRIP_STUB_Export -Wb,stub_export_include=RoundTrip_stub_export.h -Wb,skel_export_macro=NODEAPPTEST_ROUNDTRIP_SVNT_Export -Wb,skel_export_include=RoundTrip_svnt_export.h
   dynamicflags   = NODEAPPTEST_ROUNDTRIP_STUB_BUILD_DLL
-  after += CIAO_Container
+  after += CIAO_DnC_Container
 
   IDL_Files {
     NodeAppTest_RoundTrip.idl
@@ -19,7 +19,7 @@ project(NodeAppTest_RoundTrip_stub): ciao_client_dnc {
 project(NodeAppTest_RoundTrip_svnt) : ciao_servant_dnc {
   after += NodeAppTest_RoundTrip_stub
   sharedname  = NodeAppTest_RoundTrip_svnt
-  requires += dnc
+
   libs    += NodeAppTest_RoundTrip_stub
   idlflags  +=  -Wb,export_macro=NODEAPPTEST_ROUNDTRIP_SVNT_Export -Wb,export_include=RoundTrip_svnt_export.h
   dynamicflags = NODEAPPTEST_ROUNDTRIP_SVNT_BUILD_DLL
@@ -41,7 +41,7 @@ project(NodeAppTest_RoundTrip_svnt) : ciao_servant_dnc {
 
 project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc {
   after += NodeAppTest_RoundTrip_svnt
-  requires += dnc
+
   sharedname = NodeAppTest_RoundTrip_exec
   libs      += NodeAppTest_RoundTrip_stub NodeAppTest_RoundTrip_svnt
   idlflags  +=  -Wb,export_macro=NODEAPPTEST_ROUNDTRIP_EXEC_Export -Wb,export_include=RoundTrip_exec_export.h
@@ -57,7 +57,7 @@ project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc {
 
 project (NodeAppTest_client_simple) : ciao_server_dnc {
  after += NodeAppTest_RoundTrip_exec
-  requires += dnc
+
  libs += NodeAppTest_RoundTrip_stub
  exename += client_simple
 
@@ -73,7 +73,7 @@ project (NodeAppTest_client) : ciao_server_dnc {
  after += NodeAppTest_RoundTrip_exec
  libs += NodeAppTest_RoundTrip_stub
  exename += client
- requires += dnc
+
 
  IDL_Files {
  }
@@ -85,8 +85,9 @@ project (NodeAppTest_client) : ciao_server_dnc {
 
 project (NodeAppTest_client_ex) : ciao_server_dnc {
  after += NodeAppTest_RoundTrip_exec
-  requires += dnc
+
  libs += NodeAppTest_RoundTrip_stub
+
  exename += client_ex
 
  IDL_Files {