Thu Jul 1 16:19:21 2004 Jaiganesh B <jai@dre.vanderbilt.edu>

5 files changed, 36 insertions, 21 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index bfd6b249c91..49f29a9eaab 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Thu Jul  1 16:19:21 2004  Jaiganesh B  <jai@dre.vanderbilt.edu>
+
+        *
+          DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
+        * DAnCE/tests/Config_Handlers/handler_test.mpb:
+        * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl:
+
+          Updated the files to include the right header files.
+
 Thu Jul  1 16:01:12 2004  Jaiganesh B  <jai@dre.vanderbilt.edu>
 
         * DADAnCE/Deployment.xsd
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index b8574c98d46..c7e5fd8bc1e 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -4,7 +4,7 @@
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 
-#include "CIAO/DnC/Config_Handlers/DnC_Dump.h"
+#include "CIAO/DAnCE/Config_Handlers/DnC_Dump.h"
 
 #include "NodeManager/NodeDaemonC.h"
 
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
index c22e24ad367..bfda08af39c 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
@@ -23,18 +23,18 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_main.h"
 #include "tao/Exception.h"
-#include "CIAO/DnC/Config_Handlers/XercesString.h"
+#include "CIAO/DAnCE/Config_Handlers/XercesString.h"
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>
 #include <xercesc/parsers/AbstractDOMParser.hpp>
-#include "CIAO/DnC/Config_Handlers/Config_Handler_export.h"
-#include "CIAO/DnC/Config_Handlers/Domain_Handler.h"
-#include "CIAO/DnC/Config_Handlers/PC_Handler.h"
-#include "CIAO/DnC/Config_Handlers/Plan_Handler.h"
-#include "CIAO/DnC/Config_Handlers/CompImplDesc_Handler.h"
-#include "CIAO/DnC/Config_Handlers/DnC_Dump.h"
-#include "CIAO/DnC/Config_Handlers/Utils.h"
-#include "CIAO/DnC/Config_Handlers/Config_Error_Handler.h"
+#include "CIAO/DAnCE/Config_Handlers/Config_Handler_export.h"
+#include "CIAO/DAnCE/Config_Handlers/Domain_Handler.h"
+#include "CIAO/DAnCE/Config_Handlers/PC_Handler.h"
+#include "CIAO/DAnCE/Config_Handlers/Plan_Handler.h"
+#include "CIAO/DAnCE/Config_Handlers/CompImplDesc_Handler.h"
+#include "CIAO/DAnCE/Config_Handlers/DnC_Dump.h"
+#include "CIAO/DAnCE/Config_Handlers/Utils.h"
+#include "CIAO/DAnCE/Config_Handlers/Config_Error_Handler.h"
 
 using Config_Handler::XStr;
 using xercesc::XMLUni;
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
index 167efa08289..6ae3085f85d 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
@@ -4,7 +4,7 @@ project : taoexe, ciao_deployment_stub {   // , portableserver, typecodefactory
   requires += dnc
   dynamicflags   = CONFIG_HANDLER_BUILD_DLL
   macros   += XML_USE_PTHREADS
-  includes += $(XERCESCROOT)/include /usr/include $(ACE_ROOT)/TAO/CIAO/DnC
+  includes += $(XERCESCROOT)/include /usr/include $(ACE_ROOT)/TAO/CIAO/DAnCE
   libpaths += $(XERCESCROOT)/lib /usr/lib // $(ACE_ROOT)/lib 
   libs     += xerces-c Config_Handlers // Deployment_stub Deployment_svnt
   after    += Config_Handlers
diff --git a/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl b/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
index 74b4ad3dfd3..1d7892ffe09 100755
--- a/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
+++ b/TAO/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl
@@ -34,20 +34,25 @@ unlink $iorfile5;
 
 $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 
-$SV1 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon",
-                             "-ORBEndpoint iiop://localhost:10000 -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication");
+$SV1 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/Node_Daemon",
+                             "-ORBEndpoint iiop://localhost:10000 -s
+$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV2 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon",
-                             "-ORBEndpoint iiop://localhost:20000  -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication");
+$SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/Node_Daemon",
+                             "-ORBEndpoint iiop://localhost:20000  -s
+$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV3 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon",
-                             "-ORBEndpoint iiop://localhost:30000  -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication");
+$SV3 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/Node_Daemon",
+                             "-ORBEndpoint iiop://localhost:30000  -s
+$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
-$SV4 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon",
-                             "-ORBEndpoint iiop://localhost:40000  -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication");
+$SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/Node_Daemon",
+                             "-ORBEndpoint iiop://localhost:40000  -s
+$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
                              
-$SV5 = new PerlACE::Process ("$CIAO_ROOT/DnC/NodeManager/Node_Daemon",
-                             "-ORBEndpoint iiop://localhost:50000  -s $CIAO_ROOT/DnC/NodeApplication/NodeApplication");                             
+$SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/Node_Daemon",
+                             "-ORBEndpoint iiop://localhost:50000  -s
+$CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");                             
 $SV1->Spawn ();
 $SV2->Spawn ();
 $SV3->Spawn ();