1 files changed, 38 insertions, 25 deletions

diff --git a/CIAO/DAnCE/TargetManager/Target_Manager_Module.h b/CIAO/DAnCE/TargetManager/Target_Manager_Module.h
index 17721120884..83a598c7934 100644
--- a/CIAO/DAnCE/TargetManager/Target_Manager_Module.h
+++ b/CIAO/DAnCE/TargetManager/Target_Manager_Module.h
@@ -17,58 +17,69 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Service_Config.h"
+#include "Target_Manager_Module_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Service_Config.h"
+#include "ace/Vector_T.h"
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
 #include "tao/ORB.h"
 #include "tao/PortableServer/POAC.h"
 #include "orbsvcs/CosNamingC.h"
+#include "tao/Object_Loader.h"
+#include "Deployment/DAnCE_Loader.h"
+#include "DAnCE/Deployment/Deployment_common.h"
 #include "TargetManager_Impl.h"
 
 /**
  * @class Target_Manager_Module
  *
+ * @brief The shared object that is instantiated when the target manager
+ *        module/library is dynamically loaded.
+ *
  * This class runs the node manager instance
  */
-class DAnCE_TargetManager_Module
+class DAnCE_TargetManager_Module_Export DAnCE_TargetManager_Module
+  : public DAnCE::DAnCE_Object_Loader
 {
  public:
+      struct SOptions
+      {
+        const ACE_TCHAR * domain_nc_;
+        const ACE_TCHAR * ior_file_;
+        const ACE_TCHAR * domain_descr_;
+        const ACE_TCHAR * name_;
+
+        SOptions() :
+          domain_nc_ (0),
+          ior_file_ (0),
+          domain_descr_ (0),
+          name_ (0)
+        {
+        }
+      };
+
   /// Constructor.
   DAnCE_TargetManager_Module (void);
 
   /// Destructor.
   ~DAnCE_TargetManager_Module (void);
 
-  CORBA::Object_ptr init (CORBA::ORB_ptr orb,
-                          int argc,
-                          ACE_TCHAR *argv []);
+  /// Overload the base class method to create a new instance
+  /// of a DAnCE_RepositoryManager_Module object.
+  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
+                                           int argc,
+                                           ACE_TCHAR *argv []);
 
- private:
-  const char * usage (void);
-
-  bool parse_args (int argc, ACE_TCHAR *argv []);
-
-  struct SOptions
-  {
-    const ACE_TCHAR * domain_nc_;
-    const ACE_TCHAR * ior_file_;
-    const ACE_TCHAR * domain_descr_;
-    const ACE_TCHAR * name_;
-
-    SOptions() :
-      domain_nc_ (0),
-      ior_file_ (0),
-      domain_descr_ (0),
-      name_ (0)
-    {
-    }
-  };
+  virtual const char * usage (void);
+
+  virtual bool parse_args (int argc, ACE_TCHAR *argv []);
 
+ private:
   void create_poas (void);
 
   /// Here we store the servants.
@@ -87,6 +98,8 @@ class DAnCE_TargetManager_Module
   PortableServer::POA_var rm_poa_;
 };
 
+ACE_FACTORY_DECLARE (DAnCE_TargetManager_Module, DAnCE_TargetManager_Module)
+
 #include /**/ "ace/post.h"
 
 #endif  /* NODE_MANAGER_MODULE_H */