1 files changed, 63 insertions, 4 deletions

diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index f6ad72f4a79..58d4bdbbef3 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -34,13 +34,13 @@ namespace CIAO
   /**
    * @class NodeApplicationManager_Impl
    */
-  class CIAO_NAM_Export NodeApplicationManager_Impl
+  class CIAO_NAM_Export NodeApplicationManager_Impl_Base
     : public virtual POA_Deployment::NodeApplicationManager,
       public virtual PortableServer::RefCountServantBase
   {
   public:
     /// Constructor
-    NodeApplicationManager_Impl (CORBA::ORB_ptr o,
+    NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o,
                                  PortableServer::POA_ptr p);
 
     /*===========================================================
@@ -102,7 +102,7 @@ namespace CIAO
 
   protected:
     /// Destructor
-    virtual ~NodeApplicationManager_Impl (void);
+    virtual ~NodeApplicationManager_Impl_Base (void);
 
     // Internal help function to create new NodeApplicationProcess
     virtual Deployment::NodeApplication_ptr
@@ -111,7 +111,7 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::ResourceNotAvailable,
                        Deployment::StartError,
-                       Deployment::InvalidProperty));
+                       Deployment::InvalidProperty))=0;
 
     // Helper function to get the connection.
     virtual Deployment::Connections *
@@ -173,6 +173,65 @@ namespace CIAO
     // Synchronize access to the object set.
     TAO_SYNCH_MUTEX lock_;
   };
+
+  /**
+   * @class NodeApplicationManager_Impl
+   */
+  class NodeApplicationManager_Impl
+    : public virtual NodeApplicationManager_Impl_Base
+  {
+  public:
+    /// Constructor
+    NodeApplicationManager_Impl (CORBA::ORB_ptr o,
+                                 PortableServer::POA_ptr p);
+
+  protected:
+    /// Destructor
+    virtual ~NodeApplicationManager_Impl (void);
+
+    // Internal help function to create new NodeApplicationProcess
+    // Here we override it to create an in-process NodeApplication object
+    virtual Deployment::NodeApplication_ptr
+    create_node_application (const ACE_CString & options
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Deployment::ResourceNotAvailable,
+                       Deployment::StartError,
+                       Deployment::InvalidProperty));
+  };
+
+  struct Static_Config_EntryPoints_Maps;
+
+  /**
+   * @class Static_NodeApplicationManager_Impl
+   */
+  class Static_NodeApplicationManager_Impl
+    : public virtual NodeApplicationManager_Impl_Base
+  {
+  public:
+    /// Constructor
+    Static_NodeApplicationManager_Impl (CORBA::ORB_ptr o,
+                                        PortableServer::POA_ptr p,
+                                        Static_Config_EntryPoints_Maps* static_config_entrypoints_maps);
+
+  protected:
+    /// Destructor
+    virtual ~Static_NodeApplicationManager_Impl (void);
+
+    // Internal help function to create new NodeApplicationProcess
+    // Here we override it to create an in-process NodeApplication object
+    virtual Deployment::NodeApplication_ptr
+    create_node_application (const ACE_CString & options
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Deployment::ResourceNotAvailable,
+                       Deployment::StartError,
+                       Deployment::InvalidProperty));
+
+    Static_Config_EntryPoints_Maps* static_config_entrypoints_maps_;
+
+  };
+
 }
 
 #if defined (__ACE_INLINE__)