Mon Dec 4 11:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

14 files changed, 129 insertions, 52 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 31fa631caaa..8caa3eabcf1 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,36 @@
+Mon Dec  4 11:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          Converted the NodeApplication into a library and build
+          an exe using this library. Will prevent duplicate compilation
+          of part of the code. Fixes bugzilla bug 2739.
+
+        * DAnCE/NodeApplication/CIAO_NodeApplication_export.h:
+          New export file:
+
+        * DAnCE/NodeApplication/Configurator_Factory.h:
+        * DAnCE/NodeApplication/Container_Impl.h:
+        * DAnCE/NodeApplication/NodeApplication_Core.h:
+        * DAnCE/NodeApplication/NodeApplication_Impl.h:
+          Added export macro to export the class from the new NodeApplication
+          library.
+
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+          Added new library project and use this in the executable.
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
+          Use the new NodeApplication library and the new base projects
+          I added for CIAO
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.{h,cpp,inl}:
+          Moved destructor from inline to cpp method and small code improvements
+
+        * DAnCE/NodeManager/NodeManager.mpc:
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc:
+          Simplified by using the new base projects
+
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+          Small improvements
+
 Mon Dec  4 07:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * CIAO-INSTALL.html:
diff --git a/CIAO/DAnCE/NodeApplication/CIAO_NodeApplication_export.h b/CIAO/DAnCE/NodeApplication/CIAO_NodeApplication_export.h
new file mode 100644
index 00000000000..b9ebab3d7cb
--- /dev/null
+++ b/CIAO/DAnCE/NodeApplication/CIAO_NodeApplication_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl NODEAPPLICATION
+// ------------------------------
+#ifndef NODEAPPLICATION_EXPORT_H
+#define NODEAPPLICATION_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (NODEAPPLICATION_HAS_DLL)
+#  define NODEAPPLICATION_HAS_DLL 1
+#endif /* ! NODEAPPLICATION_HAS_DLL */
+
+#if defined (NODEAPPLICATION_HAS_DLL) && (NODEAPPLICATION_HAS_DLL == 1)
+#  if defined (NODEAPPLICATION_BUILD_DLL)
+#    define NODEAPPLICATION_Export ACE_Proper_Export_Flag
+#    define NODEAPPLICATION_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define NODEAPPLICATION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* NODEAPPLICATION_BUILD_DLL */
+#    define NODEAPPLICATION_Export ACE_Proper_Import_Flag
+#    define NODEAPPLICATION_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define NODEAPPLICATION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* NODEAPPLICATION_BUILD_DLL */
+#else /* NODEAPPLICATION_HAS_DLL == 1 */
+#  define NODEAPPLICATION_Export
+#  define NODEAPPLICATION_SINGLETON_DECLARATION(T)
+#  define NODEAPPLICATION_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* NODEAPPLICATION_HAS_DLL == 1 */
+
+// Set NODEAPPLICATION_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (NODEAPPLICATION_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define NODEAPPLICATION_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define NODEAPPLICATION_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !NODEAPPLICATION_NTRACE */
+
+#if (NODEAPPLICATION_NTRACE == 1)
+#  define NODEAPPLICATION_TRACE(X)
+#else /* (NODEAPPLICATION_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define NODEAPPLICATION_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (NODEAPPLICATION_NTRACE == 1) */
+
+#endif /* NODEAPPLICATION_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/NodeApplication/Configurator_Factory.h b/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
index 0dfdf8bbcce..d80f12c3cee 100644
--- a/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
+++ b/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
@@ -18,12 +18,13 @@
 #define CIAO_CONFIGURATOR_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB_Core.h"
+#include "CIAO_NodeApplication_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "ace/Task.h"
 #include "ace/SString.h"
@@ -49,7 +50,7 @@ namespace CIAO
    * developers can plug in their own system configuration needs into
    * the whole system.
    */
-  class NodeApplication_Options
+  class NODEAPPLICATION_Export NodeApplication_Options
   {
   public:
     // default ctor.
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.h b/CIAO/DAnCE/NodeApplication/Container_Impl.h
index 624fa20d133..3a6c91ae2b5 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.h
@@ -19,7 +19,7 @@
 #define CIAO_CONTAINER_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "ace/config-all.h"
+#include "CIAO_NodeApplication_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -45,7 +45,7 @@ namespace CIAO
    * interface and is used to manage the lifecycle of the installed
    * components and homes.
    */
-  class Container_Impl
+  class NODEAPPLICATION_Export Container_Impl
     : public virtual POA_Deployment::Container
   {
   public:
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index b87578e5a4e..a801e308c5c 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -1,26 +1,32 @@
 // -*- MPC -*-
 // $Id$
 
-project(NodeApplication): ciao_server_dnc, ciao_events_dnc {
-  after += NoOp_Configurator
-  libs  += CIAO_NoOp_Configurator
-  exename   = NodeApplication
+project(NoOp_Configurator): ciao_deployment_stub {
+  sharedname   = CIAO_NoOp_Configurator
+  dynamicflags = NOOP_CONFIGURATOR_BUILD_DLL
+
+  Source_Files {
+    NoOp_Configurator.cpp
+  }
+}
+
+project(NodeApplicationLib): ciao_server_dnc, ciao_events_dnc, ciao_noop_configurator {
+  sharedname   = CIAO_NodeApplication
+  dynamicflags = NODEAPPLICATION_BUILD_DLL
 
   Source_Files {
     Configurator_Factory.cpp
     Container_Impl.cpp
     NodeApplication_Core.cpp
     NodeApplication_Impl.cpp
-    NodeApplication.cpp
   }
 }
 
-project(NoOp_Configurator): ciao_deployment_stub {
-  sharedname   = CIAO_NoOp_Configurator
-  dynamicflags = NOOP_CONFIGURATOR_BUILD_DLL
+project(NodeApplication): ciao_server_dnc, ciao_events_dnc, ciao_nodeapplication, ciao_noop_configurator {
+  exename   = NodeApplication
 
   Source_Files {
-    NoOp_Configurator.cpp
+    NodeApplication.cpp
   }
 }
 
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
index 3a8795eccea..aceef49209c 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
@@ -19,12 +19,13 @@
 #define CIAO_NODEAPPLICATION_CORE_H
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB_Core.h"
+#include "CIAO_NodeApplication_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "ace/Task.h"
 #include "ace/Auto_Ptr.h"
@@ -39,7 +40,7 @@ namespace CIAO
    * @brief An ACE_Task subclass that allow the ORB thread to be run
    * as separate thread when RT behaviors are needed.
    */
-  class NodeApplication_Core
+  class NODEAPPLICATION_Export NodeApplication_Core
     : public virtual ACE_Task_Base
   {
   public:
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index 610478f0122..46951f18f66 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -15,7 +15,7 @@
 #define NODEAPPLICATION_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "ace/config-all.h"
+#include "CIAO_NodeApplication_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -62,7 +62,7 @@ namespace CIAO
   // @@ Gan, as we discussed before can you please wrap this
   // implementation in a namespace Node_Application or whatever to
   // signify that it belongs to another software piece of CIAO?
-  class NodeApplication_Impl
+  class NODEAPPLICATION_Export NodeApplication_Impl
     : public virtual POA_Deployment::NodeApplication
   {
   public:
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index 509555737b8..a145a6f09f2 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -1,28 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_extension_stub {
+project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_extension_stub, ciao_nodeapplication {
 
   sharedname   = NodeApplicationManager
   after       += NodeManager_stub CIAO_TargetManager_stub
-  idlflags    += -Wb,export_include=CIAO_NAM_Export.h -Wb,export_macro=CIAO_NAM_Export
   dynamicflags = CIAO_NAM_BUILD_DLL
-  dynamicflags += NOOP_CONFIGURATOR_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
     Containers_Info_Map.cpp
     URL_Parser.cpp
-    ../NodeApplication/NodeApplication_Core.cpp
-    ../NodeApplication/NodeApplication_Impl.cpp
-    ../NodeApplication/Container_Impl.cpp
-    ../NodeApplication/Configurator_Factory.cpp
-    ../NodeApplication/NoOp_Configurator.cpp
   }
 
   Header_Files {
@@ -30,6 +19,6 @@ project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_ex
     ImplementationInfo.h
     Containers_Info_Map.h
     URL_Parser.h
-    NodeApplicationManager_Export.h
+    CIAO_NAM_Export.h
   }
 }
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index a14f986f586..6a6cb39524e 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -78,9 +78,9 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
       // Get all the facets first
       Components::FacetDescriptions_var facets;
 
-      if (is_shared_component (comp_name))
+      if (this->is_shared_component (comp_name))
         {
-          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n",
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is shared\n",
                       comp_name.c_str ()));
           facets = this->node_manager_->get_all_facets (comp_name);
         }
@@ -106,9 +106,9 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
       // Get all the event consumers
       Components::ConsumerDescriptions_var consumers;
 
-      if (is_shared_component (comp_name))
+      if (this->is_shared_component (comp_name))
         {
-          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Componsnt %s is shared\n",
+          ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is shared\n",
                       comp_name.c_str ()));
           consumers = this->node_manager_->get_all_consumers (comp_name);
         }
@@ -1220,3 +1220,8 @@ create_node_application (const ACE_CString & options
 
   return nodeapp_obj._retn ();
 }
+
+CIAO::NodeApplicationManager_Impl_Base::~NodeApplicationManager_Impl_Base (void)
+{
+}
+
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index 31c464a5445..fdaa59ba216 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -364,7 +364,6 @@ namespace CIAO
   };
 
 
-
   struct Static_Config_EntryPoints_Maps;
 
   /**
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
index 5bf4e642a0e..e744e953876 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
@@ -20,11 +20,6 @@ NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o,
 }
 
 ACE_INLINE
-CIAO::NodeApplicationManager_Impl_Base::~NodeApplicationManager_Impl_Base (void)
-{
-}
-
-ACE_INLINE
 void
 CIAO::NodeApplicationManager_Impl_Base::
 parse_config_value (ACE_CString & str
diff --git a/CIAO/DAnCE/NodeManager/NodeManager.mpc b/CIAO/DAnCE/NodeManager/NodeManager.mpc
index 01b11fa563a..e58cc2d27d4 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -2,11 +2,8 @@
 // $Id$
 
 //For static D&C, the NodeManager should be available as a linkable library
-project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub, ciao_server_dnc  {
+project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub, ciao_server_dnc, ciao_nodeapplicationmanager, ciao_nodemanager_stub {
   sharedname = NodeManager
-  after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NoOp_Configurator
-  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
 
   IDL_Files {
@@ -21,10 +18,9 @@ project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, i
   }
 }
 
-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
+project(NodeManager): ciao_server_dnc, iortable, ifr_client, dance_extension_stub, ciao_nodeapplicationmanager, ciao_targetmanager_stub, ciao_nodemanager_stub {
+  after += NodeManager_svnt
+  libs += NodeManager
   exename = NodeManager
 
   IDL_Files {
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 41ba7822952..7ef8a09de85 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "NodeManager_Impl.h"
-#include "../NodeApplicationManager/NodeApplicationManager_Impl.h"
+#include "DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h"
 #include "ace/Log_Msg.h"
 
 CIAO::NodeManager_Impl_Base::NodeManager_Impl_Base (const char *name,
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
index 84417f4bc8f..2c05d555416 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
@@ -1,11 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, ciao_server_dnc {
+project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, ciao_server_dnc, ciao_nodeapplicationmanager {
   exename   = StaticDAnCEParser
   includes += ..
-  libs     += NodeApplicationManager
-  after    += NodeApplicationManager NodeManager
 
   Source_Files {
     StaticDAnCEParser.cpp