Wed Jan 19 22:55:50 2005 Marek Brudka <mbrudka@aster.pl>

88 files changed, 1206 insertions, 1266 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 19569fa0cba..eaa491429b1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,86 @@
+Wed Jan 19 22:52:34 2005  Marek Brudka  <mbrudka@aster.pl>
+
+	* tests/Xt_Stopwatch/server.cpp:
+	* tests/Xt_Stopwatch/client.cpp:
+	* tests/Xt_Stopwatch/Xt_Stopwatch.mpc:
+	* tests/Xt_Stopwatch/Client.h:
+	* tests/QtTests/test_i.h:
+	* tests/QtTests/server.cpp:
+	* tests/QtTests/client.h:
+	* tests/QtTests/client.cpp:
+	* tests/QtTests/QtTests.mpc:
+	* tests/FL_Cube/server.cpp:
+	* tests/FL_Cube/client.cpp:
+	* tests/FL_Cube/FL_Cube.mpc:
+	* tao/Strategies/advanced_resource.cpp:
+	* tao/xt_resource_loader.h:
+	* tao/xt_resource_loader.cpp:
+	* tao/xt_resource.i:
+	* tao/xt_resource.h:
+	* tao/xt_resource.cpp:
+	* tao/tk_resource_loader.h:
+	* tao/tk_resource_loader.cpp:
+	* tao/tk_resource.i:
+	* tao/tk_resource.h:
+	* tao/tk_resource.cpp:
+	* tao/tao_xtreactor.mpc:
+	* tao/tao_tkreactor.mpc:
+	* tao/tao_qtreactor.mpc:
+	* tao/tao_flreactor.mpc:
+	* tao/tao.mpc:
+	* tao/qt_resource_loader.h:
+	* tao/qt_resource_loader.cpp:
+	* tao/qt_resource.i:
+	* tao/qt_resource.h:
+	* tao/qt_resource.cpp:
+	* tao/fl_resource_loader.h:
+	* tao/fl_resource_loader.cpp:
+	* tao/fl_resource.i:
+	* tao/fl_resource.h:
+	* tao/fl_resource.cpp:
+	* tao/XtResource_Loader.h:
+	* tao/XtResource_Loader.cpp:
+	* tao/XtResource_Factory.h:
+	* tao/XtResource_Factory.cpp:
+	* tao/XtResource.mpc:
+	* tao/TkResource_Loader.h:
+	* tao/TkResource_Loader.cpp:
+	* tao/TkResource_Factory.h:
+	* tao/TkResource_Factory.cpp:
+	* tao/TkResource.mpc:
+	* tao/TSS_Resources.h:
+	* tao/TSS_Resources.cpp:
+	* tao/TAO_XtResource_Export.h:
+	* tao/TAO_XtReactor_export.h:
+	* tao/TAO_TkResource_Export.h:
+	* tao/TAO_TkReactor_export.h:
+	* tao/TAO_QtResource_Export.h:
+	* tao/TAO_QtReactor_export.h:
+	* tao/TAO_FlResource_Export.h:
+	* tao/TAO_FlReactor_export.h:
+	* tao/Qt_Resources_Export.h:
+	* tao/Qt_Resource_Factory.h:
+	* tao/Qt_Resource_Factory.cpp:
+	* tao/QtResource_Loader.h:
+	* tao/QtResource_Loader.cpp:
+	* tao/QtResource_Factory.h:
+	* tao/QtResource_Factory.cpp:
+	* tao/QtResource.mpc:
+	* tao/ORB_Core.h:
+	* tao/ORB_Core.cpp:
+	* tao/Leader_Follower.cpp:
+	* tao/GUI_Resource_Factory.h:
+	* tao/GUIResource_Factory.h:
+	* tao/GUIResource_Factory.cpp:
+	* tao/FlResource_Loader.h:
+	* tao/FlResource_Loader.cpp:
+	* tao/FlResource_Factory.h:
+	* tao/FlResource_Factory.cpp:
+	* tao/FlResource.mpc:
+	* examples/AMI/FL_Callback/progress.cpp (Module):
+	* examples/AMI/FL_Callback/FL_Callback.mpc (Module):
+	Naming more constistent and new GUIResources loading schema.
+
 Sat Jan 15 00:19:04 2005  Marek Brudka  <mbrudka@aster.pl>
 
         * tao/tk_resource_loader.h (Module):
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index 191818c7744..3830cb052d3 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*progress): taoexe, messaging, ami, portableserver, tao_flreactor {
+project(*progress): taoexe, messaging, ami, portableserver, tao_flresource {
   Source_Files {
     Progress_i.cpp
     progress.cpp
   }
 }
 
-project(*peer): taoexe, strategies, messaging, ami, portableserver, ace_fl {
+project(*peer): taoexe, strategies, messaging, ami, portableserver {
   Source_Files {
     Peer_i.cpp
     peer.cpp
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 5f7cfdf003e..d5d9556a839 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -3,7 +3,7 @@
 #include "Progress_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
-#include "tao/fl_resource_loader.h"
+#include "tao/FlResource_Loader.h"
 
 ACE_RCSID (FL_Callback,
            progress,
@@ -55,7 +55,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_FlResource_Loader fl_loader;
+  TAO::FlResource_Loader fl_loader;
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
diff --git a/TAO/tao/FlResource.mpc b/TAO/tao/FlResource.mpc
new file mode 100644
index 00000000000..ebd95a5c9ae
--- /dev/null
+++ b/TAO/tao/FlResource.mpc
@@ -0,0 +1,15 @@
+project(TAO_FlResource) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_flreactor {
+  sharedname   = TAO_FlResource
+  dynamicflags += TAO_FLRESOURCE_BUILD_DLL
+  Header_Files {
+    FlResource_Factory.h
+    FlResource_Loader.h
+    TAO_FlResource_Export.h
+  }
+  Source_Files(TAO_COMPONENTS) {
+    Default_Resources {
+      FlResource_Factory.cpp
+      FlResource_Loader.cpp
+    }
+  }
+}
diff --git a/TAO/tao/FlResource_Factory.cpp b/TAO/tao/FlResource_Factory.cpp
new file mode 100644
index 00000000000..ca557486f17
--- /dev/null
+++ b/TAO/tao/FlResource_Factory.cpp
@@ -0,0 +1,33 @@
+//$Id$
+
+#include /**/ "FlResource_Factory.h"
+#include /**/ "debug.h"
+#include /**/ "ace/FlReactor.h"
+
+ACE_RCSID(tao, FlResource_Factory, "$Id$");
+
+namespace TAO
+{
+
+  FlResource_Factory::FlResource_Factory ():
+    reactor_impl_( 0 )
+  {
+  }
+
+  ACE_Reactor_Impl *
+  FlResource_Factory::reactor_impl (void)
+  {
+    if (!this->reactor_impl_)
+    {
+      ACE_NEW_RETURN (this->reactor_impl_,
+                      ACE_FlReactor (),
+                      0);
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) - ACE_FlReactor created \n"));
+    }
+
+    return this->reactor_impl_;
+  }
+}
diff --git a/TAO/tao/FlResource_Factory.h b/TAO/tao/FlResource_Factory.h
new file mode 100644
index 00000000000..ec3254239ac
--- /dev/null
+++ b/TAO/tao/FlResource_Factory.h
@@ -0,0 +1,48 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   FlResource_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Marek Brudka <mbrudka@aster.pl>
+ */
+//=============================================================================
+#ifndef _TAO_FLRESOURCE_FACTORY_H
+#define _TAO_FLRESOURCE_FACTORY_H
+#include /**/ "ace/pre.h"
+#include /**/ "ace/FlReactor.h"
+#include /**/ "TAO_FlResource_Export.h"
+#include /**/ "GUIResource_Factory.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+
+  /** TAO_GUI_Resource_Factory for creating FlReactor.
+   *
+   * This factory is intended for creating FlReactor for ORB. This factory can be
+   * feed into ORB using TAO_ORB_Core::set_gui_resource_factory method which is
+   * usually done by TAO_FlResource_Loader.
+   */
+  class TAO_FlResource_Export FlResource_Factory : public GUIResource_Factory
+  {
+  public:
+    FlResource_Factory ();
+
+    /// Create or obtain current reactor implementation
+    virtual ACE_Reactor_Impl *reactor_impl (void);
+
+  private:
+
+    /// Reactor created by this factory.
+    ACE_FlReactor *reactor_impl_;
+  };
+}
+#include /**/ "ace/post.h"
+#endif /* _TAO_FLRESOURCE_FACTORY_H */
diff --git a/TAO/tao/FlResource_Loader.cpp b/TAO/tao/FlResource_Loader.cpp
new file mode 100644
index 00000000000..b3dc6916c2f
--- /dev/null
+++ b/TAO/tao/FlResource_Loader.cpp
@@ -0,0 +1,19 @@
+//$Id$
+#include "FlResource_Loader.h"
+#include "ORB_Core.h"
+#include "FlResource_Factory.h"
+
+ACE_RCSID(tao, FlResource_Loader, "$Id$");
+
+namespace TAO
+{
+
+  FlResource_Loader::FlResource_Loader ()
+  {
+    TAO_ORB_Core::set_gui_resource_factory( new FlResource_Factory () );
+  }
+
+  FlResource_Loader::~FlResource_Loader ()
+  {
+  }
+}
diff --git a/TAO/tao/FlResource_Loader.h b/TAO/tao/FlResource_Loader.h
new file mode 100644
index 00000000000..dc19f803a24
--- /dev/null
+++ b/TAO/tao/FlResource_Loader.h
@@ -0,0 +1,43 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   FlResource_Loader.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Marek Brudka <mbrudka@aster.pl>
+ */
+//=============================================================================
+
+#ifndef _TAO_FLRESOURCE_LOADER_H
+#define _TAO_FLRESOURCE_LOADER_H
+#include /**/ "ace/pre.h"
+#include "TAO_FlResource_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /** Loads TAO resources related with Fl.
+   *
+   * This class changes the default reactor implementation into ACE_FlReactor by
+   * calling TAO_ORB_Core::set_gui_resource_factory. Please notice, this class has
+   * to be created in the main Fl thread, because set_gui_resource_factory creates
+   * a variable in TSS. This way FlReactor is instantiated only in Fl event loop thread.
+   *
+   */
+  class TAO_FlResource_Export FlResource_Loader
+  {
+
+  public:
+    FlResource_Loader ( );
+    virtual ~FlResource_Loader ();
+
+  };
+}
+#include /**/ "ace/post.h"
+#endif /* _TAO_FLRESOURCE_LOADER_H */
diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp
new file mode 100644
index 00000000000..fc781b04f83
--- /dev/null
+++ b/TAO/tao/GUIResource_Factory.cpp
@@ -0,0 +1,42 @@
+//$Id$
+#include /**/ "ace/Reactor.h"
+#include /**/ "GUIResource_Factory.h"
+#include /**/ "debug.h"
+
+namespace TAO
+{
+  GUIResource_Factory::GUIResource_Factory ():
+    dynamically_allocated_reactor_ (0)
+  {
+  }
+
+  GUIResource_Factory::~GUIResource_Factory ()
+  {
+  }
+
+  ACE_Reactor *
+  GUIResource_Factory::get_reactor (void)
+  {
+    ACE_Reactor *reactor = 0;
+    ACE_NEW_RETURN (reactor,
+                    ACE_Reactor (this->reactor_impl (), 1),
+                    0);
+
+    if (reactor->initialized () == 0)
+    {
+      delete reactor;
+      reactor = 0;
+    }
+    else
+      this->dynamically_allocated_reactor_ = 1;
+
+    return reactor;
+  }
+
+  void
+  GUIResource_Factory::reclaim_reactor (ACE_Reactor *reactor)
+  {
+    if (this->dynamically_allocated_reactor_ == 1)
+      delete reactor;
+  }
+}
diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h
new file mode 100644
index 00000000000..192d4873d08
--- /dev/null
+++ b/TAO/tao/GUIResource_Factory.h
@@ -0,0 +1,77 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   GUI_Resource_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author Hamish Friedlander <ullexco@wave.co.nz>
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_GUI_RESOURCE_FACTORY_H
+#define TAO_GUI_RESOURCE_FACTORY_H
+#include /**/ "ace/pre.h"
+#include /**/ "TAO_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+//forwards
+class ACE_Reactor_Impl;
+class ACE_Reactor;
+
+namespace TAO
+{
+  /** Abstract base class for the GUI resource factory, which will be held in TSS by the ORB Core.
+   *
+   * This base class for resource factories which provide GUIReactors integrated with specific GUI
+   * event loop. In general, children of this class reimplement reactor_impl method where specific
+   * GUIReactor is created. GUIResource_Factory are usually created by GUIResource_Loader
+   * subclasses.
+   */
+  class TAO_Export GUIResource_Factory
+  {
+  public:
+    GUIResource_Factory ();
+    virtual ~GUIResource_Factory ();
+
+    /** Create or return current reactor instance.
+     * Please note that this call is NOT synchronized. Left to the
+     * higher level versions to synchronize access.
+     */
+    virtual ACE_Reactor_Impl *reactor_impl (void) = 0;
+
+    /** Create ACE_Reactor using allocate_reactor_impl.
+     * Please note that this call is NOT synchronized. Left to the
+     * higher level versions to synchronize access.
+     */
+    virtual ACE_Reactor *get_reactor (void) ;
+
+    /** Reclaim the reactor if allocated by this factory.
+     * Please note that this call is NOT synchronized. Left to the
+     * higher level versions to synchronize access.
+     */
+    virtual void reclaim_reactor (ACE_Reactor *);
+
+  private:
+    /**
+     * Flag that is set to 1 if the reactor obtained from the
+     * get_reactor() method is dynamically allocated.  If this flag is
+     * set to 1, then the reclaim_reactor() method with call the delete
+     * operator on the given reactor.  This flag is necessary to make
+     * sure that a reactor not allocated by the default resource factory
+     * is not reclaimed by the default resource factory.  Such a
+     * situation can occur when a resource factory derived from the
+     * default one overrides the get_reactor() method but does not
+     * override the reclaim_reactor() method.
+     */
+    int dynamically_allocated_reactor_;
+  };
+}
+
+#include /**/ "ace/post.h"
+#endif /*TAO_GUI_RESOURCE_FACTORY_H*/
diff --git a/TAO/tao/GUI_Resource_Factory.h b/TAO/tao/GUI_Resource_Factory.h
deleted file mode 100644
index cd7be159075..00000000000
--- a/TAO/tao/GUI_Resource_Factory.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   GUI_Resource_Factory.h
- *
- *  $Id$
- *
- *  @author Hamish Friedlander <ullexco@wave.co.nz>
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_GUI_RESOURCE_FACTORY_H
-#define TAO_GUI_RESOURCE_FACTORY_H
-#include /**/ "ace/pre.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namepace TAO
-{
-  /**
-   * @class GUI_Resource_Factory
-   *
-   * @brief Abstract Base Class for the GUI resource factory, which
-   * will be held by the ORB Core
-   *
-   */
-  class TAO_Export GUI_Resource_Factory
-  {
-  public:
-    /// Create a reactor instance.
-    /**
-     * Please note that this call is NOT synchronized. Left to the
-     * higher level versions to synchronize access.
-     */
-    virtual ACE_Reactor_Impl *create (void) const = 0;
-
-  protected:
-    ACE_Reactor_Impl *impl_;
-
-  private:
-    ACE_UNIMPLEMENTED_FUNC (GUI_Resource_Factory (void))
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /*TAO_GUI_RESOURCE_FACTORY_H*/
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index 96213cfccca..cf05375db8a 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -6,6 +6,7 @@
 #include "tao/LF_Event_Binder.h"
 #include "tao/debug.h"
 #include "tao/Transport.h"
+#include "tao/GUIResource_Factory.h"
 #include "ace/OS_NS_sys_time.h"
 
 #include "ace/Reactor.h"
@@ -27,7 +28,12 @@ TAO_Leader_Follower::~TAO_Leader_Follower (void)
       delete follower;
     }
   // Hand the reactor back to the resource factory.
-  this->orb_core_->reactor_factory ()->reclaim_reactor (this->reactor_);
+  // use GUI reactor factory if available
+  if ( this->orb_core_->gui_resource_factory () )
+    this->orb_core_->gui_resource_factory ()->reclaim_reactor (this->reactor_);
+  else
+    this->orb_core_->resource_factory ()->reclaim_reactor (this->reactor_);
+
   this->reactor_ = 0;
 }
 
@@ -116,8 +122,13 @@ TAO_Leader_Follower::reactor (void)
       ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), 0);
       if (this->reactor_ == 0)
         {
-          this->reactor_ =
-            this->orb_core_->reactor_factory ()->get_reactor ();
+          // use GUI reactor factory if available
+          if ( this->orb_core_->gui_resource_factory () )
+            this->reactor_ =
+              this->orb_core_->gui_resource_factory ()->get_reactor ();
+          else
+            this->reactor_ =
+              this->orb_core_->resource_factory ()->get_reactor ();
         }
     }
   return this->reactor_;
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index daff155c95b..4948f0b8f1d 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -28,6 +28,7 @@
 #include "TAOC.h"
 #include "Endpoint_Selector_Factory.h"
 #include "Client_Strategy_Factory.h"
+#include "GUIResource_Factory.h"
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 # include "ClientRequestInfo.h"
@@ -104,7 +105,6 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
     collocation_resolver_name_ ("Default_Collocation_Resolver"),
     stub_factory_name_ ("Default_Stub_Factory"),
     resource_factory_name_ ("Resource_Factory"),
-    reactor_factory_name_ (""),
     dynamic_adapter_name_ ("Dynamic_Adapter"),
     ifr_client_adapter_name_ ("IFR_Client_Adapter"),
     typecodefactory_adapter_name_ ("TypeCodeFactory_Adapter"),
@@ -139,7 +139,6 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     object_key_table_ (),
     orbid_ (ACE_OS::strdup (orbid ? orbid : "")),
     resource_factory_ (0),
-    reactor_factory_ (0),
 //    server_id_ (0),
     client_factory_ (0),
     server_factory_ (0),
@@ -1224,10 +1223,17 @@ TAO_ORB_Core::set_resource_factory (const char *resource_factory_name)
 }
 
 void
-TAO_ORB_Core::set_reactor_factory (const char *reactor_factory_name)
+TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory)
 {
-  TAO_ORB_Core_Static_Resources::instance ()->reactor_factory_name_ =
-    reactor_factory_name;
+  if (TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ != 0)
+  {
+    ACE_DEBUG ((LM_WARNING,
+                "TAO (%P|%t) - Deleting old gui_resource_factory.\n"));
+    delete TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
+  }
+
+  TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ = gui_resource_factory;
+
 }
 
 void
@@ -1307,23 +1313,10 @@ TAO_ORB_Core::resource_factory (void)
   return this->resource_factory_;
 }
 
-TAO_Resource_Factory *
-TAO_ORB_Core::reactor_factory (void)
+TAO::GUIResource_Factory *
+TAO_ORB_Core::gui_resource_factory (void)
 {
-  if ( TAO_ORB_Core_Static_Resources::instance ()->reactor_factory_name_== "" )
-    return resource_factory( );
-  // Check if there is a cached reference.
-  if (this->reactor_factory_ != 0)
-    {
-      return this->reactor_factory_;
-    }
-
-  // Look in the service repository for an instance.
-  this->reactor_factory_ =
-    ACE_Dynamic_Service<TAO_Resource_Factory>::instance
-    (TAO_ORB_Core_Static_Resources::instance ()->reactor_factory_name_.c_str());
-
-  return this->reactor_factory_;
+  return TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
 }
 
 
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 6d909aedfbb..4c6706016bd 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -104,6 +104,10 @@ class TAO_ClientRequestInfo;
 class TAO_Transport_Sync_Strategy;
 class TAO_Sync_Strategy;
 class TAO_Policy_Validator;
+namespace TAO
+{
+  class GUIResource_Factory;
+}
 
 namespace CORBA
 {
@@ -189,7 +193,6 @@ public:
   /// current thread.
   TAO_ClientRequestInfo *client_request_info_;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 };
 
 
@@ -375,8 +378,8 @@ TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
   /// Returns pointer to the resource factory.
   TAO_Resource_Factory *resource_factory (void);
 
-  /// Returns pointer to the factory for creating reactor
-  TAO_Resource_Factory *reactor_factory (void);
+  /// Returns pointer to the factory for creating gui resources
+  TAO::GUIResource_Factory *gui_resource_factory (void);
 
   /// Returns pointer to the client factory.
   TAO_Client_Strategy_Factory *client_factory (void);
@@ -415,8 +418,12 @@ TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
   /// Sets the value of TAO_ORB_Core::resource_factory_
   static void set_resource_factory (const char *resource_factory_name);
 
-  /// Sets the value of TAO_ORB_Core::reactor_resource_factory_
-  static void set_reactor_factory (const char *reactor_resource_factory_name);
+  /** Sets the value of TAO_ORB_Core::gui_resource_factory_.
+   *
+   *  Sets the value of gui_resource_factory in TSS. ORB_Core is responsible
+   *  for releasing this factory if needed.
+   */
+  static void set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory);
 
   /// Sets the value of TAO_ORB_Core::protocols_hooks_
   static void set_protocols_hooks (const char *protocols_hooks_name);
@@ -436,9 +443,6 @@ TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
   /// Gets the value of TAO_ORB_Core::protocols_hooks__
   TAO_Protocols_Hooks * get_protocols_hooks (void);
 
-  /// return the reactor created from reactor_factory or resource_factory
-  ACE_Reactor * get_reactor (void);
-
   /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_.
   static void dynamic_adapter_name (const char *name);
 
@@ -1161,9 +1165,6 @@ protected:
   /// Handle to the factory for resource information..
   TAO_Resource_Factory *resource_factory_;
 
-  /// Handle to the  factory for creating reactor
-  TAO_Resource_Factory *reactor_factory_;
-
 #if 0
   /// @@todo All these need to go!
   /// The allocators for the message blocks
@@ -1413,15 +1414,6 @@ public:
   ACE_CString resource_factory_name_;
 
   /**
-   * Name of the factory for creating reactor.
-   * The default value is "", which means that reactor should be created using ordinary
-   * resource factory . If this name is set, then reactor is created using this factory
-   * instead of resource_factory. If reactor_factory fails to create reactor, then
-   * resource_factor is enforced to create reactor.
-   */
-  ACE_CString reactor_factory_name_;
-
-  /**
    * Name of the service object for DII request creation that needs
    * to be instantiated. The default value is "Dynamic_Adaper". If
    * TAO_DynamicInterface is linked, dynamic_adapter_name() will be
diff --git a/TAO/tao/QtResource.mpc b/TAO/tao/QtResource.mpc
new file mode 100644
index 00000000000..4f3a42a61eb
--- /dev/null
+++ b/TAO/tao/QtResource.mpc
@@ -0,0 +1,15 @@
+project(TAO_QtResource) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_qtreactor {
+  sharedname   = TAO_QtResource
+  dynamicflags += TAO_QTRESOURCE_BUILD_DLL
+  Header_Files {
+    QtResource_Factory.h
+    QtResource_Loader.h
+    TAO_QtResource_Export.h
+  }
+  Source_Files(TAO_COMPONENTS) {
+    Default_Resources {
+      QtResource_Factory.cpp
+      QtResource_Loader.cpp
+    }
+  }
+}
diff --git a/TAO/tao/QtResource_Factory.cpp b/TAO/tao/QtResource_Factory.cpp
new file mode 100644
index 00000000000..dd42ac5517b
--- /dev/null
+++ b/TAO/tao/QtResource_Factory.cpp
@@ -0,0 +1,43 @@
+//$Id$
+
+#include /**/ "QtResource_Factory.h"
+#include /**/ "debug.h"
+#include /**/ "ace/QtReactor.h"
+#include /**/ <qapplication.h>
+
+ACE_RCSID(tao, QtResource_Factory, "$Id$");
+
+namespace TAO
+{
+
+  QtResource_Factory::QtResource_Factory ( QApplication *qapp ):
+    reactor_impl_( 0 ),
+    qapp_( qapp )
+  {
+  }
+
+  ACE_Reactor_Impl *
+  QtResource_Factory::reactor_impl (void)
+  {
+    if (this->qapp_ == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "TAO (%P|%t) - QApplication is undefined. Cannot create ACE_XtReactor \n"));
+      return 0;
+    }
+
+    if (!this->reactor_impl_)
+    {
+
+      ACE_NEW_RETURN (this->reactor_impl_,
+                      ACE_QtReactor (qapp_),
+                      0);
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) - ACE_QtReactor created \n"));
+    }
+
+    return this->reactor_impl_;
+  }
+}
diff --git a/TAO/tao/QtResource_Factory.h b/TAO/tao/QtResource_Factory.h
new file mode 100644
index 00000000000..7b8b6379f66
--- /dev/null
+++ b/TAO/tao/QtResource_Factory.h
@@ -0,0 +1,52 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   QtResource_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Marek Brudka <mbrudka@aster.pl>
+ */
+//=============================================================================
+#ifndef _TAO_QTRESOURCE_FACTORY_H
+#define _TAO_QTRESOURCE_FACTORY_H
+#include /**/ "ace/pre.h"
+#include /**/ <qapplication.h>
+#include /**/ "ace/QtReactor.h"
+#include /**/ "TAO_QtResource_Export.h"
+#include /**/ "GUIResource_Factory.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+
+  /** TAO_GUI_Resource_Factory for creating QtReactor.
+   *
+   * This factory is intended for creating QtReactor for ORB. This factory can be
+   * feed into ORB using TAO_ORB_Core::set_gui_resource_factory method which is
+   * usually done by TAO_QtResource_Loader.
+   */
+  class TAO_QtResource_Export QtResource_Factory : public GUIResource_Factory
+  {
+  public:
+    QtResource_Factory (QApplication *qapp_);
+
+    /// Create or obtain current reactor implementation
+    virtual ACE_Reactor_Impl *reactor_impl (void);
+
+  private:
+
+    /// Reactor created by this factory.
+    ACE_QtReactor *reactor_impl_;
+    /// QApplication running reactor
+    QApplication *qapp_;
+  };
+}
+
+#include /**/ "ace/post.h"
+#endif /* _TAO_QTRESOURCE_FACTORY_H */
diff --git a/TAO/tao/QtResource_Loader.cpp b/TAO/tao/QtResource_Loader.cpp
new file mode 100644
index 00000000000..54ea6f6283f
--- /dev/null
+++ b/TAO/tao/QtResource_Loader.cpp
@@ -0,0 +1,18 @@
+//$Id$
+#include "QtResource_Loader.h"
+#include "ORB_Core.h"
+#include "QtResource_Factory.h"
+
+ACE_RCSID(tao, QtResource_Loader, "$Id$");
+
+namespace TAO {
+
+  QtResource_Loader::QtResource_Loader (QApplication *qapp)
+  {
+    TAO_ORB_Core::set_gui_resource_factory( new QtResource_Factory (qapp) );
+  }
+
+  QtResource_Loader::~QtResource_Loader ()
+  {
+  }
+}
diff --git a/TAO/tao/QtResource_Loader.h b/TAO/tao/QtResource_Loader.h
new file mode 100644
index 00000000000..ab10e354c5f
--- /dev/null
+++ b/TAO/tao/QtResource_Loader.h
@@ -0,0 +1,43 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   QtResource_Loader.h
+ *
+ *  $Id$
+ *
+ *  @author Marek Brudka <mbrudka@aster.pl>
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef _TAO_QTRESOURCE_LOADER_H
+#define _TAO_QTRESOURCE_LOADER_H
+#include /**/ "ace/pre.h"
+#include /**/ <qapplication.h>
+#include /**/ "TAO_QtResource_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /** Loads TAO resources related with Qt.
+   *
+   * This class changes the default reactor implementation into ACE_QtReactor by
+   * calling TAO_ORB_Core::set_gui_resource_factory. Please notice, this class has
+   * to be created in the main Qt thread, because set_gui_resource_factory creates
+   * a variable in TSS. This way QtReactor is instantiated only in Qt event loop thread.
+   *
+   */
+  class TAO_QtResource_Export QtResource_Loader
+  {
+
+  public:
+    QtResource_Loader  (QApplication *qapp);
+    virtual ~QtResource_Loader ();
+  };
+}
+#include /**/ "ace/post.h"
+#endif /* _TAO_QTRESOURCE_LOADER_H */
diff --git a/TAO/tao/Qt_Resource_Factory.cpp b/TAO/tao/Qt_Resource_Factory.cpp
deleted file mode 100644
index 6dbc0aca380..00000000000
--- a/TAO/tao/Qt_Resource_Factory.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-//$Id$
-#include "tao/Qt_Resource_Factory.h"
-#include "tao/debug.h"
-
-namespace TAO
-{
-  QApplication *TAO_QtResource_Factory::qapp_ = 0 ;
-
-  ACE_Reactor_Impl *
-  QtResource_Factory::create (void) const
-  {
-    if (this->qapp_ == 0)
-      return 0;
-
-    if (!this->reactor_impl_ )
-      {
-        ACE_NEW_RETURN (this->reactor_impl_,
-                        ACE_QtReactor (qapp_),
-                        0);
-        if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - ACE_QtReactor created \n"));
-      }
-
-    return this->reactor_impl_;
-  }
-
-  void
-  QtResource_Factory::set_context (QApplication *qapp)
-  {
-    TAO_QtResource_Factory::qapp_ = qapp;
-  }
-
-ACE_STATIC_SVC_DEFINE (QtResource_Factory,
-                       ACE_TEXT ("QtResource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (QtResource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_QtReactor, TAO_QtResource_Factory)
-  }
diff --git a/TAO/tao/Qt_Resource_Factory.h b/TAO/tao/Qt_Resource_Factory.h
deleted file mode 100644
index e111f714bf6..00000000000
--- a/TAO/tao/Qt_Resource_Factory.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Qt_Resource_Factory.h
- *
- *  $Id$
- *
- *  @author Hamish Friedlander <ullexco@wave.co.nz>
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_QT_RESOURCE_FACTORY_H
-#define TAO_QT_RESOURCE_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Qt_Resources_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/QtReactor.h"
-
-namespace TAO
-{
-  /**
-   * @class QtResource_Factory
-   *
-   * @brief TAO's default resource factory
-   *
-   * This factory is intended for creating QtReactor for ORB.
-   */
-  class TAO_QtResources_Export QtResource_Factory : public GUI_Resource_Factory
-  {
-  public:
-    QtResource_Factory (void);
-
-    /// Set the context used to create the QtReactor
-    static void set_context (QApplication *qapp) ;
-
-    /// Obtain the reactor implementation
-    virtual ACE_Reactor_Impl *create (void) const;
-
-  private:
-    static QApplication *qapp_ ;
-  };
-
-
-  ACE_STATIC_SVC_DECLARE_EXPORT (TAO_QtReactor, QtResource_Factory)
-    ACE_FACTORY_DECLARE (TAO_QtReactor, QtResource_Factory)
-}
-
-
-
-#include /**/ "ace/post.h"
-#endif /* QTRESOURCE_H */
diff --git a/TAO/tao/Qt_Resources_Export.h b/TAO/tao/Qt_Resources_Export.h
deleted file mode 100644
index c636a8b3205..00000000000
--- a/TAO/tao/Qt_Resources_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s TAO_QtResources
-// ------------------------------
-#ifndef TAO_QTREACTOR_EXPORT_H
-#define TAO_QTREACTOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_QTREACTOR_HAS_DLL)
-#  define TAO_QTREACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_QTREACTOR_HAS_DLL */
-
-#if !defined (TAO_QTREACTOR_HAS_DLL)
-#  define TAO_QTREACTOR_HAS_DLL 1
-#endif /* ! TAO_QTREACTOR_HAS_DLL */
-
-#if defined (TAO_QTREACTOR_HAS_DLL) && (TAO_QTREACTOR_HAS_DLL == 1)
-#  if defined (TAO_QTREACTOR_BUILD_DLL)
-#    define TAO_QtResources_Export ACE_Proper_Export_Flag
-#    define TAO_QTREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_QTREACTOR_BUILD_DLL */
-#    define TAO_QtResources_Export ACE_Proper_Import_Flag
-#    define TAO_QTREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_QTREACTOR_BUILD_DLL */
-#else /* TAO_QTREACTOR_HAS_DLL == 1 */
-#  define TAO_QtResources_Export
-#  define TAO_QTREACTOR_SINGLETON_DECLARATION(T)
-#  define TAO_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_QTREACTOR_HAS_DLL == 1 */
-
-// Set TAO_QTREACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_QTREACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_QTREACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_QTREACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_QTREACTOR_NTRACE */
-
-#if (TAO_QTREACTOR_NTRACE == 1)
-#  define TAO_QTREACTOR_TRACE(X)
-#else /* (TAO_QTREACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_QTREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_QTREACTOR_NTRACE == 1) */
-
-#endif /* TAO_QTREACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index b666d8091c4..5c51755c67a 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -175,12 +175,12 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
           else if (ACE_OS::strcasecmp (current_arg,
                                        ACE_TEXT("fl")) == 0)
             this->report_option_value_error (
-                ACE_TEXT("FlReactor not supported. Please use TAO_FlResource_Factory or TAO_FlResource_Loader instead."),
+                ACE_TEXT("FlReactor not supported by Advanced_Resources_Factory. Please use TAO_FlResource_Loader instead."),
                          current_arg);
           else if (ACE_OS::strcasecmp (current_arg,
                                        ACE_TEXT("tk")) == 0)
             this->report_option_value_error (
-                ACE_TEXT("TkReactor not supported. Please use TAO_TkResource_Factory or TAO_TkResource_Loader instead."),
+                ACE_TEXT("TkReactor not supported by Advanced_Resources_Factory. Please use TAO_TkResource_Loader instead."),
                          current_arg);
           else
             this->report_option_value_error (ACE_TEXT("-ORBReactorType"), current_arg);
diff --git a/TAO/tao/TAO_FlReactor_export.h b/TAO/tao/TAO_FlReactor_export.h
deleted file mode 100644
index 81bc3da2038..00000000000
--- a/TAO/tao/TAO_FlReactor_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s TAO_FlReactor
-// ------------------------------
-#ifndef TAO_FLREACTOR_EXPORT_H
-#define TAO_FLREACTOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_FLREACTOR_HAS_DLL)
-#  define TAO_FLREACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_FLREACTOR_HAS_DLL */
-
-#if !defined (TAO_FLREACTOR_HAS_DLL)
-#  define TAO_FLREACTOR_HAS_DLL 1
-#endif /* ! TAO_FLREACTOR_HAS_DLL */
-
-#if defined (TAO_FLREACTOR_HAS_DLL) && (TAO_FLREACTOR_HAS_DLL == 1)
-#  if defined (TAO_FLREACTOR_BUILD_DLL)
-#    define TAO_FlReactor_Export ACE_Proper_Export_Flag
-#    define TAO_FLREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_FLREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_FLREACTOR_BUILD_DLL */
-#    define TAO_FlReactor_Export ACE_Proper_Import_Flag
-#    define TAO_FLREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_FLREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_FLREACTOR_BUILD_DLL */
-#else /* TAO_FLREACTOR_HAS_DLL == 1 */
-#  define TAO_FlReactor_Export
-#  define TAO_FLREACTOR_SINGLETON_DECLARATION(T)
-#  define TAO_FLREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_FLREACTOR_HAS_DLL == 1 */
-
-// Set TAO_FLREACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_FLREACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_FLREACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_FLREACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_FLREACTOR_NTRACE */
-
-#if (TAO_FLREACTOR_NTRACE == 1)
-#  define TAO_FLREACTOR_TRACE(X)
-#else /* (TAO_FLREACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_FLREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_FLREACTOR_NTRACE == 1) */
-
-#endif /* TAO_FLREACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/TAO_FlResource_Export.h b/TAO/tao/TAO_FlResource_Export.h
new file mode 100644
index 00000000000..e63890b54a6
--- /dev/null
+++ b/TAO/tao/TAO_FlResource_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s TAO_FlResource
+// ------------------------------
+#ifndef TAO_FLRESOURCE_EXPORT_H
+#define TAO_FLRESOURCE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_FLRESOURCE_HAS_DLL)
+#  define TAO_FLRESOURCE_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TAO_FLRESOURCE_HAS_DLL */
+
+#if !defined (TAO_FLRESOURCE_HAS_DLL)
+#  define TAO_FLRESOURCE_HAS_DLL 1
+#endif /* ! TAO_FLRESOURCE_HAS_DLL */
+
+#if defined (TAO_FLRESOURCE_HAS_DLL) && (TAO_FLRESOURCE_HAS_DLL == 1)
+#  if defined (TAO_FLRESOURCE_BUILD_DLL)
+#    define TAO_FlResource_Export ACE_Proper_Export_Flag
+#    define TAO_FLRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_FLRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_FLRESOURCE_BUILD_DLL */
+#    define TAO_FlResource_Export ACE_Proper_Import_Flag
+#    define TAO_FLRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_FLRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_FLRESOURCE_BUILD_DLL */
+#else /* TAO_FLRESOURCE_HAS_DLL == 1 */
+#  define TAO_FlResource_Export
+#  define TAO_FLRESOURCE_SINGLETON_DECLARATION(T)
+#  define TAO_FLRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_FLRESOURCE_HAS_DLL == 1 */
+
+// Set TAO_FLRESOURCE_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TAO_FLRESOURCE_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TAO_FLRESOURCE_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TAO_FLRESOURCE_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TAO_FLRESOURCE_NTRACE */
+
+#if (TAO_FLRESOURCE_NTRACE == 1)
+#  define TAO_FLRESOURCE_TRACE(X)
+#else /* (TAO_FLRESOURCE_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TAO_FLRESOURCE_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TAO_FLRESOURCE_NTRACE == 1) */
+
+#endif /* TAO_FLRESOURCE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/TAO_QtReactor_export.h b/TAO/tao/TAO_QtReactor_export.h
deleted file mode 100644
index fd367efc901..00000000000
--- a/TAO/tao/TAO_QtReactor_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s TAO_QtReactor
-// ------------------------------
-#ifndef TAO_QTREACTOR_EXPORT_H
-#define TAO_QTREACTOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_QTREACTOR_HAS_DLL)
-#  define TAO_QTREACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_QTREACTOR_HAS_DLL */
-
-#if !defined (TAO_QTREACTOR_HAS_DLL)
-#  define TAO_QTREACTOR_HAS_DLL 1
-#endif /* ! TAO_QTREACTOR_HAS_DLL */
-
-#if defined (TAO_QTREACTOR_HAS_DLL) && (TAO_QTREACTOR_HAS_DLL == 1)
-#  if defined (TAO_QTREACTOR_BUILD_DLL)
-#    define TAO_QtReactor_Export ACE_Proper_Export_Flag
-#    define TAO_QTREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_QTREACTOR_BUILD_DLL */
-#    define TAO_QtReactor_Export ACE_Proper_Import_Flag
-#    define TAO_QTREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_QTREACTOR_BUILD_DLL */
-#else /* TAO_QTREACTOR_HAS_DLL == 1 */
-#  define TAO_QtReactor_Export
-#  define TAO_QTREACTOR_SINGLETON_DECLARATION(T)
-#  define TAO_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_QTREACTOR_HAS_DLL == 1 */
-
-// Set TAO_QTREACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_QTREACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_QTREACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_QTREACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_QTREACTOR_NTRACE */
-
-#if (TAO_QTREACTOR_NTRACE == 1)
-#  define TAO_QTREACTOR_TRACE(X)
-#else /* (TAO_QTREACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_QTREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_QTREACTOR_NTRACE == 1) */
-
-#endif /* TAO_QTREACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/TAO_QtResource_Export.h b/TAO/tao/TAO_QtResource_Export.h
new file mode 100644
index 00000000000..1e61d00a1c0
--- /dev/null
+++ b/TAO/tao/TAO_QtResource_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s TAO_QtResource
+// ------------------------------
+#ifndef TAO_QTRESOURCE_EXPORT_H
+#define TAO_QTRESOURCE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_QTRESOURCE_HAS_DLL)
+#  define TAO_QTRESOURCE_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TAO_QTRESOURCE_HAS_DLL */
+
+#if !defined (TAO_QTRESOURCE_HAS_DLL)
+#  define TAO_QTRESOURCE_HAS_DLL 1
+#endif /* ! TAO_QTRESOURCE_HAS_DLL */
+
+#if defined (TAO_QTRESOURCE_HAS_DLL) && (TAO_QTRESOURCE_HAS_DLL == 1)
+#  if defined (TAO_QTRESOURCE_BUILD_DLL)
+#    define TAO_QtResource_Export ACE_Proper_Export_Flag
+#    define TAO_QTRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_QTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_QTRESOURCE_BUILD_DLL */
+#    define TAO_QtResource_Export ACE_Proper_Import_Flag
+#    define TAO_QTRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_QTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_QTRESOURCE_BUILD_DLL */
+#else /* TAO_QTRESOURCE_HAS_DLL == 1 */
+#  define TAO_QtResource_Export
+#  define TAO_QTRESOURCE_SINGLETON_DECLARATION(T)
+#  define TAO_QTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_QTRESOURCE_HAS_DLL == 1 */
+
+// Set TAO_QTRESOURCE_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TAO_QTRESOURCE_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TAO_QTRESOURCE_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TAO_QTRESOURCE_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TAO_QTRESOURCE_NTRACE */
+
+#if (TAO_QTRESOURCE_NTRACE == 1)
+#  define TAO_QTRESOURCE_TRACE(X)
+#else /* (TAO_QTRESOURCE_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TAO_QTRESOURCE_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TAO_QTRESOURCE_NTRACE == 1) */
+
+#endif /* TAO_QTRESOURCE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/TAO_TkReactor_export.h b/TAO/tao/TAO_TkReactor_export.h
deleted file mode 100644
index 50e161392f3..00000000000
--- a/TAO/tao/TAO_TkReactor_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s TAO_TkReactor
-// ------------------------------
-#ifndef TAO_TKREACTOR_EXPORT_H
-#define TAO_TKREACTOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_TKREACTOR_HAS_DLL)
-#  define TAO_TKREACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_TKREACTOR_HAS_DLL */
-
-#if !defined (TAO_TKREACTOR_HAS_DLL)
-#  define TAO_TKREACTOR_HAS_DLL 1
-#endif /* ! TAO_TKREACTOR_HAS_DLL */
-
-#if defined (TAO_TKREACTOR_HAS_DLL) && (TAO_TKREACTOR_HAS_DLL == 1)
-#  if defined (TAO_TKREACTOR_BUILD_DLL)
-#    define TAO_TkReactor_Export ACE_Proper_Export_Flag
-#    define TAO_TKREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_TKREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_TKREACTOR_BUILD_DLL */
-#    define TAO_TkReactor_Export ACE_Proper_Import_Flag
-#    define TAO_TKREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_TKREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_TKREACTOR_BUILD_DLL */
-#else /* TAO_TKREACTOR_HAS_DLL == 1 */
-#  define TAO_TkReactor_Export
-#  define TAO_TKREACTOR_SINGLETON_DECLARATION(T)
-#  define TAO_TKREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_TKREACTOR_HAS_DLL == 1 */
-
-// Set TAO_TKREACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_TKREACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_TKREACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_TKREACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_TKREACTOR_NTRACE */
-
-#if (TAO_TKREACTOR_NTRACE == 1)
-#  define TAO_TKREACTOR_TRACE(X)
-#else /* (TAO_TKREACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_TKREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_TKREACTOR_NTRACE == 1) */
-
-#endif /* TAO_TKREACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/TAO_TkResource_Export.h b/TAO/tao/TAO_TkResource_Export.h
new file mode 100644
index 00000000000..34904a6d9af
--- /dev/null
+++ b/TAO/tao/TAO_TkResource_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s TAO_TkResource
+// ------------------------------
+#ifndef TAO_TKRESOURCE_EXPORT_H
+#define TAO_TKRESOURCE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_TKRESOURCE_HAS_DLL)
+#  define TAO_TKRESOURCE_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TAO_TKRESOURCE_HAS_DLL */
+
+#if !defined (TAO_TKRESOURCE_HAS_DLL)
+#  define TAO_TKRESOURCE_HAS_DLL 1
+#endif /* ! TAO_TKRESOURCE_HAS_DLL */
+
+#if defined (TAO_TKRESOURCE_HAS_DLL) && (TAO_TKRESOURCE_HAS_DLL == 1)
+#  if defined (TAO_TKRESOURCE_BUILD_DLL)
+#    define TAO_TkResource_Export ACE_Proper_Export_Flag
+#    define TAO_TKRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_TKRESOURCE_BUILD_DLL */
+#    define TAO_TkResource_Export ACE_Proper_Import_Flag
+#    define TAO_TKRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_TKRESOURCE_BUILD_DLL */
+#else /* TAO_TKRESOURCE_HAS_DLL == 1 */
+#  define TAO_TkResource_Export
+#  define TAO_TKRESOURCE_SINGLETON_DECLARATION(T)
+#  define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_TKRESOURCE_HAS_DLL == 1 */
+
+// Set TAO_TKRESOURCE_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TAO_TKRESOURCE_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TAO_TKRESOURCE_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TAO_TKRESOURCE_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TAO_TKRESOURCE_NTRACE */
+
+#if (TAO_TKRESOURCE_NTRACE == 1)
+#  define TAO_TKRESOURCE_TRACE(X)
+#else /* (TAO_TKRESOURCE_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TAO_TKRESOURCE_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TAO_TKRESOURCE_NTRACE == 1) */
+
+#endif /* TAO_TKRESOURCE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/TAO_XtReactor_export.h b/TAO/tao/TAO_XtReactor_export.h
deleted file mode 100644
index 2b4bf13032e..00000000000
--- a/TAO/tao/TAO_XtReactor_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s TAO_XtReactor
-// ------------------------------
-#ifndef TAO_XTREACTOR_EXPORT_H
-#define TAO_XTREACTOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_XTREACTOR_HAS_DLL)
-#  define TAO_XTREACTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_XTREACTOR_HAS_DLL */
-
-#if !defined (TAO_XTREACTOR_HAS_DLL)
-#  define TAO_XTREACTOR_HAS_DLL 1
-#endif /* ! TAO_XTREACTOR_HAS_DLL */
-
-#if defined (TAO_XTREACTOR_HAS_DLL) && (TAO_XTREACTOR_HAS_DLL == 1)
-#  if defined (TAO_XTREACTOR_BUILD_DLL)
-#    define TAO_XtReactor_Export ACE_Proper_Export_Flag
-#    define TAO_XTREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_XTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_XTREACTOR_BUILD_DLL */
-#    define TAO_XtReactor_Export ACE_Proper_Import_Flag
-#    define TAO_XTREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_XTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_XTREACTOR_BUILD_DLL */
-#else /* TAO_XTREACTOR_HAS_DLL == 1 */
-#  define TAO_XtReactor_Export
-#  define TAO_XTREACTOR_SINGLETON_DECLARATION(T)
-#  define TAO_XTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_XTREACTOR_HAS_DLL == 1 */
-
-// Set TAO_XTREACTOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_XTREACTOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_XTREACTOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_XTREACTOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_XTREACTOR_NTRACE */
-
-#if (TAO_XTREACTOR_NTRACE == 1)
-#  define TAO_XTREACTOR_TRACE(X)
-#else /* (TAO_XTREACTOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_XTREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_XTREACTOR_NTRACE == 1) */
-
-#endif /* TAO_XTREACTOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/TAO_XtResource_Export.h b/TAO/tao/TAO_XtResource_Export.h
new file mode 100644
index 00000000000..5cc41d8da11
--- /dev/null
+++ b/TAO/tao/TAO_XtResource_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s TAO_XtResource
+// ------------------------------
+#ifndef TAO_XTRESOURCE_EXPORT_H
+#define TAO_XTRESOURCE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_XTRESOURCE_HAS_DLL)
+#  define TAO_XTRESOURCE_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TAO_XTRESOURCE_HAS_DLL */
+
+#if !defined (TAO_XTRESOURCE_HAS_DLL)
+#  define TAO_XTRESOURCE_HAS_DLL 1
+#endif /* ! TAO_XTRESOURCE_HAS_DLL */
+
+#if defined (TAO_XTRESOURCE_HAS_DLL) && (TAO_XTRESOURCE_HAS_DLL == 1)
+#  if defined (TAO_XTRESOURCE_BUILD_DLL)
+#    define TAO_XtResource_Export ACE_Proper_Export_Flag
+#    define TAO_XTRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_XTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_XTRESOURCE_BUILD_DLL */
+#    define TAO_XtResource_Export ACE_Proper_Import_Flag
+#    define TAO_XTRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_XTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_XTRESOURCE_BUILD_DLL */
+#else /* TAO_XTRESOURCE_HAS_DLL == 1 */
+#  define TAO_XtResource_Export
+#  define TAO_XTRESOURCE_SINGLETON_DECLARATION(T)
+#  define TAO_XTRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_XTRESOURCE_HAS_DLL == 1 */
+
+// Set TAO_XTRESOURCE_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TAO_XTRESOURCE_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TAO_XTRESOURCE_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TAO_XTRESOURCE_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TAO_XTRESOURCE_NTRACE */
+
+#if (TAO_XTRESOURCE_NTRACE == 1)
+#  define TAO_XTRESOURCE_TRACE(X)
+#else /* (TAO_XTRESOURCE_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TAO_XTRESOURCE_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TAO_XTRESOURCE_NTRACE == 1) */
+
+#endif /* TAO_XTRESOURCE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
index d0e1acf739f..1085b0e68bb 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -1,28 +1,33 @@
 // $Id$
 
 #include "TSS_Resources.h"
+#include "GUIResource_Factory.h"
 
 ACE_RCSID (tao,
            TSS_Resources,
            "$Id$")
 
 TAO_TSS_Resources::TAO_TSS_Resources (void)
-  :  poa_current_impl_ (0),
-     rtscheduler_current_impl_ (0),
-     rtscheduler_previous_current_impl_ (0),
-     default_environment_ (&this->tss_environment_)
+  :  poa_current_impl_ (0)
+     , rtscheduler_current_impl_ (0)
+     , rtscheduler_previous_current_impl_ (0)
+     , default_environment_ (&this->tss_environment_)
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
   , policy_current_ (&this->initial_policy_current_)
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
+     , gui_resource_factory_ (0)
 
 {
 }
 
 TAO_TSS_Resources::~TAO_TSS_Resources (void)
 {
+  if (gui_resource_factory_)
+    delete gui_resource_factory_;
+  gui_resource_factory_ = 0;
 }
 
 // ****************************************************************
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
index d08e5c4ac35..55833742b53 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -26,7 +26,11 @@
 #include "tao/TAO_Singleton.h"
 #include "tao/Environment.h"
 
-
+// Forward declarations
+namespace TAO
+{
+  class GUIResource_Factory;
+}
 /**
  * @class TAO_TSS_Resources
  *
@@ -88,7 +92,12 @@ public:
   TAO_Policy_Current_Impl * policy_current_;
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-
+  /** A factory for creating GUIReactors.
+   *
+   * GUIResource_Factory has to be stored in TSS, as GUIReactor are operational
+   * only in within the context of GUI event loops.
+   */
+  TAO::GUIResource_Factory *gui_resource_factory_;
 };
 
 /**
diff --git a/TAO/tao/TkResource.mpc b/TAO/tao/TkResource.mpc
new file mode 100644
index 00000000000..1b857222914
--- /dev/null
+++ b/TAO/tao/TkResource.mpc
@@ -0,0 +1,15 @@
+project(TAO_TkResource) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_tkreactor {
+  sharedname   = TAO_TkResource
+  dynamicflags += TAO_TKRESOURCE_BUILD_DLL
+  Header_Files {
+    TkResource_Factory.h
+    TkResource_Loader.h
+    TAO_TkResource_Export.h
+  }
+  Source_Files(TAO_COMPONENTS) {
+    Default_Resources {
+      TkResource_Factory.cpp
+      TkResource_Loader.cpp
+    }
+  }
+}
diff --git a/TAO/tao/TkResource_Factory.cpp b/TAO/tao/TkResource_Factory.cpp
new file mode 100644
index 00000000000..4c1926bb246
--- /dev/null
+++ b/TAO/tao/TkResource_Factory.cpp
@@ -0,0 +1,34 @@
+//$Id$
+
+#include /**/ "TkResource_Factory.h"
+#include /**/ "debug.h"
+#include /**/ "ace/TkReactor.h"
+
+ACE_RCSID(tao, TkResource_Factory, "$Id$");
+
+
+namespace TAO
+{
+
+  TkResource_Factory::TkResource_Factory ():
+    reactor_impl_( 0 )
+  {
+  }
+
+  ACE_Reactor_Impl *
+  TkResource_Factory::reactor_impl (void)
+  {
+    if (!this->reactor_impl_)
+    {
+      ACE_NEW_RETURN (this->reactor_impl_,
+                      ACE_TkReactor (),
+                      0);
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) - ACE_TkReactor created \n"));
+    }
+
+    return this->reactor_impl_;
+  }
+}
diff --git a/TAO/tao/TkResource_Factory.h b/TAO/tao/TkResource_Factory.h
new file mode 100644
index 00000000000..d1d3f6d2a53
--- /dev/null
+++ b/TAO/tao/TkResource_Factory.h
@@ -0,0 +1,49 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   TkResource_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Marek Brudka <mbrudka@aster.pl>
+ */
+//=============================================================================
+#ifndef _TAO_TKRESOURCE_FACTORY_H
+#define _TAO_TKRESOURCE_FACTORY_H
+#include /**/ "ace/pre.h"
+#include /**/ "ace/TkReactor.h"
+#include /**/ "TAO_TkResource_Export.h"
+#include /**/ "GUIResource_Factory.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+
+  /** TAO_GUI_Resource_Factory for creating TkReactor.
+   *
+   * This factory is intended for creating TkReactor for ORB. This factory can be
+   * feed into ORB using TAO_ORB_Core::set_gui_resource_factory method which is
+   * usually done by TAO_TkResource_Loader.
+   */
+
+  class TAO_TkResource_Export TkResource_Factory : public GUIResource_Factory
+  {
+  public:
+    TkResource_Factory ();
+
+    /// Create or obtain current reactor implementation
+    virtual ACE_Reactor_Impl *reactor_impl (void);
+
+  private:
+
+    /// Reactor created by this factory.
+    ACE_TkReactor *reactor_impl_;
+  };
+}
+#include /**/ "ace/post.h"
+#endif /* _TAO_TKRESOURCE_FACTORY_H */
diff --git a/TAO/tao/TkResource_Loader.cpp b/TAO/tao/TkResource_Loader.cpp
new file mode 100644
index 00000000000..3d79b3735d5
--- /dev/null
+++ b/TAO/tao/TkResource_Loader.cpp
@@ -0,0 +1,19 @@
+//$Id$
+#include "TkResource_Loader.h"
+#include "ORB_Core.h"
+#include "TkResource_Factory.h"
+
+ACE_RCSID(tao, TkResource_Loader, "$Id$");
+
+namespace TAO
+{
+
+  TkResource_Loader::TkResource_Loader ()
+  {
+    TAO_ORB_Core::set_gui_resource_factory( new TkResource_Factory () );
+  }
+
+  TkResource_Loader::~TkResource_Loader ()
+  {
+  }
+}
diff --git a/TAO/tao/TkResource_Loader.h b/TAO/tao/TkResource_Loader.h
new file mode 100644
index 00000000000..6489c513868
--- /dev/null
+++ b/TAO/tao/TkResource_Loader.h
@@ -0,0 +1,43 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   TkResource_Loader.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Marek Brudka <mbrudka@aster.pl>
+ */
+//=============================================================================
+
+#ifndef _TAO_TKRESOURCE_LOADER_H
+#define _TAO_TKRESOURCE_LOADER_H
+#include /**/ "ace/pre.h"
+#include /**/ "TAO_TkResource_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /** Loads TAO resources related with Tk.
+   *
+   * This class changes the default reactor implementation into ACE_TkReactor by
+   * calling TAO_ORB_Core::set_gui_resource_factory. Please notice, this class has
+   * to be created in the main Tk thread, because set_gui_resource_factory creates
+   * a variable in TSS. This way TkReactor is instantiated only in Tk event loop thread.
+   *
+   */
+  class TAO_TkResource_Export TkResource_Loader
+  {
+
+  public:
+    TkResource_Loader ( );
+    virtual ~TkResource_Loader ();
+
+  };
+}
+#include /**/ "ace/post.h"
+#endif /* _TAO_TKRESOURCE_LOADER_H */
diff --git a/TAO/tao/XtResource.mpc b/TAO/tao/XtResource.mpc
new file mode 100644
index 00000000000..e0754fe1ca5
--- /dev/null
+++ b/TAO/tao/XtResource.mpc
@@ -0,0 +1,15 @@
+project(TAO_XtResource) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_xtreactor {
+  sharedname   = TAO_XtResource
+  dynamicflags += TAO_XTRESOURCE_BUILD_DLL
+  Header_Files {
+    XtResource_Factory.h
+    XtResource_Loader.h
+    TAO_XtResource_Export.h
+  }
+  Source_Files(TAO_COMPONENTS) {
+    Default_Resources {
+      XtResource_Factory.cpp
+      XtResource_Loader.cpp
+    }
+  }
+}
diff --git a/TAO/tao/XtResource_Factory.cpp b/TAO/tao/XtResource_Factory.cpp
new file mode 100644
index 00000000000..3c5d2e393e9
--- /dev/null
+++ b/TAO/tao/XtResource_Factory.cpp
@@ -0,0 +1,41 @@
+//$Id$
+
+#include /**/ "XtResource_Factory.h"
+#include /**/ "debug.h"
+#include /**/ "ace/XtReactor.h"
+
+ACE_RCSID(tao, XtResource_Factory, "$Id$");
+
+namespace TAO
+{
+
+  XtResource_Factory::XtResource_Factory (XtAppContext p_context):
+    reactor_impl_( 0 ),
+    context_( p_context )
+  {
+  }
+
+  ACE_Reactor_Impl *
+  XtResource_Factory::reactor_impl (void)
+  {
+    if (this->context_ == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "TAO (%P|%t) - XtAppContext is undefined. Cannot create ACE_XtReactor \n"));
+      return 0;
+    }
+
+    if (!this->reactor_impl_)
+    {
+      ACE_NEW_RETURN (this->reactor_impl_,
+                      ACE_XtReactor (this->context_),
+                      0);
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) - ACE_XtReactor created \n"));
+    }
+
+    return this->reactor_impl_;
+  }
+}
diff --git a/TAO/tao/XtResource_Factory.h b/TAO/tao/XtResource_Factory.h
new file mode 100644
index 00000000000..20e2223c805
--- /dev/null
+++ b/TAO/tao/XtResource_Factory.h
@@ -0,0 +1,52 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   XtResource_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Marek Brudka <mbrudka@aster.pl>
+ */
+//=============================================================================
+#ifndef TAO_XTRESOURCE_FACTORY_H
+#define TAO_XTRESOURCE_FACTORY_H
+#include /**/ "ace/pre.h"
+#include /**/ "ace/XtReactor.h"
+#include /**/ "TAO_XtResource_Export.h"
+#include /**/ "GUIResource_Factory.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+
+  /** TAO_GUI_Resource_Factory for creating XtReactor.
+   *
+   * This factory is intended for creating XtReactor for ORB. This factory can be
+   * feed into ORB using TAO_ORB_Core::set_gui_resource_factory method which is
+   * usually done by TAO_XtResource_Loader.
+   */
+  class TAO_XtResource_Export XtResource_Factory : public GUIResource_Factory
+  {
+  public:
+    XtResource_Factory (XtAppContext context);
+
+    /// Create or obtain current reactor implementation
+    virtual ACE_Reactor_Impl *reactor_impl (void);
+
+  private:
+
+    /// Reactor created by this factory.
+    ACE_XtReactor *reactor_impl_;
+
+    /// Xt context for XtReactor
+    XtAppContext  context_;
+  };
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_XTRESOURCE_FACTORY_H */
diff --git a/TAO/tao/XtResource_Loader.cpp b/TAO/tao/XtResource_Loader.cpp
new file mode 100644
index 00000000000..3127ffffc20
--- /dev/null
+++ b/TAO/tao/XtResource_Loader.cpp
@@ -0,0 +1,19 @@
+//$Id$
+#include "XtResource_Loader.h"
+#include "ORB_Core.h"
+#include "XtResource_Factory.h"
+
+ACE_RCSID(tao, XtResource_Loader, "$Id$");
+
+namespace TAO
+{
+
+  XtResource_Loader::XtResource_Loader (XtAppContext context)
+  {
+    TAO_ORB_Core::set_gui_resource_factory( new XtResource_Factory (context) );
+  }
+
+  XtResource_Loader::~XtResource_Loader ()
+  {
+  }
+}
diff --git a/TAO/tao/XtResource_Loader.h b/TAO/tao/XtResource_Loader.h
new file mode 100644
index 00000000000..6641be0d314
--- /dev/null
+++ b/TAO/tao/XtResource_Loader.h
@@ -0,0 +1,44 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   XtResource_Loader.h
+ *
+ *  $Id$
+ *
+ *  @author Marek Brudka <mbrudka@aster.pl>
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef _TAO_XTRESOURCE_LOADER_H
+#define _TAO_XTRESOURCE_LOADER_H
+#include /**/ "ace/pre.h"
+#include /**/ "TAO_XtResource_Export.h"
+#include /**/ <X11/Intrinsic.h>
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /** Loads TAO resources related with Xt.
+   *
+   * This class changes the default reactor implementation into ACE_XtReactor by
+   * calling TAO_ORB_Core::set_gui_resource_factory. Please notice, this class has
+   * to be created in the main Xt thread, because set_gui_resource_factory creates
+   * a variable in TSS. This way XtReactor is instantiated only in Xt event loop thread.
+   *
+   */
+  class TAO_XtResource_Export XtResource_Loader
+  {
+
+  public:
+    XtResource_Loader  (XtAppContext context);
+    virtual ~XtResource_Loader ();
+
+  };
+}
+#include /**/ "ace/post.h"
+#endif /* _TAO_XTRESOURCE_LOADER_H */
diff --git a/TAO/tao/fl_resource.cpp b/TAO/tao/fl_resource.cpp
deleted file mode 100644
index 4ca0a9ef512..00000000000
--- a/TAO/tao/fl_resource.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-#include "tao/fl_resource.h"
-
-#if !defined (__ACE_INLINE__)
-# include "fl_resource.i"
-#endif /* ! __ACE_INLINE__ */
-#include "ace/FlReactor.h"
-
-ACE_FlReactor *TAO_FlResource_Factory::impl_ = 0;
-
-ACE_Reactor_Impl *
-TAO_FlResource_Factory::allocate_reactor_impl (void) const
-{
-  if ( !impl_ )
-  {
-    ACE_NEW_RETURN(impl_,
-                   ACE_FlReactor (),
-                   0);
-    ACE_DEBUG ((LM_DEBUG, "ACE_FlReactor created.\n"));
-  }
-
-  return impl_;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_FlResource_Factory,
-                       ACE_TEXT ("FlResource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_FlResource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_FlReactor, TAO_FlResource_Factory)
-
diff --git a/TAO/tao/fl_resource.h b/TAO/tao/fl_resource.h
deleted file mode 100644
index ab168fdffa3..00000000000
--- a/TAO/tao/fl_resource.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   fl_resource.h
- *
- *  $Id$
- *
- *  @author Marek Brudka <mbrudka@aster.pl>
- */
-//=============================================================================
-
-#ifndef _TAO_FLRESOURCE_H
-#define _TAO_FLRESOURCE_H
-#include /**/ "ace/pre.h"
-
-#include "tao/default_resource.h"
-#include "tao/TAO_FlReactor_export.h"
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-//forward
-class ACE_FlReactor;
-
-/**
- * @class TAO_FlResource_Factory
- *
- * @brief TAO's default resource factory for FlReactor
- *
- * This factory is intended for creating FlReactor for ORB.
- */
-class TAO_FlReactor_Export TAO_FlResource_Factory : public TAO_Default_Resource_Factory
-{
-
-public:
-  TAO_FlResource_Factory (void);
-
-protected:
-  /// Obtain the reactor implementation
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-
-private:
-  static ACE_FlReactor *impl_; /// FlReactor created by factory
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/fl_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_FlReactor, TAO_FlResource_Factory)
-ACE_FACTORY_DECLARE (TAO_FlReactor, TAO_FlResource_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* FLRESOURCE_H */
diff --git a/TAO/tao/fl_resource.i b/TAO/tao/fl_resource.i
deleted file mode 100644
index c3856a491ba..00000000000
--- a/TAO/tao/fl_resource.i
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-ACE_INLINE
-TAO_FlResource_Factory::TAO_FlResource_Factory (void)
-{
-}
diff --git a/TAO/tao/fl_resource_loader.cpp b/TAO/tao/fl_resource_loader.cpp
deleted file mode 100644
index 98c1c82f0f8..00000000000
--- a/TAO/tao/fl_resource_loader.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//$Id$
-#include "ORB_Core.h"
-#include "tao/fl_resource_loader.h"
-#include "tao/fl_resource.h"
-
-TAO_FlResource_Loader::TAO_FlResource_Loader ()
-{
-    TAO_ORB_Core::set_reactor_factory ("FlResource_Factory");
-    ACE_Service_Config::process_directive (ace_svc_desc_TAO_FlResource_Factory);
-}
-
-TAO_FlResource_Loader::~TAO_FlResource_Loader ()
-{
-}
diff --git a/TAO/tao/fl_resource_loader.h b/TAO/tao/fl_resource_loader.h
deleted file mode 100644
index 8bd5ad67517..00000000000
--- a/TAO/tao/fl_resource_loader.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   fl_resource_loader.h
- *
- *  $Id$
- *
- *  @author Marek Brudka <mbrudka@aster.pl>
-
-*/
-//=============================================================================
-
-#ifndef _TAO_FLRESOURCE_LOADER_H
-#define _TAO_FLRESOURCE_LOADER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_FlReactor_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_FlResource_Loader
- *
- * @brief Loads TAO resources related with Fl.
- *
- * This class changes the default reactor implementation into ACE_FlReactor
- *
- */
-class TAO_FlReactor_Export TAO_FlResource_Loader
-{
-
-public:
-
-    TAO_FlResource_Loader ( );
-    virtual ~TAO_FlResource_Loader ();
-
-};
-
-#include /**/ "ace/post.h"
-#endif /* FLRESOURCELOADER_H */
diff --git a/TAO/tao/qt_resource.cpp b/TAO/tao/qt_resource.cpp
deleted file mode 100644
index 0ce73c42e95..00000000000
--- a/TAO/tao/qt_resource.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//$Id$
-#include "tao/qt_resource.h"
-
-#if !defined (__ACE_INLINE__)
-# include "qt_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
-QApplication *TAO_QtResource_Factory::qapp_ = 0 ;
-ACE_QtReactor *TAO_QtResource_Factory::reactor_impl_ = 0;
-
-ACE_Reactor_Impl *
-TAO_QtResource_Factory::allocate_reactor_impl (void) const
-{
-  if (this->qapp_ == 0)
-    return 0;
-  if ( !reactor_impl_ )
-  {
-      ACE_NEW_RETURN (reactor_impl_,
-                     ACE_QtReactor (qapp_),
-                     0);
-      ACE_DEBUG ((LM_DEBUG, "ACE_QtReactor created.\n"));
-  }
-  return reactor_impl_;
-}
-
-void
-TAO_QtResource_Factory::set_context (QApplication *qapp)
-{
-  TAO_QtResource_Factory::qapp_ = qapp;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_QtResource_Factory,
-                       ACE_TEXT ("QtResource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_QtResource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_QtReactor, TAO_QtResource_Factory)
-
-
diff --git a/TAO/tao/qt_resource.h b/TAO/tao/qt_resource.h
deleted file mode 100644
index 3ed0524eebd..00000000000
--- a/TAO/tao/qt_resource.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   qt_resource.h
- *
- *  $Id$
- *
- *  @author Hamish Friedlander <ullexco@wave.co.nz>
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef _TAO_QTRESOURCE_H
-#define _TAO_QTRESOURCE_H
-#include /**/ "ace/pre.h"
-
-#include "tao/default_resource.h"
-#include "tao/TAO_QtReactor_export.h"
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/QtReactor.h"
-
-
-/**
- * @class TAO_QtResource_Factory
- *
- * @brief TAO's default resource factory
- *
- * This factory is intended for creating QtReactor for ORB.
- */
-class TAO_QtReactor_Export TAO_QtResource_Factory : public TAO_Default_Resource_Factory
-{
-
-public:
-    TAO_QtResource_Factory (void);
-
-    /// Set the context used to create the QtReactor
-    static void set_context (QApplication *qapp) ;
-
-protected:
-    /// Obtain the reactor implementation
-    virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-
-private:
-    static QApplication *qapp_ ;
-    static ACE_QtReactor *reactor_impl_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/qt_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_QtReactor, TAO_QtResource_Factory)
-    ACE_FACTORY_DECLARE (TAO_QtReactor, TAO_QtResource_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* QTRESOURCE_H */
diff --git a/TAO/tao/qt_resource.i b/TAO/tao/qt_resource.i
deleted file mode 100644
index 633d38ff2aa..00000000000
--- a/TAO/tao/qt_resource.i
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-ACE_INLINE 
-TAO_QtResource_Factory::TAO_QtResource_Factory (void)
-{
-}
diff --git a/TAO/tao/qt_resource_loader.cpp b/TAO/tao/qt_resource_loader.cpp
deleted file mode 100644
index dc5db624ade..00000000000
--- a/TAO/tao/qt_resource_loader.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//$Id$
-#include "ORB_Core.h"
-#include "tao/qt_resource_loader.h"
-
-#include "ace/Dynamic_Service.h"
-#include "tao/qt_resource.h"
-
-
-// Must be called with lock held
-TAO_QtResource_Loader::TAO_QtResource_Loader (QApplication *qapp)
-{
-    TAO_QtResource_Factory::set_context (qapp);
-    TAO_ORB_Core::set_reactor_factory ("QtResource_Factory");
-    ACE_Service_Config::process_directive (ace_svc_desc_TAO_QtResource_Factory);
-}
-
-TAO_QtResource_Loader::~TAO_QtResource_Loader ()
-{
-}
diff --git a/TAO/tao/qt_resource_loader.h b/TAO/tao/qt_resource_loader.h
deleted file mode 100644
index 6482cdaf5b4..00000000000
--- a/TAO/tao/qt_resource_loader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   qt_resource_loader.h
- *
- *  $Id$
- *
- *  @author Marek Brudka <mbrudka@aster.pl>
-
-*/
-//=============================================================================
-
-#ifndef _TAO_QTRESOURCE_LOADER_H
-#define _TAO_QTRESOURCE_LOADER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_QtReactor_export.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// forwards
-class QApplication;
-/**
- * @class TAO_QtResource_Loader
- *
- * @brief Loads TAO resources related with Qt.
- *
- * This class changes the default reactor implementation into ACE_QtReactor
- *
- */
-class TAO_QtReactor_Export TAO_QtResource_Loader
-{
-
-public:
-    TAO_QtResource_Loader  (QApplication *qapp=0);
-    virtual ~TAO_QtResource_Loader ();
-};
-
-#include /**/ "ace/post.h"
-#endif /* QTRESOURCELOADER_H */
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 02439fdf4bf..95e597b6647 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -191,6 +191,7 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
       LF_Strategy_Complete.cpp
       params.cpp
       Resource_Factory.cpp
+      GUIResource_Factory.cpp
       Server_Strategy_Factory.cpp
       Sync_Strategies.cpp
       TAO_Internal.cpp
diff --git a/TAO/tao/tao_flreactor.mpc b/TAO/tao/tao_flreactor.mpc
deleted file mode 100644
index 734517436f3..00000000000
--- a/TAO/tao/tao_flreactor.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-project(TAO_FlReactor) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_flreactor {
-  sharedname   = TAO_FlReactor
-  dynamicflags += TAO_FLREACTOR_BUILD_DLL
-  Header_Files {
-    fl_resource.h
-    fl_resource_loader.h
-    TAO_FlReactor_export.h
-  }
-  Inline_Files {
-    fl_resource.i
-  }
-  Source_Files(TAO_COMPONENTS) {
-    Default_Resources {
-      fl_resource_loader.cpp
-      fl_resource.cpp
-    }
-  }
-}
diff --git a/TAO/tao/tao_qtreactor.mpc b/TAO/tao/tao_qtreactor.mpc
deleted file mode 100644
index 93d58256173..00000000000
--- a/TAO/tao/tao_qtreactor.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-project(TAO_QtReactor) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_qtreactor {
-  sharedname   = TAO_QtReactor
-  dynamicflags += TAO_QTREACTOR_BUILD_DLL
-  Header_Files {
-    qt_resource.h
-    qt_resource_loader.h
-    TAO_QtReactor_export.h
-  }
-  Inline_Files {
-    qt_resource.i
-  }
-  Source_Files(TAO_COMPONENTS) {
-    Default_Resources {
-      qt_resource.cpp
-      qt_resource_loader.cpp
-    }
-  }
-}
diff --git a/TAO/tao/tao_tkreactor.mpc b/TAO/tao/tao_tkreactor.mpc
deleted file mode 100644
index b91855d0c55..00000000000
--- a/TAO/tao/tao_tkreactor.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-project(TAO_TkReactor) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_tkreactor {
-  sharedname   = TAO_TkReactor
-  dynamicflags += TAO_TKREACTOR_BUILD_DLL
-  Header_Files {
-    tk_resource.h
-    tk_resource_loader.h
-    TAO_TkReactor_export.h
-  }
-  Inline_Files {
-    tk_resource.i
-  }
-  Source_Files(TAO_COMPONENTS) {
-    Default_Resources {
-      tk_resource.cpp
-      tk_resource_loader.cpp
-    }
-  }
-}
diff --git a/TAO/tao/tao_xtreactor.mpc b/TAO/tao/tao_xtreactor.mpc
deleted file mode 100644
index dd7723239ef..00000000000
--- a/TAO/tao/tao_xtreactor.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-project(TAO_XtReactor) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_xtreactor {
-  sharedname   = TAO_XtReactor
-  dynamicflags += TAO_XTREACTOR_BUILD_DLL
-  Header_Files {
-    xt_resource.h
-    xt_resource_loader.h
-    TAO_XtReactor_export.h
-  }
-  Inline_Files {
-    xt_resource.i
-  }
-  Source_Files(TAO_COMPONENTS) {
-    Default_Resources {
-      xt_resource.cpp
-      xt_resource_loader.cpp
-    }
-  }
-}
diff --git a/TAO/tao/tk_resource.cpp b/TAO/tao/tk_resource.cpp
deleted file mode 100644
index 11c7a68fb45..00000000000
--- a/TAO/tao/tk_resource.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-//$Id$
-#include "tao/tk_resource.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tk_resource.i"
-#endif /* ! __ACE_INLINE__ */
-#include "ace/TkReactor.h"
-ACE_TkReactor *
-TAO_TkResource_Factory::impl_ = 0 ;
-
-ACE_Reactor_Impl *
-TAO_TkResource_Factory::allocate_reactor_impl (void) const
-{
-  if ( !impl_ )
-  {
-    ACE_NEW_RETURN(impl_,
-                   ACE_TkReactor (),
-                   0);
-    ACE_DEBUG ((LM_DEBUG, "ACE_TkReactor created.\n"));
-  }
-
-  return impl_;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_TkResource_Factory,
-                       ACE_TEXT ("TkResource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_TkResource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_TkReactor, TAO_TkResource_Factory)
-
diff --git a/TAO/tao/tk_resource.h b/TAO/tao/tk_resource.h
deleted file mode 100644
index 76a7cf3bc05..00000000000
--- a/TAO/tao/tk_resource.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   tk_resource.h
- *
- *  $Id$
- *
- *  @author Marek Brudka <mbrudka@aster.pl>
- */
-//=============================================================================
-
-#ifndef _TAO_TKRESOURCE_H
-#define _TAO_TKRESOURCE_H
-#include /**/ "ace/pre.h"
-
-#include "tao/default_resource.h"
-#include "tao/TAO_TkReactor_export.h"
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// forwards
-class ACE_TkReactor;
-
-/**
- * @class TAO_TkResource_Factory
- *
- * @brief TAO's default resource factory for TkReactor
- *
- * This factory is intended for creating TkReactor for ORB.
- */
-
-class TAO_TkReactor_Export TAO_TkResource_Factory : public TAO_Default_Resource_Factory
-{
-
-public:
-  TAO_TkResource_Factory (void);
-
-protected:
-  /// Obtain the reactor implementation
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-
-private:
-  static ACE_TkReactor *impl_;
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/tk_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_TkReactor, TAO_TkResource_Factory)
-ACE_FACTORY_DECLARE (TAO_TkReactor, TAO_TkResource_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* TKRESOURCE_H */
diff --git a/TAO/tao/tk_resource.i b/TAO/tao/tk_resource.i
deleted file mode 100644
index c19120ede32..00000000000
--- a/TAO/tao/tk_resource.i
+++ /dev/null
@@ -1,5 +0,0 @@
-//$Id$
-ACE_INLINE
-TAO_TkResource_Factory::TAO_TkResource_Factory (void)
-{
-}
diff --git a/TAO/tao/tk_resource_loader.cpp b/TAO/tao/tk_resource_loader.cpp
deleted file mode 100644
index 0403fc6e7b7..00000000000
--- a/TAO/tao/tk_resource_loader.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//$Id$
-#include "ORB_Core.h"
-#include "tao/tk_resource_loader.h"
-#include "tao/tk_resource.h"
-
-TAO_TkResource_Loader::TAO_TkResource_Loader ()
-{
-    TAO_ORB_Core::set_reactor_factory ("TkResource_Factory");
-    ACE_Service_Config::process_directive (ace_svc_desc_TAO_TkResource_Factory);
-}
-
-TAO_TkResource_Loader::~TAO_TkResource_Loader ()
-{
-}
diff --git a/TAO/tao/tk_resource_loader.h b/TAO/tao/tk_resource_loader.h
deleted file mode 100644
index 4732c39cf03..00000000000
--- a/TAO/tao/tk_resource_loader.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   tk_resource_loader.h
- *
- *  $Id$
- *
- *  @author Marek Brudka <mbrudka@aster.pl>
-
-*/
-//=============================================================================
-
-#ifndef _TAO_TKRESOURCE_LOADER_H
-#define _TAO_TKRESOURCE_LOADER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_TkReactor_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_TkResource_Loader
- *
- * @brief Loads TAO resources related with Tk.
- *
- * This class changes the default reactor implementation into ACE_TkReactor
- *
- */
-class TAO_TkReactor_Export TAO_TkResource_Loader
-{
-
-public:
-
-    TAO_TkResource_Loader ( );
-    virtual ~TAO_TkResource_Loader ();
-
-};
-
-#include /**/ "ace/post.h"
-#endif /* TKRESOURCELOADER_H */
diff --git a/TAO/tao/xt_resource.cpp b/TAO/tao/xt_resource.cpp
deleted file mode 100644
index a9804b87a14..00000000000
--- a/TAO/tao/xt_resource.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-#include "tao/xt_resource.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/xt_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, xt_resource, "$Id$")
-
-ACE_XtReactor *
-TAO_XtResource_Factory::impl_ = 0;
-
-XtAppContext
-TAO_XtResource_Factory::context_ = 0;
-
-ACE_Reactor_Impl*
-TAO_XtResource_Factory::allocate_reactor_impl (void) const
-{
-  if (TAO_XtResource_Factory::context_ == 0)
-    return 0;
-
-  if ( !impl_ )
-  {
-    ACE_NEW_RETURN (impl_, ACE_XtReactor (TAO_XtResource_Factory::context_), 0);
-    ACE_DEBUG ((LM_DEBUG, "ACE_FlReactor created.\n"));
-  }
-
-  return impl_;
-}
-
-void
-TAO_XtResource_Factory::set_context (XtAppContext context)
-{
-  TAO_XtResource_Factory::context_ = context;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_XtResource_Factory,
-                       ACE_TEXT ("XtResource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_XtResource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO_XtReactor, TAO_XtResource_Factory)
-
diff --git a/TAO/tao/xt_resource.h b/TAO/tao/xt_resource.h
deleted file mode 100644
index 187b369c7cc..00000000000
--- a/TAO/tao/xt_resource.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   xt_resource.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-
-#ifndef TAO_XT_RESOURCE_H
-#define TAO_XT_RESOURCE_H
-#include /**/ "ace/pre.h"
-
-#include "tao/default_resource.h"
-#include "tao/TAO_XtReactor_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/XtReactor.h"
-//forwards
-class ACE_XtReactor;
-
-// ****************************************************************
-
-/**
- * @class TAO_XT_Resource_Factory
- *
- * @brief TAO's default resource factory
- *
- * This factory is intended for creating XtReactor for ORB.
- */
-class TAO_XtReactor_Export TAO_XtResource_Factory : public TAO_Default_Resource_Factory
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_XtResource_Factory (void);
-
-  /// Set the context used to create the XtReactor
-  static void set_context (XtAppContext context);
-
-protected:
-  /// Obtain the reactor implementation
-  virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-
-private:
-  static XtAppContext context_;
-  static ACE_XtReactor *impl_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/xt_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_XtReactor, TAO_XtResource_Factory)
-ACE_FACTORY_DECLARE (TAO_XtReactor, TAO_XtResource_Factory)
-
-
-#include /**/ "ace/post.h"
-#endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/xt_resource.i b/TAO/tao/xt_resource.i
deleted file mode 100644
index 0ae98779530..00000000000
--- a/TAO/tao/xt_resource.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_XtResource_Factory::TAO_XtResource_Factory (void)
-{
-}
diff --git a/TAO/tao/xt_resource_loader.cpp b/TAO/tao/xt_resource_loader.cpp
deleted file mode 100644
index 8e65dcdb9fb..00000000000
--- a/TAO/tao/xt_resource_loader.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//$Id$
-#include "ORB_Core.h"
-#include "tao/xt_resource_loader.h"
-#include "tao/xt_resource.h"
-
-
-// Must be called with lock held
-TAO_XtResource_Loader::TAO_XtResource_Loader (XtAppContext context)
-{
-    TAO_XtResource_Factory::set_context (context);
-    TAO_ORB_Core::set_reactor_factory ("XtResource_Factory");
-    ACE_Service_Config::process_directive (ace_svc_desc_TAO_XtResource_Factory);
-}
-
-TAO_XtResource_Loader::~TAO_XtResource_Loader ()
-{
-}
diff --git a/TAO/tao/xt_resource_loader.h b/TAO/tao/xt_resource_loader.h
deleted file mode 100644
index 8c2d7dfd6c3..00000000000
--- a/TAO/tao/xt_resource_loader.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- 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/FL_Cube/FL_Cube.mpc b/TAO/tests/FL_Cube/FL_Cube.mpc
index 7f44e2c96ce..87c8e137dad 100644
--- a/TAO/tests/FL_Cube/FL_Cube.mpc
+++ b/TAO/tests/FL_Cube/FL_Cube.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver, tao_flreactor {
+project(*client) : taoexe, portableserver, tao_flresource {
   source_files {
     client.cpp
   }
 }
 
-project(*server) : taoexe, portableserver, tao_flreactor {
+project(*server) : taoexe, portableserver, tao_flresource {
   source_files {
     server.cpp
     test_i.cpp
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index bdfe051c21f..bb4a9dee3c5 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -1,5 +1,5 @@
 // $Id$
-#include "tao/fl_resource_loader.h"
+#include "tao/FlResource_Loader.h"
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
@@ -53,7 +53,7 @@ private:
 
 int main (int argc, char* argv[])
 {
-  TAO_FlResource_Loader fl_loader;
+  TAO::FlResource_Loader fl_loader;
 
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index 1f6dda6a5f2..f3c3a235446 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -2,7 +2,7 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
-#include "tao/fl_resource_loader.h"
+#include "tao/FlResource_Loader.h"
 
 ACE_RCSID(FL_Cube, server, "$Id$")
 
@@ -40,10 +40,8 @@ int
 main (int argc, char *argv[])
 {
   Fl_Window window(300, 300);
-  ACE_DEBUG ((LM_DEBUG, "before TAO_FlResource_Loader::TAO_FlResource_Loader ()\n"));
-  
-  TAO_FlResource_Loader fl_loader;
-  ACE_DEBUG ((LM_DEBUG, "after TAO_FlResource_Loader::TAO_FlResource_Loader ()\n"));
+  TAO::FlResource_Loader fl_loader;
+
   Simple_Window sw (10, 10,
                     window.w () - 20, window.h () - 20);
   window.resizable (&sw);
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index 3ccfbc03243..a134df67dd0 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, tao_qtreactor  {
+project(*server): taoexe, portableserver, tao_qtresource  {
 
   MOC_Files {
     test_i.h
@@ -14,7 +14,7 @@ project(*server): taoexe, portableserver, tao_qtreactor  {
   }
 }
 
-project(*client): taoexe, tao_qtreactor {
+project(*client): taoexe, tao_qtresource {
 
   MOC_Files {
     client.h
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 5453b33d85c..165651a0181 100755
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -2,7 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
-#include "tao/qt_resource_loader.h"
+#include "tao/QtResource_Loader.h"
 
 ACE_RCSID(QtTests, client, "$Id$")
 
@@ -12,7 +12,7 @@ int
 main (int argc, char *argv[])
 {
   QApplication app (argc, argv);
-  TAO_QtResource_Loader qt_resources (&app);
+  TAO::QtResource_Loader qt_resources (&app);
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index d70cc8f58c6..e4b50c40a70 100755
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -18,7 +18,6 @@
 
 #include "testC.h"
 
-#include "tao/qt_resource.h"
 #include <qapplication.h>
 #include <qvbox.h>
 #include <qslider.h>
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 1fccab81a3e..718c1947c7c 100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (QtTests, server, "$Id$")
 #ifdef index
 #undef index
 #endif
-#include "tao/qt_resource_loader.h"
+#include "tao/QtResource_Loader.h"
 #include <qlcdnumber.h>
 #include <qvbox.h>
 #include <qslider.h>
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
 
   // Qt specific stuff for running with TAO...
   QApplication app (argc, argv);
-  TAO_QtResource_Loader qt_resources (&app);
+  TAO::QtResource_Loader qt_resources (&app);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index 78247d9ace6..9c82c9832bb 100755
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -18,8 +18,6 @@
 
 #include "testS.h"
 
-
-#include "tao/qt_resource.h"
 #include <qapplication.h>
 #include <qobject.h>
 
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index f8d3aa3b5ff..978e0f3c3b1 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_loader.h"
+#include "tao/XtResource_Loader.h"
 class Control;
 
 class Client
diff --git a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
index 7ecc836a15e..d98e1e04898 100644
--- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
+++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, tao_xtreactor, ace_motif {
+project(*Server): taoexe, portableserver, tao_xtresource, ace_motif {
   Source_Files {
     test_i.cpp
     Stopwatch_display.cpp
@@ -10,7 +10,7 @@ project(*Server): taoexe, portableserver, tao_xtreactor, ace_motif {
   }
 }
 
-project(*Client): taoexe, tao_xtreactor, ace_motif {
+project(*Client): taoexe, tao_xtresource, ace_motif {
   Source_Files {
     testC.cpp
     Control.cpp
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 25363c6b157..5ef015f0e6a 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_XtResource_Loader xt_loader (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 46ffa556c98..374dcb368f0 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_loader.h"
+#include "tao/XtResource_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_XtResource_Loader xt_loader (app);
+  TAO::XtResource_Loader xt_loader (app);
 
   Stopwatch_display stopwatch (toplevel);
 
diff --git a/bin/MakeProjectCreator/config/tao_flreactor.mpb b/bin/MakeProjectCreator/config/tao_flreactor.mpb
deleted file mode 100644
index bd16ccab864..00000000000
--- a/bin/MakeProjectCreator/config/tao_flreactor.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-project: taolib, ace_flreactor {
-  requires += tao_flreactor
-  after    += tao_flreactor
-  libs     += TAO_FlReactor
-}
diff --git a/bin/MakeProjectCreator/config/tao_flresource.mpb b/bin/MakeProjectCreator/config/tao_flresource.mpb
new file mode 100644
index 00000000000..90aa5c450e3
--- /dev/null
+++ b/bin/MakeProjectCreator/config/tao_flresource.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+project: taolib, ace_flreactor {
+  requires += tao_flresource
+  after    += TAO_FlResource
+  libs     += TAO_FlResource
+}
diff --git a/bin/MakeProjectCreator/config/tao_qtreactor.mpb b/bin/MakeProjectCreator/config/tao_qtreactor.mpb
deleted file mode 100644
index 5bbc956a258..00000000000
--- a/bin/MakeProjectCreator/config/tao_qtreactor.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-
-project : taolib, ace_qtreactor {
-  requires += tao_qtreactor
-  after    += TAO_QtReactor
-  libs     += TAO_QtReactor
-}
diff --git a/bin/MakeProjectCreator/config/tao_qtresource.mpb b/bin/MakeProjectCreator/config/tao_qtresource.mpb
new file mode 100644
index 00000000000..ec6413204ee
--- /dev/null
+++ b/bin/MakeProjectCreator/config/tao_qtresource.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+
+project : taolib, ace_qtreactor {
+  requires += tao_qtresource
+  after    += TAO_QtResource
+  libs     += TAO_QtResource
+}
diff --git a/bin/MakeProjectCreator/config/tao_tkreactor.mpb b/bin/MakeProjectCreator/config/tao_tkreactor.mpb
deleted file mode 100644
index b77fd3a00aa..00000000000
--- a/bin/MakeProjectCreator/config/tao_tkreactor.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-project: acelib, ace_tkreactor {
-  requires += tao_tkreactor
-  after    += tao_tkreactor
-  libs     += TAO_TkReactor
-}
diff --git a/bin/MakeProjectCreator/config/tao_tkresource.mpb b/bin/MakeProjectCreator/config/tao_tkresource.mpb
new file mode 100644
index 00000000000..547610fe001
--- /dev/null
+++ b/bin/MakeProjectCreator/config/tao_tkresource.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+project: acelib, ace_tkreactor {
+  requires += tao_tkresource
+  after    += TAO_TkResource
+  libs     += TAO_TkResource
+}
diff --git a/bin/MakeProjectCreator/config/tao_xtreactor.mpb b/bin/MakeProjectCreator/config/tao_xtreactor.mpb
deleted file mode 100644
index 345f563f57c..00000000000
--- a/bin/MakeProjectCreator/config/tao_xtreactor.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-
-project : taolib, ace_xtreactor {
-  requires += tao_xtreactor
-  after    += TAO_XtReactor
-  libs     += TAO_XtReactor
-}
diff --git a/bin/MakeProjectCreator/config/tao_xtresource.mpb b/bin/MakeProjectCreator/config/tao_xtresource.mpb
new file mode 100644
index 00000000000..6b6491d0d60
--- /dev/null
+++ b/bin/MakeProjectCreator/config/tao_xtresource.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+
+project : taolib, ace_xtreactor {
+  requires += tao_xtresource
+  after    += TAO_XtResource
+  libs     += TAO_XtResource
+}