ChangeLogTag: Fri Jan 14 22:37:44 2005 Marek Brudka <mbrudka@aster.pl>

13 files changed, 219 insertions, 164 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 104c22ae532..acb5f8236e8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,155 +1,169 @@
-Fri Jan 14 18:15:21 2005  Marek Brudka  <mbrudka@aster.pl>
-
-	* tests/QtTests/server.cpp (Module):
-	* tests/QtTests/client.cpp (Module):
-	* tao/Strategies/advanced_resource.h (Module):
-	* tao/Strategies/advanced_resource.cpp (Module):
-	* tao/qt_resource_loader.h (Module):
-	* tao/qt_resource_loader.cpp (Module):
-	* tao/qt_resource.cpp (Module):
-	* tao/ORB_Core.h (Module):
-	* tao/ORB_Core.cpp (Module):
-	* tao/Leader_Follower.cpp (Module):
-	Created reactor factory on ORB_Core level to create GUI reactors.
-	Removed resouce_factory chain from Advanced_Resource_Factory.
-	Adapted qt_resource_loader to new reactor creation schema. Some style changes.
+Fri Jan 14 22:37:44 2005  Marek Brudka  <mbrudka@aster.pl>
+
+        * tests/Xt_Stopwatch/svc.conf (Module):
+        * tests/Xt_Stopwatch/svc.conf.xml (Module):
+        * tests/Xt_Stopwatch/server.cpp (Module):
+        * tests/Xt_Stopwatch/client.cpp (Module):
+        * tests/Xt_Stopwatch/Client.h (Module):
+        * tao/xt_resource_loader.h (Module):
+        * tao/xt_resource_loader.cpp (Module):
+        * tao/xt_resource.i (Module):
+        * tao/xt_resource_loader.cpp (Module):
+        * tao/xt_resource.cpp (Module):
+        * tao/tao_xtreactor.mpc (Module):
+        Created TAO_XtResource_Loader, changed XT_Resource_Factory name to XtResource_Factory,
+        updated doc and adapted tests to new way xt resources are loaded.
+
+        * tests/QtTests/server.cpp (Module):
+        * tests/QtTests/client.cpp (Module):
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
+        * tao/qt_resource_loader.h (Module):
+        * tao/qt_resource_loader.cpp (Module):
+        * tao/qt_resource.cpp (Module):
+        * tao/ORB_Core.h (Module):
+        * tao/ORB_Core.cpp (Module):
+        * tao/Leader_Follower.cpp (Module):
+        Created reactor factory on ORB_Core level to create GUI reactors.
+        Removed resouce_factory chain from Advanced_Resource_Factory.
+        Adapted qt_resource_loader to new reactor creation schema. Some style changes.
 
 Tue Jan 11 23:39:37 2005  Marek Brudka  <mbrudka@aster.pl>
 
-	* tao/Strategies/advanced_resource.h (Module):
-	* tao/Strategies/advanced_resource.cpp (Module):
-	Created a simple chain of resource_factories to allow creation of GUIReactors
-	and using Advanced_Resource_Factory the same time.
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
+        Created a simple chain of resource_factories to allow creation of GUIReactors
+        and using Advanced_Resource_Factory the same time.
 
-	* tao/qt_resource_loader.cpp (Module):
-	* tao/qt_resource.h (Module):
-	* tao/qt_resource.cpp (Module):
-	Corrected loading of TAO_QtResource_Factory. Protected against multiple calls
-	of create_reactor_impl.
+        * tao/qt_resource_loader.cpp (Module):
+        * tao/qt_resource.h (Module):
+        * tao/qt_resource.cpp (Module):
+        Corrected loading of TAO_QtResource_Factory. Protected against multiple calls
+        of create_reactor_impl.
 
 Sun Jan  9 22:58:24 2005  Marek Brudka  <mbrudka@aster.pl>
 
-	* tests/QtTests/svc.conf.xml (Module):
-	* tests/QtTests/svc.conf (Module):
-	* tests/QtTests/server.cpp (Module):
-	* tests/QtTests/client.cpp (Module):
-	Adapted the test to the current programming model for qt resource
-	* tao/tao_qtreactor.mpc (Module):
-	* tao/qt_resource_loader.h (Module):
-	* tao/qt_resource_loader.cpp (Module):
-	Create preliminary version of QtReasourceLoader class for static use of Qt resources in TAO servers.
+        * tests/QtTests/svc.conf.xml (Module):
+        * tests/QtTests/svc.conf (Module):
+        * tests/QtTests/server.cpp (Module):
+        * tests/QtTests/client.cpp (Module):
+        Adapted the test to the current programming model for qt resource
+        * tao/tao_qtreactor.mpc (Module):
+        * tao/qt_resource_loader.h (Module):
+        * tao/qt_resource_loader.cpp (Module):
+        Create preliminary version of QtReasourceLoader class for static use of Qt resources in TAO servers.
 
 Sun Jan  9 01:20:25 2005  Marek Brudka  <mbrudka@aster.pl>
 
-	* docs/Options.html (Module):
-	Updated documentation.
-	* tao/Strategies/advanced_resource.h (Module):
-	* tao/Strategies/advanced_resource.cpp (Module):
-	Removed support for FlReactor and TkReactor from AdvancedFactory.
-	* examples/AMI/FL_Callback/svc.conf.xml (Module):
-	* examples/AMI/FL_Callback/svc.conf (Module):
-	* examples/AMI/FL_Callback/FL_Callback.mpc (Module):
-	* tests/FL_Cube/svc.conf.xml (Module):
-	* tests/FL_Cube/svc.conf (Module):
-	* tests/FL_Cube/server.cpp (Module):
-	* tests/FL_Cube/client.cpp (Module):
-	TAO_Advanced_Resource_Factory changed into TAO_FlResource_Factory.
-	* tao/tao_xtreactor.mpc (Module):
-	* tao/tao_tkreactor.mpc (Module):
-	* tao/tao_qtreactor.mpc (Module):
-	* tao/tao_flreactor.mpc (Module):
-	Removed dependencies on features tao_qtreactor,tao_xtreactor,tao_flreactor,tao_tkreactor
+        * docs/Options.html (Module):
+        Updated documentation.
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
+        Removed support for FlReactor and TkReactor from AdvancedFactory.
+        * examples/AMI/FL_Callback/svc.conf.xml (Module):
+        * examples/AMI/FL_Callback/svc.conf (Module):
+        * examples/AMI/FL_Callback/FL_Callback.mpc (Module):
+        * tests/FL_Cube/svc.conf.xml (Module):
+        * tests/FL_Cube/svc.conf (Module):
+        * tests/FL_Cube/server.cpp (Module):
+        * tests/FL_Cube/client.cpp (Module):
+        TAO_Advanced_Resource_Factory changed into TAO_FlResource_Factory.
+        * tao/tao_xtreactor.mpc (Module):
+        * tao/tao_tkreactor.mpc (Module):
+        * tao/tao_qtreactor.mpc (Module):
+        * tao/tao_flreactor.mpc (Module):
+        Removed dependencies on features tao_qtreactor,tao_xtreactor,tao_flreactor,tao_tkreactor
 
 Mon Dec 13 19:17:29 2004  Marek Brudka  <mbrudka@aster.pl>
 
-	* */.cvsignore (Module):
-	Stopped cvs from complaining about unknown executables.
+        * */.cvsignore (Module):
+        Stopped cvs from complaining about unknown executables.
 
 Mon Dec 13 02:32:56 2004  Marek Brudka  <mbrudka@aster.pl>
 
-	* tao/Strategies/advanced_resource.cpp (Message):
-	Fix small bug related with missing plugin librar.
+        * tao/Strategies/advanced_resource.cpp (Message):
+        Fix small bug related with missing plugin librar.
 
 Mon Dec 13 02:28:06 2004  Marek Brudka  <mbrudka@aster.pl>
 
-	* tests/FL_Cube/FL_Cube.mpc (Module):
-	* examples/AMI/FL_Callback/FL_Callback.mpc (Module):
-	Dependence on tao_flreactor changed into ace_fl.
+        * tests/FL_Cube/FL_Cube.mpc (Module):
+        * examples/AMI/FL_Callback/FL_Callback.mpc (Module):
+        Dependence on tao_flreactor changed into ace_fl.
 
 Mon Dec 13 00:38:28 2004  Marek Brudka  <mbrudka@aster.pl>
 
-	* tao/Strategies/advanced_resource.h (Module):
-	* tao/Strategies/advanced_resource.cpp (Module):
-	Removed ACE_HAS_TK macros. Removed static linkage with ACE_TkReactor. Applied
-	for dynamic loading of reactor framework to TkReactor.
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
+        Removed ACE_HAS_TK macros. Removed static linkage with ACE_TkReactor. Applied
+        for dynamic loading of reactor framework to TkReactor.
 
 Mon Dec 13 00:37:45 2004  Marek Brudka  <mbrudka@aster.pl>
 
-	* tao/tk_resource.i (Module):
-	* tao/tk_resource.h (Module):
-	* tao/tk_resource.cpp (Module):
-	* tao/tao_tkreactor.mpc (Module):
-	* tao/TAO_TkReactor_export.h (Module):
-	Created TAO_TkReactor library with TAO_TkResourceFactory.
+        * tao/tk_resource.i (Module):
+        * tao/tk_resource.h (Module):
+        * tao/tk_resource.cpp (Module):
+        * tao/tao_tkreactor.mpc (Module):
+        * tao/TAO_TkReactor_export.h (Module):
+        Created TAO_TkReactor library with TAO_TkResourceFactory.
 
-	* tao/fl_resource.h (Module):
-	* tao/fl_resource.cpp (Module):
-	Move #include "ace/FlReactor" from header to definition.
+        * tao/fl_resource.h (Module):
+        * tao/fl_resource.cpp (Module):
+        Move #include "ace/FlReactor" from header to definition.
 
-	* tao/Strategies.mpc (Module):
-	Removed explicite dependencies of TAO_Strategies on TAO_TkReactor.
+        * tao/Strategies.mpc (Module):
+        Removed explicite dependencies of TAO_Strategies on TAO_TkReactor.
 
 Sun Dec 12 23:38:40 2004  Marek Brudka  <mbrudka@aster.pl>
 
-	* docs/Options.html (Message):
-	Updated documentation on Advanced_Resource_Factory.
+        * docs/Options.html (Message):
+        Updated documentation on Advanced_Resource_Factory.
 
 Sun Dec 12 23:01:58 2004  Marek Brudka  <mbrudka@aster.pl>
 
-	* tao/tao_flreactor.mpc (Module):
-	Created project for build TAO_FlReactor library.
-
-	* tao/xt_resource.h (Module):
-	* tao/xt_resource.cpp (Module):
-	* tao/qt_resource.h (Module):
-	* tao/qt_resource.cpp (Module):
-	Removed bug related with incorrect service class (was TAO, is TAO_QtReactor or TAO_XtReactor)
-	for exported Service_Objects and Factories.
-
-	* tao/fl_resource.i (Module):
-	* tao/fl_resource.h (Module):
-	* tao/fl_resource.cpp (Module):
-	* tao/TAO_FlReactor_export.h (Module):
-	Create TAO_FlResourceFactory for ACE_FlReactor similar to QtResourceFactory.
-
-	* tao/Strategies.mpc (Module):
-	Removed explicite dependence on tao_flreactor.
-
-	* tao/Strategies/advanced_resource.h (Module):
-	* tao/Strategies/advanced_resource.cpp (Module):
-	Removed ACE_HAS_FL macros. Removed static linkage with ACE_FlReactor. Created
-	framework for dynamic loading of GUI reactors using ACE_DLL. Applied this framework
-	for FlReactor. This framework is needed to preserve compatibility with previous
-	TAO_AdvancedResourceFactory.
-
-	* tests/FL_Cube/test_i.h (Module):
-	* tests/FL_Cube/test_i.cpp (Module):
-	* tests/FL_Cube/server.cpp (Module):
-	* tests/FL_Cube/client.cpp (Module):
-	* examples/AMI/FL_Callback/progress.cpp (Module):
-	* examples/AMI/FL_Callback/Progress_i.h (Module):
-	* examples/AMI/FL_Callback/Progress_i.cpp (Module):
-	Removed ACE_HAS_FL macros.
+        * tao/tao_flreactor.mpc (Module):
+        Created project for build TAO_FlReactor library.
+
+        * tao/xt_resource.h (Module):
+        * tao/xt_resource.cpp (Module):
+        * tao/qt_resource.h (Module):
+        * tao/qt_resource.cpp (Module):
+        Removed bug related with incorrect service class (was TAO, is TAO_QtReactor or TAO_XtReactor)
+        for exported Service_Objects and Factories.
+
+        * tao/fl_resource.i (Module):
+        * tao/fl_resource.h (Module):
+        * tao/fl_resource.cpp (Module):
+        * tao/TAO_FlReactor_export.h (Module):
+        Create TAO_FlResourceFactory for ACE_FlReactor similar to QtResourceFactory.
+
+        * tao/Strategies.mpc (Module):
+        Removed explicite dependence on tao_flreactor.
+
+        * tao/Strategies/advanced_resource.h (Module):
+        * tao/Strategies/advanced_resource.cpp (Module):
+        Removed ACE_HAS_FL macros. Removed static linkage with ACE_FlReactor. Created
+        framework for dynamic loading of GUI reactors using ACE_DLL. Applied this framework
+        for FlReactor. This framework is needed to preserve compatibility with previous
+        TAO_AdvancedResourceFactory.
+
+        * tests/FL_Cube/test_i.h (Module):
+        * tests/FL_Cube/test_i.cpp (Module):
+        * tests/FL_Cube/server.cpp (Module):
+        * tests/FL_Cube/client.cpp (Module):
+        * examples/AMI/FL_Callback/progress.cpp (Module):
+        * examples/AMI/FL_Callback/Progress_i.h (Module):
+        * examples/AMI/FL_Callback/Progress_i.cpp (Module):
+        Removed ACE_HAS_FL macros.
 
 Sun Dec 12 15:12:41 2004  Marek Brudka  <mbrudka@aster.pl>
 
-	* .cvsignore (Module):
-	To stop cvs from complaining about unknown files.
+        * .cvsignore (Module):
+        To stop cvs from complaining about unknown files.
 
 Sun Dec 12 14:44:53 2004  Marek Brudka  <mbrudka@aster.pl>
 
-	* TAOACE.mwc (Module):
-	Temporarily disabled some projects as MPC is now buggy.
+        * TAOACE.mwc (Module):
+        Temporarily disabled some projects as MPC is now buggy.
 
 Sun Dec 12 01:14:03 2004  Marek Brudka  <mbrudka@aster.pl>
 
@@ -275,7 +289,7 @@ Thu Dec  2 10:51:34 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Thu Dec  2 13:06:48 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
- 	* TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
 
           Used VMCID while trying to propogate system exception with minor
           code.
@@ -301,7 +315,7 @@ Wed Dec  1 11:38:57 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
 Wed Dec  1 19:29:32 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
- 	* tao/SystemException.cpp:
+        * tao/SystemException.cpp:
 
           Moved some of the minor code changes from Johnn's branch to the
           main trunk. The minor code specification was slightly out of
diff --git a/TAO/tao/tao_xtreactor.mpc b/TAO/tao/tao_xtreactor.mpc
index e02912014aa..dd7723239ef 100644
--- a/TAO/tao/tao_xtreactor.mpc
+++ b/TAO/tao/tao_xtreactor.mpc
@@ -3,6 +3,7 @@ project(TAO_XtReactor) : acelib, taolib, taoversion, core, tao_output, taodefaul
   dynamicflags += TAO_XTREACTOR_BUILD_DLL
   Header_Files {
     xt_resource.h
+    xt_resource_loader.h
     TAO_XtReactor_export.h
   }
   Inline_Files {
@@ -11,6 +12,7 @@ project(TAO_XtReactor) : acelib, taolib, taoversion, core, tao_output, taodefaul
   Source_Files(TAO_COMPONENTS) {
     Default_Resources {
       xt_resource.cpp
+      xt_resource_loader.cpp
     }
   }
 }
diff --git a/TAO/tao/xt_resource.cpp b/TAO/tao/xt_resource.cpp
index 678d9417d72..f824948e3fd 100644
--- a/TAO/tao/xt_resource.cpp
+++ b/TAO/tao/xt_resource.cpp
@@ -9,31 +9,31 @@
 ACE_RCSID(tao, xt_resource, "$Id$")
 
 XtAppContext
-TAO_XT_Resource_Factory::context_ = 0;
+TAO_XtResource_Factory::context_ = 0;
 
 ACE_Reactor_Impl*
-TAO_XT_Resource_Factory::allocate_reactor_impl (void) const
+TAO_XtResource_Factory::allocate_reactor_impl (void) const
 {
-  if (TAO_XT_Resource_Factory::context_ == 0)
+  if (TAO_XtResource_Factory::context_ == 0)
     return 0;
 
   ACE_Reactor_Impl *impl = 0;
 
-  ACE_NEW_RETURN (impl, ACE_XtReactor (TAO_XT_Resource_Factory::context_), 0);
+  ACE_NEW_RETURN (impl, ACE_XtReactor (TAO_XtResource_Factory::context_), 0);
   return impl;
 }
 
 void
-TAO_XT_Resource_Factory::set_context (XtAppContext context)
+TAO_XtResource_Factory::set_context (XtAppContext context)
 {
-  TAO_XT_Resource_Factory::context_ = context;
+  TAO_XtResource_Factory::context_ = context;
 }
 
-ACE_STATIC_SVC_DEFINE (TAO_XT_Resource_Factory,
-                       ACE_TEXT ("XT_Resource_Factory"),
+ACE_STATIC_SVC_DEFINE (TAO_XtResource_Factory,
+                       ACE_TEXT ("XtResource_Factory"),
                        ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_XT_Resource_Factory),
+                       &ACE_SVC_NAME (TAO_XtResource_Factory),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-ACE_FACTORY_DEFINE (TAO_XtReactor, TAO_XT_Resource_Factory)
+ACE_FACTORY_DEFINE (TAO_XtReactor, TAO_XtResource_Factory)
 
diff --git a/TAO/tao/xt_resource.h b/TAO/tao/xt_resource.h
index de67754d48a..8fc96001cce 100644
--- a/TAO/tao/xt_resource.h
+++ b/TAO/tao/xt_resource.h
@@ -36,12 +36,12 @@
  * stored in thread-specific storage, stored in shared memory,
  * etc.
  */
-class TAO_XtReactor_Export TAO_XT_Resource_Factory : public TAO_Default_Resource_Factory
+class TAO_XtReactor_Export TAO_XtResource_Factory : public TAO_Default_Resource_Factory
 {
 public:
   // = Initialization and termination methods.
   /// Constructor.
-  TAO_XT_Resource_Factory (void);
+  TAO_XtResource_Factory (void);
 
   /// Set the context used to create the XtReactor
   static void set_context (XtAppContext context);
@@ -58,8 +58,8 @@ private:
 #include "tao/xt_resource.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_XtReactor, TAO_XT_Resource_Factory)
-ACE_FACTORY_DECLARE (TAO_XtReactor, TAO_XT_Resource_Factory)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_XtReactor, TAO_XtResource_Factory)
+ACE_FACTORY_DECLARE (TAO_XtReactor, TAO_XtResource_Factory)
 
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/xt_resource.i b/TAO/tao/xt_resource.i
index 0b14c74dcf9..0ae98779530 100644
--- a/TAO/tao/xt_resource.i
+++ b/TAO/tao/xt_resource.i
@@ -1,6 +1,6 @@
 // $Id$
 
 ACE_INLINE
-TAO_XT_Resource_Factory::TAO_XT_Resource_Factory (void)
+TAO_XtResource_Factory::TAO_XtResource_Factory (void)
 {
 }
diff --git a/TAO/tao/xt_resource_loader.cpp b/TAO/tao/xt_resource_loader.cpp
new file mode 100644
index 00000000000..7250868ae92
--- /dev/null
+++ b/TAO/tao/xt_resource_loader.cpp
@@ -0,0 +1,19 @@
+//$Id$
+#include "ORB_Core.h"
+#include "tao/xt_resource_loader.h"
+
+#include "ace/Dynamic_Service.h"
+#include "tao/xt_resource.h"
+
+
+// Must be called with lock held
+TAO_XtResource_Loader::TAO_XtResource_Loader (XtAppContext context)
+{
+    TAO_ORB_Core::set_reactor_factory ("XtResource_Factory");
+    ACE_Service_Config::process_directive (ace_svc_desc_TAO_XtResource_Factory);
+    TAO_XtResource_Factory::set_context (context);
+}
+
+TAO_XtResource_Loader::~TAO_XtResource_Loader ()
+{
+}
diff --git a/TAO/tao/xt_resource_loader.h b/TAO/tao/xt_resource_loader.h
new file mode 100644
index 00000000000..8c2d7dfd6c3
--- /dev/null
+++ b/TAO/tao/xt_resource_loader.h
@@ -0,0 +1,42 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   xt_resource_loader.h
+ *
+ *  $Id$
+ *
+ *  @author Marek Brudka <mbrudka@aster.pl>
+
+*/
+//=============================================================================
+
+#ifndef _TAO_XTRESOURCE_LOADER_H
+#define _TAO_XTRESOURCE_LOADER_H
+#include /**/ "ace/pre.h"
+
+#include "tao/TAO_XtReactor_export.h"
+#include /**/ <X11/Intrinsic.h>
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_XtResource_Loader
+ *
+ * @brief Loads TAO resources related with Xt.
+ *
+ * This class changes the default reactor implementation into ACE_XtReactor
+ *
+ */
+class TAO_XtReactor_Export TAO_XtResource_Loader
+{
+
+public:
+    TAO_XtResource_Loader  (XtAppContext context);
+    virtual ~TAO_XtResource_Loader ();
+};
+
+#include /**/ "ace/post.h"
+#endif /* XTRESOURCELOADER_H */
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index 6542acd7bd1..f8d3aa3b5ff 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -19,7 +19,7 @@
 #include "testC.h"
 
 
-#include "tao/xt_resource.h"
+#include "tao/xt_resource_loader.h"
 class Control;
 
 class Client
diff --git a/TAO/tests/Xt_Stopwatch/README b/TAO/tests/Xt_Stopwatch/README
index 3bbd0f6f22c..85040fb2895 100644
--- a/TAO/tests/Xt_Stopwatch/README
+++ b/TAO/tests/Xt_Stopwatch/README
@@ -24,22 +24,12 @@ Technical Description:
 In addition to specifying the resources that the ORB needs to allocate
 for an Xt event loop, the ORB also needs the information about the
 XtAppContext in which the user application is initialised. To provide
-these information TAO provides a class by name
-"TAO_XT_Resource_Factory" that inherits from the
-TAO_Default_Resource_factory. This provides the user with a static
-method through which he can set the XtAppContext.
-
-To make TAO understand that the user is in fact wants to use the
-TAO_XT_Resource_Factory and not the default resource factory, the
-application developer must add the following line to his svc.conf
-file. 
-
-dynamic Resource_Factory Service_Object *
-TAO:_make_TAO_XT_Resource_Factory() ""
-
-Please see the line of code in server.cpp that sets the XtAppContext
-in the TAO_XT_Resource_factory.
-
-One more interseting observation would be to note that the server and
-client  run on the Xt event loop by calling the  XtAppMainLoop ().
+these information TAO provides a class by name TAO_XtResource_Loader which is
+responsible for create and instance of TAO_XtResource_Factory that inherits
+from the TAO_Default_Resource_factory. TAO_XtResource_Loader has a constructor
+parameterized the application context necessary for integration of ACE_XtReactor
+with Xt event loop.
+
+Please notice also that the server and client  run on the Xt event loop by
+calling the  XtAppMainLoop ().
 
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 9bbc41b187d..25363c6b157 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -23,7 +23,7 @@ main (int argc, char *argv[])
                                      NULL,
                                      0);
 
-  TAO_XT_Resource_Factory::set_context (app);
+  TAO_XtResource_Loader xt_loader (app);
 
   Control control (toplevel);
 
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index 189e81037d6..46ffa556c98 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -8,7 +8,7 @@ ACE_RCSID (Xt_Stopwatch,
            server,
            "$Id$")
 
-#include "tao/xt_resource.h"
+#include "tao/xt_resource_loader.h"
 #include <Xm/Xm.h>
 #include "Stopwatch_display.h"
 #include "timer.h"
@@ -59,7 +59,7 @@ main (int argc, char *argv[])
                                      NULL,
                                      0);
 
-  TAO_XT_Resource_Factory::set_context (app);
+  TAO_XtResource_Loader xt_loader (app);
 
   Stopwatch_display stopwatch (toplevel);
 
diff --git a/TAO/tests/Xt_Stopwatch/svc.conf b/TAO/tests/Xt_Stopwatch/svc.conf
deleted file mode 100644
index c026f0b8ad0..00000000000
--- a/TAO/tests/Xt_Stopwatch/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-dynamic Resource_Factory Service_Object * TAO_XtReactor:_make_TAO_XT_Resource_Factory() ""
diff --git a/TAO/tests/Xt_Stopwatch/svc.conf.xml b/TAO/tests/Xt_Stopwatch/svc.conf.xml
deleted file mode 100644
index f0a1565f92c..00000000000
--- a/TAO/tests/Xt_Stopwatch/svc.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./tests/Xt_Stopwatch/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <!--  -->
- <dynamic id="Resource_Factory" type="Service_Object">
-   <initializer path="TAO_XtReactor" init="_make_TAO_XT_Resource_Factory"/>
- </dynamic>
-</ACE_Svc_Conf>