Mon Feb 6 00:39:41 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>

13 files changed, 217 insertions, 79 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 01db34da095..2bb62047666 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,24 @@
+Mon Feb  6 00:39:41 UTC 2006  William Otte    <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/Configurator_Factory.cpp
+        * DAnCE/NodeApplication/Configurator_Factory.h
+        * DAnCE/NodeApplication/NodeApplication.mpc
+        * DAnCE/NodeApplication/NodeApplication_Core.h
+        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+        * DAnCE/NodeManager/MonitorController.h
+        * DAnCE/NodeManager/NodeManager.mpc
+        * DAnCE/NodeApplication/NoOp_Configurator.cpp
+        * DAnCE/NodeApplication/NoOp_Configurator.h
+        * DAnCE/NodeApplication/NoOp_Configurator_export.h
+
+          Fixed linking errors on Borland 6. Mostly involved improper
+          symbol export control.
+
+        * tools/Config_Handlers/cdd.hpp
+        * tools/Config_Handlers/cdp.hpp
+
+          Addded a fix for a broken <string> include in Borland 6.
+
 Fri Feb  3 24:30:19  UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
         * ciao/CIAO_common.h:
@@ -25,9 +46,9 @@ Thu Feb  2 22:59:23 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
 Thu Feb  2 15:49:31 2006  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
-	* docs/tutorials/CoSMIC/01.html: Commited a fix for a typo detected by
-	  Abdullah Sowayan <abdullah dot sowayan at lmco dot com> and
- 	  fixed by Ming Xiong.
+        * docs/tutorials/CoSMIC/01.html: Commited a fix for a typo detected by
+          Abdullah Sowayan <abdullah dot sowayan at lmco dot com> and
+          fixed by Ming Xiong.
 
 Thu Feb  2 16:58:15 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
index ea737656f0d..0b54350047a 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
@@ -1,52 +1,18 @@
 // $Id$
 
 #include "Configurator_Factory.h"
+#include "NoOp_Configurator.h"
 #include "ace/Null_Mutex.h"
 #include "ciao/CIAO_common.h"
 #include "ace/Arg_Shifter.h"
 
-CIAO::NoOp_Configurator::~NoOp_Configurator (void)
-{
-  // Not much to do.
-}
-
-int
-CIAO::NoOp_Configurator::pre_orb_initialize ()
-{
-  return 0;
-}
-
-int
-CIAO::NoOp_Configurator::post_orb_initialize (CORBA::ORB_ptr)
-{
-  return 0;
-}
-
-int
-CIAO::NoOp_Configurator::init_resource_manager
-(const ::Deployment::Properties & /*properties*/)
-{
-  // @@ Currently do thing.  We should go over the resource struct in
-  // the future and throw exceptions if there are
-  // un-recognizable/supported stuff in it.
-  return 0;
-}
-
-CORBA::PolicyList *
-CIAO::NoOp_Configurator::find_container_policies
-(const ::Deployment::Properties & /*properties*/)
-{
-  // Not much to do.
-
-  return 0;
-}
 
 int
 CIAO::NodeApplication_Options::parse_args (int argc, char *argv[])
 {
   //  ACE_Get_Opt get_opts (argc, argv, "nrk:o:");
   ACE_Arg_Shifter shifter (argc, argv);
-  
+
   while (shifter.is_anything_left ()) {
     const char *parm = 0;
 
@@ -86,7 +52,7 @@ CIAO::NodeApplication_Options::parse_args (int argc, char *argv[])
       }
     else
       shifter.ignore_arg ();
-    
+
   }
 
   if (this->use_callback_ && this->callback_ior_.length() == 0)
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
index 1bb503c5475..ed843d19247 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  Configurator Facotry contains the factory method for creating concret
- *  NodeApp_Configurator object.  
+ *  NodeApp_Configurator object.
  *
  *  @author Nanbor Wang <nanbor@cs.wustl.edu>
  */
@@ -33,41 +33,6 @@
 
 namespace CIAO
 {
-  /**
-   * @class NoOP_Configurator
-   *
-   * @brief The NoOp_Configurator doesn't do anything.
-   */
-  class NoOp_Configurator : public NodeApp_Configurator
-  {
-  public:
-    /// Default destructor.
-    virtual ~NoOp_Configurator (void);
-
-    /**
-     * @brief "pre_orb_initialize" is called before ORB_init.
-     */
-    virtual int pre_orb_initialize (void);
-
-    /**
-     * @brief "post_orb_initialize" is called after NodeApplication
-     * get a hold at this object.
-     */
-    virtual int post_orb_initialize (CORBA::ORB_ptr o);
-
-    /**
-     * @brief "init_resource_manager" is called by NodeApplication when
-     * it receives an "install" commands.
-     */
-    virtual int
-    init_resource_manager (const ::Deployment::Properties &properties);
-
-    /**
-     * @brief get a policyset by its name.
-     */
-    virtual CORBA::PolicyList *
-    find_container_policies (const ::Deployment::Properties &properties);
-  };
 
 
   /**
@@ -90,7 +55,7 @@ namespace CIAO
     // default ctor.
     NodeApplication_Options () : use_callback_ (1), rt_support_ (0) {}
 
-    // extracting commandline arguments 
+    // extracting commandline arguments
     int parse_args (int argc, char *argv[]);
 
     NodeApp_Configurator *create_nodeapp_configurator (void);
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.cpp b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.cpp
new file mode 100644
index 00000000000..4ffe48cd7d2
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.cpp
@@ -0,0 +1,39 @@
+// $Id$
+
+#include "NoOp_Configurator.h"
+
+CIAO::NoOp_Configurator::~NoOp_Configurator (void)
+{
+  // Not much to do.
+}
+
+int
+CIAO::NoOp_Configurator::pre_orb_initialize ()
+{
+  return 0;
+}
+
+int
+CIAO::NoOp_Configurator::post_orb_initialize (CORBA::ORB_ptr)
+{
+  return 0;
+}
+
+int
+CIAO::NoOp_Configurator::init_resource_manager
+(const ::Deployment::Properties & /*properties*/)
+{
+  // @@ Currently do thing.  We should go over the resource struct in
+  // the future and throw exceptions if there are
+  // un-recognizable/supported stuff in it.
+  return 0;
+}
+
+CORBA::PolicyList *
+CIAO::NoOp_Configurator::find_container_policies
+(const ::Deployment::Properties & /*properties*/)
+{
+  // Not much to do.
+
+  return 0;
+}
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.h b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.h
new file mode 100644
index 00000000000..31bdfe30a3b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.h
@@ -0,0 +1,62 @@
+/** $Id$
+ * @file  NoOp_Configurator.h
+ * @brief This file contains the noop configurator.
+ */
+
+#ifndef NOOP_CONFIGURATOR_H
+#define NOOP_CONFIGURATOR_H
+
+#include /**/ "ace/pre.h"
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "NodeApp_Configurator.h"
+#include "NoOp_Configurator_Export.h"
+
+namespace CIAO
+{
+  /**
+   * @class NoOP_Configurator
+   *
+   * @brief The NoOp_Configurator doesn't do anything.
+   */
+  class NoOp_Configurator_Export NoOp_Configurator 
+    : public NodeApp_Configurator
+  {
+  public:
+    /// Default destructor.
+    virtual ~NoOp_Configurator (void);
+
+    /**
+     * @brief "pre_orb_initialize" is called before ORB_init.
+     */
+    virtual int pre_orb_initialize (void);
+
+    /**
+     * @brief "post_orb_initialize" is called after NodeApplication
+     * get a hold at this object.
+     */
+    virtual int post_orb_initialize (CORBA::ORB_ptr o);
+
+    /**
+     * @brief "init_resource_manager" is called by NodeApplication when
+     * it receives an "install" commands.
+     */
+    virtual int
+    init_resource_manager (const ::Deployment::Properties &properties);
+
+    /**
+     * @brief get a policyset by its name.
+     */
+    virtual CORBA::PolicyList *
+    find_container_policies (const ::Deployment::Properties &properties);
+  };
+
+}
+
+#include /**/ "ace/post.h"
+#endif /* NOOP_CONFIGURATOR_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator_export.h b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator_export.h
new file mode 100644
index 00000000000..dce4b728146
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl NoOp_Configurator
+// ------------------------------
+#ifndef NOOP_CONFIGURATOR_EXPORT_H
+#define NOOP_CONFIGURATOR_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (NOOP_CONFIGURATOR_HAS_DLL)
+#  define NOOP_CONFIGURATOR_HAS_DLL 1
+#endif /* ! NOOP_CONFIGURATOR_HAS_DLL */
+
+#if defined (NOOP_CONFIGURATOR_HAS_DLL) && (NOOP_CONFIGURATOR_HAS_DLL == 1)
+#  if defined (NOOP_CONFIGURATOR_BUILD_DLL)
+#    define NoOp_Configurator_Export ACE_Proper_Export_Flag
+#    define NOOP_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define NOOP_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* NOOP_CONFIGURATOR_BUILD_DLL */
+#    define NoOp_Configurator_Export ACE_Proper_Import_Flag
+#    define NOOP_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define NOOP_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* NOOP_CONFIGURATOR_BUILD_DLL */
+#else /* NOOP_CONFIGURATOR_HAS_DLL == 1 */
+#  define NoOp_Configurator_Export
+#  define NOOP_CONFIGURATOR_SINGLETON_DECLARATION(T)
+#  define NOOP_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* NOOP_CONFIGURATOR_HAS_DLL == 1 */
+
+// Set NOOP_CONFIGURATOR_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (NOOP_CONFIGURATOR_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define NOOP_CONFIGURATOR_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define NOOP_CONFIGURATOR_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !NOOP_CONFIGURATOR_NTRACE */
+
+#if (NOOP_CONFIGURATOR_NTRACE == 1)
+#  define NOOP_CONFIGURATOR_TRACE(X)
+#else /* (NOOP_CONFIGURATOR_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define NOOP_CONFIGURATOR_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (NOOP_CONFIGURATOR_NTRACE == 1) */
+
+#endif /* NOOP_CONFIGURATOR_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index b1a58c94880..1d9b07d6cb7 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -2,6 +2,8 @@
 // $Id$
 
 project(NodeApplication): ciao_component_dnc {
+  after += NoOp_Configurator
+  libs  += CIAO_NoOp_Configurator
   exename   = NodeApplication
 
   Source_Files {
@@ -13,6 +15,15 @@ project(NodeApplication): ciao_component_dnc {
   }
 }
 
+project(NoOp_Configurator): ciao_component_dnc {
+  sharedname   = CIAO_NoOp_Configurator
+  dynamicflags = NOOP_CONFIGURATOR_BUILD_DLL
+
+  Source_Files {
+    NoOp_Configurator.cpp
+  }
+}
+    
 project(RTNA_Configurator): ciao_component_dnc, rt_server {
   sharedname   = CIAO_RTNA_Configurator
   dynamicflags = CIAO_RTNA_CONFIGURATOR_BUILD_DLL
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
index 217f64f8c78..8f8f06772b5 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
@@ -29,6 +29,7 @@
 #include "ace/Task.h"
 #include "ace/Auto_Ptr.h"
 #include "Configurator_Factory.h"
+#include "NoOp_Configurator.h"
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index d07073cd21d..1fe22497208 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -8,6 +8,10 @@ project(NodeApplicationManager): ciao_component_dnc, ciao_deployment_svnt, dance
   idlflags    += -Wb,export_include=CIAO_NAM_Export.h -Wb,export_macro=CIAO_NAM_Export
   dynamicflags = CIAO_NAM_BUILD_DLL
 
+// @@TODO: This ../NodeApplication business need to go.  It would be better
+// to factor that stuff into a separate lib, ie. NodeApplication_Impl
+// and link it in.  For the time being, since the release is so close,
+// i will leave it the way it is.
   Source_Files {
     NodeApplicationManager_Impl.cpp
     ImplementationInfo.cpp
@@ -17,6 +21,7 @@ project(NodeApplicationManager): ciao_component_dnc, ciao_deployment_svnt, dance
     ../NodeApplication/NodeApplication_Impl.cpp
     ../NodeApplication/Container_Impl.cpp
     ../NodeApplication/Configurator_Factory.cpp
+    ../NodeApplication/NoOp_Configurator.cpp
   }
 
   Header_Files {
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorController.h b/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
index 4129a9b365b..9fc62beed8b 100644
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
+++ b/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
@@ -14,6 +14,7 @@
 #ifndef MONITOR_CONTROLLER_H
 #define MONITOR_CONTROLLER_H
 
+#include "NodeManager_svnt_export.h"
 #include "TargetManager/TargetManagerC.h"
 #include "ace/Task.h"
 #include "ace/Auto_Ptr.h"
@@ -44,7 +45,7 @@ namespace CIAO
    *  module
    *
    */
-  class MonitorController : public ACE_Task_Base
+  class NodeManager_svnt_Export MonitorController : public ACE_Task_Base
     {
     public:
       /**
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
index 3db0d6fb04a..38d4827728d 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -5,7 +5,7 @@
 project(NodeManager_svnt): ciao_component_dnc, iortable, ifr_client, dance_extension_stub  {
   sharedname = NodeManager
   after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub
-  libs += NodeManager_stub NodeApplicationManager TargetManager_stub
+  libs += NodeManager_stub NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator
   includes += $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE/Interfaces $(CIAO_ROOT)/DAnCE/TargetManager
   dynamicflags = NODEMANAGER_SVNT_BUILD_DLL
  
diff --git a/TAO/CIAO/tools/Config_Handlers/cdd.hpp b/TAO/CIAO/tools/Config_Handlers/cdd.hpp
index bb4570de9e8..27ea37d4160 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdd.hpp
@@ -8,6 +8,18 @@
  * please contact the current XSC maintainer:
  *             Will Otte <wotte@dre.vanderbilt.edu>
  */
+
+
+// Fixes the VC6 warning 4786.
+#include "vc6-4786.h"
+ 
+// Fix for Borland compilers, which seem to have a broken
+// <string> include.
+#ifdef __BORLANDC__
+# include <string.h>
+#endif
+
+#include "XSC_XML_Handlers_Export.h"
  
 #ifndef CDD_HPP
 #define CDD_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/cdp.hpp b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
index f2f4c9189f8..dc449ab6031 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
@@ -20,6 +20,7 @@
 #endif
 
 #include "XSC_XML_Handlers_Export.h"
+
 #ifndef CDP_HPP
 #define CDP_HPP