ChangeLogTag: Sun Jan 23 01:54:59 2005 Marek Brudka <mbrudka@aster.pl>

116 files changed, 2314 insertions, 520 deletions

diff --git a/TAO/.cvsignore b/TAO/.cvsignore
new file mode 100644
index 00000000000..2d37e4a886d
--- /dev/null
+++ b/TAO/.cvsignore
@@ -0,0 +1 @@
+myTAOACE.mwc
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index bccd17141e3..ecfe6cea3fc 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,10 +1,17 @@
+Sun Jan 23 01:49:51 2005  Marek Brudka  <mbrudka@aster.pl>
+
+	* examples/OEP/Display/NavDisplayGUI_exec/README (Module):
+	* examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc (Module):
+	Changes related with separation of GUI reactors.
+	The additional information is avalaible in ChangeLog at REACTOR_SEPARATION branch.
+
 Fri Jan 21 17:27:12 2005  Gan Deng  <gan.deng@vanderbilt.edu>
 
 	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
 
           Fixed dependency relationship by making
           NodeAppTest_RoundTrip_stub depending on CIAO_DnC_Container.
-      
+
 	* examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
 
           Fixed warning on Debian_Full_Reactor build. The warning is
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index e48a08219bd..cb5cea1b621 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(NavDisplayGUI_exec) : ciao_component, qt, qt_moc {
+project(NavDisplayGUI_exec) : ciao_component, qt {
   after   += NavDisplay_exec
   requires += qt
   sharedname = NavDisplayGUI_exec
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README
index 83b58e12736..c5cb76a6fd9 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README
@@ -1,7 +1,7 @@
 This example is the Qt-based GUI implementation of NavDisplay component.
 
 It is NOT necessary to compile ACE/TAO/CIAO with Qt support,
-i.e. ACE_HAS_QT since this example does not relyes on Qt Reactor and
+since this example does not relyes on Qt Reactor and
 communicates with GUI part using QApplication::postMessage() and
 simple Command Pattern based framework.  But be sure that QTDIR
 environment variable is pointed to your Qt installation directory.
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c2bf20ff7d5..1517d7e4f4b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,91 @@
+Sun Jan 23 01:52:50 2005  Marek Brudka  <mbrudka@aster.pl>
+
+	* tests/Xt_Stopwatch/timer.h:
+	* tests/Xt_Stopwatch/timer.cpp:
+	* tests/Xt_Stopwatch/test_i.h:
+	* tests/Xt_Stopwatch/test_i.cpp:
+	* tests/Xt_Stopwatch/svc.conf.xml:
+	* tests/Xt_Stopwatch/svc.conf:
+	* tests/Xt_Stopwatch/server.cpp:
+	* tests/Xt_Stopwatch/client.cpp:
+	* tests/Xt_Stopwatch/Xt_Stopwatch.mpc:
+	* tests/Xt_Stopwatch/Stopwatch_display.h:
+	* tests/Xt_Stopwatch/Stopwatch_display.cpp:
+	* tests/Xt_Stopwatch/README:
+	* tests/Xt_Stopwatch/Control.h:
+	* tests/Xt_Stopwatch/Control.cpp:
+	* tests/Xt_Stopwatch/Client.h:
+	* tests/QtTests/test_i.h:
+	* tests/QtTests/test_i.cpp:
+	* tests/QtTests/svc.conf.xml:
+	* tests/QtTests/svc.conf:
+	* tests/QtTests/server.cpp:
+	* tests/QtTests/client.h:
+	* tests/QtTests/client.cpp:
+	* tests/QtTests/README:
+	* tests/QtTests/QtTests.mpc:
+	* tests/FL_Cube/test_i.h:
+	* tests/FL_Cube/test_i.cpp:
+	* tests/FL_Cube/svc.conf.xml:
+	* tests/FL_Cube/svc.conf:
+	* tests/FL_Cube/server.cpp:
+	* tests/FL_Cube/client.cpp:
+	* tests/FL_Cube/FL_Cube.mpc:
+	* tao/Strategies/advanced_resource.h (Module):
+	* tao/Strategies/advanced_resource.cpp (Module):
+	* tao/xt_resource.i (Module):
+	* tao/xt_resource.h (Module):
+	* tao/xt_resource.cpp (Module):
+	* tao/tao.mpc (Module):
+	* tao/qt_resource.i (Module):
+	* tao/qt_resource.h (Module):
+	* tao/qt_resource.cpp (Module):
+	* tao/XtResource_Loader.h (Module):
+	* tao/XtResource_Loader.cpp (Module):
+	* tao/XtResource_Factory.h (Module):
+	* tao/XtResource_Factory.cpp (Module):
+	* tao/XtResource.mpc (Module):
+	* tao/TkResource_Loader.h (Module):
+	* tao/TkResource_Loader.cpp (Module):
+	* tao/TkResource_Factory.h (Module):
+	* tao/TkResource_Factory.cpp (Module):
+	* tao/TkResource.mpc (Module):
+	* tao/TSS_Resources.h (Module):
+	* tao/TSS_Resources.cpp (Module):
+	* tao/TAO_XtResource_Export.h (Module):
+	* tao/TAO_TkResource_Export.h (Module):
+	* tao/TAO_QtResource_Export.h (Module):
+	* tao/TAO_FlResource_Export.h (Module):
+	* tao/Strategies.mpc (Module):
+	* tao/QtResource_Loader.h (Module):
+	* tao/QtResource_Loader.cpp (Module):
+	* tao/QtResource_Factory.h (Module):
+	* tao/QtResource_Factory.cpp (Module):
+	* tao/QtResource.mpc (Module):
+	* tao/ORB_Core.h (Module):
+	* tao/ORB_Core.cpp (Module):
+	* tao/Leader_Follower.cpp (Module):
+	* tao/GUIResource_Factory.h (Module):
+	* tao/GUIResource_Factory.cpp (Module):
+	* tao/FlResource_Loader.h (Module):
+	* tao/FlResource_Loader.cpp (Module):
+	* tao/FlResource_Factory.h (Module):
+	* tao/FlResource_Factory.cpp (Module):
+	* tao/FlResource.mpc (Module):
+	* examples/AMI/FL_Callback/svc.conf.xml (Module):
+	* examples/AMI/FL_Callback/svc.conf (Module):
+	* examples/AMI/FL_Callback/progress.cpp (Module):
+	* examples/AMI/FL_Callback/README (Module):
+	* examples/AMI/FL_Callback/Progress_i.h (Module):
+	* examples/AMI/FL_Callback/Progress_i.cpp (Module):
+	* examples/AMI/FL_Callback/FL_Callback.mpc (Module):
+	* docs/Options.html (Module):
+	Changes related with separation of GUI reactors.
+	The additional information is avalaible in ChangeLog at REACTOR_SEPARATION branch.
+
+	* .cvsignore:
+	To make cvs silent.
+
 Sat Jan 22 12:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/Shutdown_Utilities.{h,cpp}:
@@ -23,8 +111,528 @@ Fri Jan 21 17:10:31 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
           Added Pkgconfig_Files definitions.
 
+
 Fri Jan 21 18:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+
+          Used VMCID while trying to propogate system exception with minor
+          code.
+
+Wed Dec  1 12:00:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl:
+
+          Correct typo in client's server IOR parameter.
+
+Wed Dec  1 11:38:57 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Update.
+
+        * orbsvcs/orbsvcs/FTORB.mpc:
+
+          Added PortableGroup_Simple_export.h, PortableGroup_Simple_DSS_T.h
+          to Header_Files; PortableGroup_Simple_DSS_T.inl to Inline_Files;
+          and PortableGroup_Simple_DSS_T.cpp to Template_Files so headers
+          will be installed.
+
+Wed Dec  1 19:29:32 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/SystemException.cpp:
+
+          Moved some of the minor code changes from Johnn's branch to the
+          main trunk. The minor code specification was slightly out of
+          whack with the CORBA specification.
+
+Wed Dec  1 17:19:39 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+
+          Added minor code while throwing BAD_OPERATION exception in
+          conformance with the CORBA spec.
+
+        * tao/IIOP_Endpoint.cpp:
+
+          Removed a weird DEBUG statemnet.
+
+        * tao/SystemException.cpp:
+
+          Added a minor code lookup table for BAD_OPERATION.
+
+Wed Dec  1 16:30:00 UTC 2004  Simon Massey  <sma@prismtech.com>
+
+        * TAO/TAO_IDL/util/utl_global.cpp
+
+          Fixed bugzilla 1995 - TAO_IDL Compiler - Memory buffer
+          overflow & File handle resource leak
+
+Wed Dec  1 15:30:00 UTC 2004  Simon Massey  <sma@prismtech.com>
+
+        * TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+        * TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+        * TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+
+          Fixed bugzilla 1996 - IFR - Dereferencing NULL pointer
+          when compound object has been deleted.  Thanks to Johnny
+          Willemsen <jwillemsen@remedy.nl> for pointing out emulated
+          exceptions were wrongly used in the previous fix.
+
+Wed Dec  1 14:00:00 UTC 2004  Simon Massey  <sma@prismtech.com>
+
+        * TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+        * TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+        * TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+
+          Fixed bugzilla 1996 - IFR - Dereferencing NULL pointer
+          when compound object has been deleted
+
+Wed Dec  1 07:18:37 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/FT_App/FT_Client.cpp:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp:
+
+          Fixed build warnings about mismatch parameter types with
+          fprintf.
+
+Tue Nov 30 16:33:08 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Add replace_key.cpp to FTRT_EventChannel sources.
+
+Tue Nov 30 11:42:50 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Any_Arg_Traits.h:
+
+          New file, containing template specializations of the
+          stub and skeleton arg traits classes for CORBA::Any.
+          These specializations were formerly in generated code.
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_decl.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be_include/be_visitor_arg_traits.h:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/util/utl_global.cpp:
+
+          Added check for an Any used as an operation parameter, and
+          code to include the new file above if one is seen. This
+          was the only predefined type for which arg traits class
+          specializations were generated, so the
+          visit_predefined_type() method was removed from the
+          arg traits visitor, defaulting execution to the base
+          class method which is a no-op. Thanks to Greg Bostrum
+          <greg.bostrom@hp.com> for reporting a problem with code
+          generation in the Notification Service when multiple IDL
+          file are passed to the IDL compiler on a single command
+          line. After processing each file, all nodes in the AST
+          are destroyed except for the predefined types, and now,
+          at least for the arg traits, all predefined types are
+          handled the same. This fix closes [BUGID:1978].
+
+Tue Nov 30 11:15:29 2004  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+          Missing namespace qualifier on argument.
+
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.h:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+          Replace another overloading of the init method name
+          with a unique and more descriptive name.
+
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
+          BCB6 builds complaining about undefined "ex" in ACE_TRY_NEW_ENV{ ... }ACE_CATCHANY
+          s/ACE_TRY_NEW_ENV/ACE_DECLARE_NEW_ENV;ACE_TRY/
+
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp:
+          Unused ENV argument
+
+        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
+          Remove unnecessary virtual inheritence
+
+Tue Nov 30 09:53:57 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.cpp:
+
+          Renamed the init method in Topology_Object to initialize to avoid
+          ambiguity with the TAO_NotifyProxyConsumer init method.
+
+        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
+
+          Changed the fprintf format from %d to %ld for the long int
+          parameter.
+
+Tue Nov 30 08:38:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/tests/FT_App/FT_Client.cpp:
+          Fixed compile problems.
+
+Mon Nov 29 21:57:06 MST 2004  Scott Harris <harris_s@ociweb.com>
+
+        * examples/Load_Balancing_persistent/Identity_Client.cpp:
+        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
+
+          Removed extra commas after ACE_TEXT macros that should
+          not have been there because the strings should have
+          been concatenated.  Originally found a bad log output
+          and searched for other similar problems.
+
+Mon Nov 29 16:45:00 2004 Huang-Ming Huang <hh1@cse.wustl.edu>
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+          Fixed problem when the immediate successor of the primary crashes. Thanks
+          to Thia Chang Chao <tchangch@dso.org.sg> for reporting the bug.
+
+Mon Nov 29 14:44:16 2004  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Admin.h:
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannel.h:
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+          Another instance of the ambiguous init method.
+
+Mon Nov 29 13:23:14 2004  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.cpp:
+          Ambiguous resolution of init method.  Some compilers
+          don't notice that the base class method is hidden
+          (intentionally) by the derived class method.
+
+Mon Nov 29 17:45:55 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Endpoint.h:
+
+          Added a bool which holds the  details of when the endpoint is
+          encodable. For example, endpoints created by RTCORBA for
+          multiple priorities need to be encoded whereas endpoints created
+          for preffered netwroks need not be encoded.
+
+        * tao/IIOP_Profile.cpp:
+
+          Check the status of the bool before encoding th eendpoint.
+
+        * tao/Strategies/SCIOP_Endpoint.cpp:
+        * tao/Strategies/SCIOP_Endpoint.h:
+        * tao/Strategies/SCIOP_Profile.cpp:
+
+          Repeat the above changes for SCIOP.
+
+Mon Nov 29 07:19:16 2004  Ciju John  <john_c@ociweb.com>
+
+        * orbsvcs/tests/Notify/Discarding/run_test.pl:
+          Increased startup time for sequence server as tests on
+          some machines were failing.
+
+Mon Nov 29 13:15:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp:
+        * orbsvcs/tests/FT_App/StubFaultNotifier.cpp:
+        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp:
+        * orbsvcs/tests/FT_App/FT_Creator.h:
+        * orbsvcs/tests/FT_App/FT_Creator.cpp:
+        * orbsvcs/tests/FT_App/FT_Client.cpp:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp:
+        * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp:
+          Fixed problems with use of iostreams for
+          ACE_LACKS_IOSTREAM_TOTALLY builds (VxWorks DIAB).
+
+        * orbsvcs/tests/FT_App/StubFaultConsumer.cpp:
+        * orbsvcs/tests/FT_App/StubFaultConsumer.h:
+          Fixed problems with use of iostreams for
+          ACE_LACKS_IOSTREAM_TOTALLY builds (VxWorks DIAB).
+          Also fixed incorrect use of 'throw' instead of ACE_THROW_SPEC.
+
+Mon Nov 29 13:10:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/AV/pluggable_av_log:
+          Removed this file, it is a partly changelog that is really ancient
+
+Mon Nov 29 12:39:13 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/IIOP_Endpoint.cpp:
+        * tao/Strategies/SCIOP_Endpoint.cpp:
+
+          Fixed a stupid typo which resulted in some tests failing in the
+          daily builds.  Thanks to Johnny for pointing me to the builds.
+
+Mon Nov 29 10:00:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp:
+          Replaced cout with ACE_ERROR
+
+Sun Nov 28 18:30:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp:
+          Replaced fprintf to stdout with ACE_DEBUG to be more portable
+
+Sun Nov 28 18:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/RTCosScheduling/server.cpp:
+          Replaced NULL with 0, more portable. Also replaced ofstream usage
+          with fopen/fprintf to write the IOR to disk.
+
+Sun Nov 28 18:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/RTCosScheduling/Object1_i.{h,cpp}:
+          Replaced throw with ACE_THROW_SPEC to fix compile problems with
+          building without native excption support
+
+Sun Nov 28 18:00:30 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/IORInterceptor/IORInterceptor.pidl:
+
+          Added some documentation for applying diffs.
+
+        * tao/IORInterceptor/IORInterceptorC.h:
+
+          Cosmetic hand craft to minimize the number of lines of diffs.
+
+        * tao/IORInterceptor/diff/IORInterceptor.diff:
+
+          New file for maintenence.
+
+Sun Nov 28 17:41:37 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/IORInterceptor/IORInterceptor.h:
+
+          A new header file which can be included by trhe applications to
+          pull in IORInterceptor symbols even in static mode.
+
+        * tao/IORInterceptor/IORInterceptorC.cpp:
+        * tao/IORInterceptor/IORInterceptorC.h:
+
+          Regenerated the files with our standard  trick to prevent
+          applications including this file directly.
+
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
+        * tao/IORInterceptor/IORInterceptor_List.h:
+
+          Reduced inter-header dependancies.
+
+        * orbsvcs/examples/ORT/Server_IORInterceptor.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
+        * tests/ORT/ORT_test_IORInterceptor.h:
+        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
+        * tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h:
+
+          #included IORInterceptor.h
+
+Sun Nov 28 15:14:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+
+        * examples/Simple/grid/Grid_Client_i.cpp:
+        * orbsvcs/examples/LoadBalancing/client.cpp:
+          Fixed problems with use of iostreams for
+          ACE_LACKS_IOSTREAM_TOTALLY builds (VxWorks DIAB).
+
+Sun Nov 28 15:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Notify/notify_tests.GNU:
+          Removed this file, it is not needed anymore with MPC
+
+Sun Nov 28 15:02:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+
+        * examples/Simulator/Event_Supplier/Event_Con.cpp:
+          Fixed problems with use of iostreams for
+          ACE_LACKS_IOSTREAM_TOTALLY builds (VxWorks DIAB).
+
+Sun Nov 28 11:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
+          Don't mix virtual and non-virtual inheritance, use virtual for both
+          bases, fixes HPUX warnings
+
+Sun Nov 28 11:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/notify_persist_export.h:
+          Fixed this file for static builds
+
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+          Removed commented out stuff
+
+Sun Nov 28 11:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp:
+          Added include of OS_NS_stdio.h to get fprintf
+
+Sun Nov 28 06:10:36 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * docs/Options.html (scenario):
+
+          Documentation for the options.
+
+Sat Nov 27 23:44:56 2004  Ciju John  <john_c@ociweb.com>
+
+        * orbsvcs/Notify/Standard_Event_Persistence.h:
+        * orbsvcs/Notify/XML_Topology_Factory.h
+          Moved ACE_FACTORY_DECLARE to within TAO_NOTIFY namespace.
+
+        * orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp:
+        * orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h:
+          Added dummy method to remove warnings 'hidden overloaded
+          virtual method'.
+
+Sun Nov 28 05:14:24 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/Connector_Registry.cpp:
+
+          Used an auto_ptr <> instead of using delete's in the error
+          paths.
+
+        The following checkin adds a simple command line option which
+        allows configuring the client ORB during initializing with a
+        capability to choose preferred interface(s). This is very useful
+        for clients on a multihomed hosts, allowing clients to choose
+        specific interfaces/networks to communicate with a remote
+        target. This capability comes through two options
+        -ORBPreferredInterfaces, and
+        -ORBEnforcePreferredInterfaces. Please see docs/Options.html for
+        more details.
+
+        * tao/Endpoint.h:
+
+          Cosmetic fixes.
+
+        * tao/IIOP_Connection_Handler.cpp:
+
+          Added a debug statement
+
+        * tao/IIOP_Connector.cpp:
+
+          Used the local addr for connect () instead of using the default
+          ACE_Addr::sap_any.
+
+        * tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Endpoint.h:
+
+          Added preferred_interfaces (), and a copy constructor. The
+          former is used to parse the option and store the preferred path
+          for every target end point. A list of preferred paths are
+          organized as multiple endpoints (with same target) with different
+          preferred networks stringed through the next_ pointer. This
+          allows the Invocation code path to pick things through its
+          iteration process.
+
+        * tao/IIOP_Profile.cpp:
+
+          Called TAO_IIOP_Endpoint::preferred_interfaces () from within
+          decode_profile ().
+
+        * tao/IIOP_Profile.h:
+
+          Added documentation.
+
+        * tao/ORB_Core.cpp:
+
+          Added the two new options.
+
+        * tao/params.cpp:
+        * tao/params.h:
+
+          Stored the options.
+
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+        * tao/Strategies/SCIOP_Connector.cpp:
+        * tao/Strategies/SCIOP_Endpoint.cpp:
+        * tao/Strategies/SCIOP_Endpoint.h:
+        * tao/Strategies/SCIOP_Profile.cpp:
+        * tao/Strategies/SCIOP_Profile.h:
+
+          Cut and pasted the changes from IIOP for SCIOP. There is too
+          much of similar code out here. We can do some nice
+          implementation inheritance to save some footprint.
+
+          Thanks to LMCO EAGAN, for motivating to address this issue in
+          TAO.
+
+Sat Nov 27 12:52:57 2004  Ciju John  <john_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/XML_Loader.h:
+        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Saver.h:
+        * orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp:
+          Fixed problems with use of iostreams for
+          ACE_LACKS_IOSTREAM_TOTALLY builds (VxWorks DIAB).
+
+Sat Nov 27 14:34:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+
+        * utils/examples/mfc/client.cpp:
+          Fixed problems with use of iostreams for
+          ACE_LACKS_IOSTREAM_TOTALLY builds (VxWorks DIAB).
+
+Sat Nov 27 14:26:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+
+        * utils/performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
+          Fixed problems with use of iostreams for
+          ACE_LACKS_IOSTREAM_TOTALLY builds (VxWorks DIAB).
+
+Sat Nov 27 14:19:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+
+        * utils/catior/catior.cpp:
+          Fixed incompatibility with ACE_LACKS_IOSTREAM_TOTALLY builds
+          (VxWorks DIAB).
+
+Fri Nov 26 17:49:48 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/Log/Basic_Log_Test/run_test.pl:
+
+          New file.
+
+Fri Nov 26 17:53:13 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * TAO-INSTALL.html:
+
+          Removed references to TAOACE.dsw. They are no longer available
+          in the repository.
+
+Fri Nov 26 14:19:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp:
+          Fixed compile problem
+
+Fri Nov 26 10:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1535_Regression/Bug_1535_Regression.mpc:
+          Add minimum_corba as base project, instead of adding
+          avoids += minimum_corba, the base does just the same and
+          make it a little bit better maintainable in the future
+
+Fri Nov 26 09:58:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_server.cpp:
+          Changed use of iostreams to ACE_DEBUG because of compile problems
+          with ACE_LACKS_IOSTREAMS_TOTALLY (VxWorks).
+
+Fri Nov 26 09:43:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
         * TAO-INSTALL.html:
           Updated supported platforms matrix
 
diff --git a/TAO/TAO_IDL/.cvsignore b/TAO/TAO_IDL/.cvsignore
new file mode 100644
index 00000000000..65c93c3e85c
--- /dev/null
+++ b/TAO/TAO_IDL/.cvsignore
@@ -0,0 +1 @@
+tao_idl
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 2876d2a416e..59a53fa4a56 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -979,10 +979,6 @@ the ORB uses. The default reactor is the ACE_TP_Reactor.
               <td>Use the single-thread select-based reactor.</td>
             </tr>
             <tr>
-              <td><code>fl</code></td>
-              <td>Use the FLReactor (FLTK-based).</td>
-            </tr>
-            <tr>
               <td><code>wfmo</code></td>
               <td>Use the WFMO reactor (Win32 only).</td>
             </tr>
diff --git a/TAO/examples/AMI/FL_Callback/.cvsignore b/TAO/examples/AMI/FL_Callback/.cvsignore
new file mode 100644
index 00000000000..3a6a218885f
--- /dev/null
+++ b/TAO/examples/AMI/FL_Callback/.cvsignore
@@ -0,0 +1,2 @@
+peer
+progress
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index c7e9ff8910b..3830cb052d3 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*progress): taoexe, strategies, messaging, ami, portableserver {
-  requires += fl_reactor
+project(*progress): taoexe, messaging, ami, portableserver, tao_flresource {
   Source_Files {
     Progress_i.cpp
     progress.cpp
@@ -10,7 +9,6 @@ project(*progress): taoexe, strategies, messaging, ami, portableserver {
 }
 
 project(*peer): taoexe, strategies, messaging, ami, portableserver {
-  requires += fl_reactor
   Source_Files {
     Peer_i.cpp
     peer.cpp
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index 8232c22e756..2712dc47ff5 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -2,8 +2,6 @@
 
 #include "Progress_i.h"
 
-#if defined(ACE_HAS_FL)
-
 #include <FL/Fl_Slider.h>
 #include <FL/Fl_Button.h>
 
@@ -170,6 +168,3 @@ Progress_Window::start ()
       ACE_ENDTRY;
     }
 }
-
-
-#endif /* ACE_HAS_FL */
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index 32692219f10..efb915e3b52 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -18,8 +18,6 @@
 
 #include "testS.h"
 
-#if defined(ACE_HAS_FL)
-
 #include <FL/Fl_Box.h>
 
 class Progress_Window : public Fl_Box
@@ -91,6 +89,4 @@ private:
   // Display the graphics...
 };
 
-#endif /* ACE_HAS_FL */
-
 #endif /* PROGRESS_I_H */
diff --git a/TAO/examples/AMI/FL_Callback/README b/TAO/examples/AMI/FL_Callback/README
index 134cce782e1..59c3cd0ba9a 100644
--- a/TAO/examples/AMI/FL_Callback/README
+++ b/TAO/examples/AMI/FL_Callback/README
@@ -5,7 +5,7 @@ GUI components.
 
 	Run as:
 
-$ ./progress -p 4 -i 10000 -ORBSvcConf svc.conf
+$ ./progress -p 4 -i 10000
 $ ./peer -n 1 -t 10000 -ORBSvcConf peer.conf
 $ ./peer -n 2 -t 10000 -ORBSvcConf peer.conf
 $ ./peer -n 4 -t 10000 -ORBSvcConf peer.conf
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 4e16631d0d7..d5d9556a839 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -2,22 +2,13 @@
 
 #include "Progress_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+#include "tao/FlResource_Loader.h"
 
-ACE_RCSID (FL_Callback, 
-           progress, 
+ACE_RCSID (FL_Callback,
+           progress,
            "$Id$")
 
-#if !defined (ACE_HAS_FL)
-
-int main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "This example requires FL support\n"));
-  return 0;
-}
-
-#else
-
 #include <FL/Fl.h>
 #include <FL/Fl_Window.h>
 
@@ -64,6 +55,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
+  TAO::FlResource_Loader fl_loader;
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -150,5 +142,3 @@ main (int argc, char *argv[])
   ACE_ENDTRY;
   return 0;
 }
-
-#endif /* ACE_HAS_FL */
diff --git a/TAO/examples/AMI/FL_Callback/svc.conf b/TAO/examples/AMI/FL_Callback/svc.conf
deleted file mode 100644
index f7d75c036eb..00000000000
--- a/TAO/examples/AMI/FL_Callback/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorType fl"
diff --git a/TAO/examples/AMI/FL_Callback/svc.conf.xml b/TAO/examples/AMI/FL_Callback/svc.conf.xml
deleted file mode 100644
index 6520d125ad8..00000000000
--- a/TAO/examples/AMI/FL_Callback/svc.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./examples/AMI/FL_Callback/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorType fl"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/Concurrency_Service/.cvsignore b/TAO/orbsvcs/Concurrency_Service/.cvsignore
new file mode 100644
index 00000000000..60c35ef084d
--- /dev/null
+++ b/TAO/orbsvcs/Concurrency_Service/.cvsignore
@@ -0,0 +1 @@
+Concurrency_Service
diff --git a/TAO/orbsvcs/CosEvent_Service/.cvsignore b/TAO/orbsvcs/CosEvent_Service/.cvsignore
new file mode 100644
index 00000000000..a9304243e61
--- /dev/null
+++ b/TAO/orbsvcs/CosEvent_Service/.cvsignore
@@ -0,0 +1 @@
+CosEvent_Service
diff --git a/TAO/orbsvcs/Dump_Schedule/.cvsignore b/TAO/orbsvcs/Dump_Schedule/.cvsignore
new file mode 100644
index 00000000000..fb2c130a840
--- /dev/null
+++ b/TAO/orbsvcs/Dump_Schedule/.cvsignore
@@ -0,0 +1 @@
+Dump_Schedule
diff --git a/TAO/orbsvcs/Event_Service/.cvsignore b/TAO/orbsvcs/Event_Service/.cvsignore
new file mode 100644
index 00000000000..0d4b7f11eb3
--- /dev/null
+++ b/TAO/orbsvcs/Event_Service/.cvsignore
@@ -0,0 +1 @@
+Event_Service
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/.cvsignore b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/.cvsignore
new file mode 100644
index 00000000000..27d8be5f25e
--- /dev/null
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/.cvsignore
@@ -0,0 +1 @@
+ftrt_eventservice
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/.cvsignore b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/.cvsignore
new file mode 100644
index 00000000000..9b9f57c4751
--- /dev/null
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/.cvsignore
@@ -0,0 +1 @@
+ftrtec_factory_service
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/.cvsignore b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/.cvsignore
new file mode 100644
index 00000000000..e9561cf105c
--- /dev/null
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/.cvsignore
@@ -0,0 +1 @@
+ftrtec_gateway_service
diff --git a/TAO/orbsvcs/FT_ReplicationManager/.cvsignore b/TAO/orbsvcs/FT_ReplicationManager/.cvsignore
new file mode 100644
index 00000000000..0443905ee6a
--- /dev/null
+++ b/TAO/orbsvcs/FT_ReplicationManager/.cvsignore
@@ -0,0 +1 @@
+FT_ReplicationManager
diff --git a/TAO/orbsvcs/Fault_Detector/.cvsignore b/TAO/orbsvcs/Fault_Detector/.cvsignore
new file mode 100644
index 00000000000..3d60edd3d48
--- /dev/null
+++ b/TAO/orbsvcs/Fault_Detector/.cvsignore
@@ -0,0 +1 @@
+Fault_Detector
diff --git a/TAO/orbsvcs/Fault_Notifier/.cvsignore b/TAO/orbsvcs/Fault_Notifier/.cvsignore
index 26f0ac494ac..346d74c2dcd 100644
--- a/TAO/orbsvcs/Fault_Notifier/.cvsignore
+++ b/TAO/orbsvcs/Fault_Notifier/.cvsignore
@@ -1,4 +1,5 @@
 *.dsp
 *.dsw
-Release
 Debug
+Fault_Notifier
+Release
diff --git a/TAO/orbsvcs/IFR_Service/.cvsignore b/TAO/orbsvcs/IFR_Service/.cvsignore
new file mode 100644
index 00000000000..6a5a929a01d
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/.cvsignore
@@ -0,0 +1,2 @@
+IFR_Service
+tao_ifr
diff --git a/TAO/orbsvcs/ImplRepo_Service/.cvsignore b/TAO/orbsvcs/ImplRepo_Service/.cvsignore
new file mode 100644
index 00000000000..114bf08db80
--- /dev/null
+++ b/TAO/orbsvcs/ImplRepo_Service/.cvsignore
@@ -0,0 +1,3 @@
+ImR_Activator
+ImplRepo_Service
+tao_imr
diff --git a/TAO/orbsvcs/LifeCycle_Service/.cvsignore b/TAO/orbsvcs/LifeCycle_Service/.cvsignore
new file mode 100644
index 00000000000..ae8684a2f43
--- /dev/null
+++ b/TAO/orbsvcs/LifeCycle_Service/.cvsignore
@@ -0,0 +1 @@
+LifeCycle_Service
diff --git a/TAO/orbsvcs/LoadBalancer/.cvsignore b/TAO/orbsvcs/LoadBalancer/.cvsignore
new file mode 100644
index 00000000000..11ebf643a83
--- /dev/null
+++ b/TAO/orbsvcs/LoadBalancer/.cvsignore
@@ -0,0 +1,2 @@
+LoadManager
+LoadMonitor
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/.cvsignore b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/.cvsignore
new file mode 100644
index 00000000000..3ff0e6fc5e4
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/.cvsignore
@@ -0,0 +1 @@
+Basic_Logging_Service
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/.cvsignore b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/.cvsignore
new file mode 100644
index 00000000000..31e33cd2684
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/.cvsignore
@@ -0,0 +1 @@
+Event_Logging_Service
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/.cvsignore b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/.cvsignore
new file mode 100644
index 00000000000..bf00697bc77
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/.cvsignore
@@ -0,0 +1 @@
+Notify_Logging_Service
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/.cvsignore b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/.cvsignore
new file mode 100644
index 00000000000..b2ce1a35634
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/.cvsignore
@@ -0,0 +1 @@
+RTEvent_Logging_Service
diff --git a/TAO/orbsvcs/Naming_Service/.cvsignore b/TAO/orbsvcs/Naming_Service/.cvsignore
new file mode 100644
index 00000000000..c089bb234b3
--- /dev/null
+++ b/TAO/orbsvcs/Naming_Service/.cvsignore
@@ -0,0 +1,2 @@
+NT_Naming_Service
+Naming_Service
diff --git a/TAO/orbsvcs/Notify_Service/.cvsignore b/TAO/orbsvcs/Notify_Service/.cvsignore
new file mode 100644
index 00000000000..3de70f7f49a
--- /dev/null
+++ b/TAO/orbsvcs/Notify_Service/.cvsignore
@@ -0,0 +1,2 @@
+NT_Notify_Service
+Notify_Service
diff --git a/TAO/orbsvcs/Scheduling_Service/.cvsignore b/TAO/orbsvcs/Scheduling_Service/.cvsignore
new file mode 100644
index 00000000000..2239af45a8c
--- /dev/null
+++ b/TAO/orbsvcs/Scheduling_Service/.cvsignore
@@ -0,0 +1 @@
+Scheduling_Service
diff --git a/TAO/orbsvcs/TAO_Service/.cvsignore b/TAO/orbsvcs/TAO_Service/.cvsignore
new file mode 100644
index 00000000000..2b0613ab8bd
--- /dev/null
+++ b/TAO/orbsvcs/TAO_Service/.cvsignore
@@ -0,0 +1 @@
+TAO_Service
diff --git a/TAO/orbsvcs/Time_Service/.cvsignore b/TAO/orbsvcs/Time_Service/.cvsignore
new file mode 100644
index 00000000000..8c4ee3c5b18
--- /dev/null
+++ b/TAO/orbsvcs/Time_Service/.cvsignore
@@ -0,0 +1,2 @@
+Time_Service_Clerk
+Time_Service_Server
diff --git a/TAO/orbsvcs/Trading_Service/.cvsignore b/TAO/orbsvcs/Trading_Service/.cvsignore
new file mode 100644
index 00000000000..6306e1e35ed
--- /dev/null
+++ b/TAO/orbsvcs/Trading_Service/.cvsignore
@@ -0,0 +1 @@
+Trading_Service
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..b0529d29a0e
--- /dev/null
+++ b/TAO/tao/FlResource_Factory.cpp
@@ -0,0 +1,36 @@
+//$Id$
+
+#include "FlResource_Factory.h"
+#include "debug.h"
+#include "ace/FlReactor.h"
+
+ACE_RCSID( TAO_FlResource,
+           FlResource_Factory,
+           "$Id$");
+
+namespace TAO
+{
+
+  FlResource_Factory::FlResource_Factory ():
+    reactor_impl_( 0 )
+  {
+  }
+
+  ACE_Reactor_Impl *
+  FlResource_Factory::reactor_impl (void)
+  {
+    // synchronized by external locks
+    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..ab34c6ef503
--- /dev/null
+++ b/TAO/tao/FlResource_Factory.h
@@ -0,0 +1,55 @@
+// -*- 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/TAO_FlResource_Export.h"
+#include "tao/GUIResource_Factory.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   * @class FlResource_Factory
+   *
+   * @brief 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 ();
+
+  protected:
+
+    /// 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..13f01c7bef4
--- /dev/null
+++ b/TAO/tao/FlResource_Loader.cpp
@@ -0,0 +1,26 @@
+//$Id$
+#include "FlResource_Loader.h"
+#include "ORB_Core.h"
+#include "FlResource_Factory.h"
+
+ACE_RCSID( TAO_FlResource,
+           FlResource_Loader,
+           "$Id$");
+
+namespace TAO
+{
+
+  FlResource_Loader::FlResource_Loader ()
+  {
+    FlResource_Factory *tmp = 0;
+
+    ACE_NEW (tmp,
+             FlResource_Factory ());
+
+    TAO_ORB_Core::set_gui_resource_factory( tmp );
+  }
+
+  FlResource_Loader::~FlResource_Loader ()
+  {
+  }
+}
diff --git a/TAO/tao/FlResource_Loader.h b/TAO/tao/FlResource_Loader.h
new file mode 100644
index 00000000000..c56c2c5a39f
--- /dev/null
+++ b/TAO/tao/FlResource_Loader.h
@@ -0,0 +1,50 @@
+// -*- 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/TAO_FlResource_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+
+  /**
+   * @class FlResource_Loader
+   *
+   * @brief Loads TAO resources related with Fl.
+   *
+   * This class changes the default reactor implementation into
+   * ACE_FlReactor one by calling TAO_ORB_Core::set_gui_resource_factory.
+   * User should create an instance of this class before ORB_init
+   * when the TAO server has has to be integrated within Fl event loop.
+   *
+   * 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 Qt 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..ae586a57a99
--- /dev/null
+++ b/TAO/tao/GUIResource_Factory.cpp
@@ -0,0 +1,55 @@
+//$Id$
+#include "tao/GUIResource_Factory.h"
+#include "ace/Reactor.h"
+#include "tao/debug.h"
+
+namespace TAO
+{
+  GUIResource_Factory::GUIResource_Factory ():
+    dynamically_allocated_reactor_ (0)
+  {
+  }
+
+  GUIResource_Factory::~GUIResource_Factory ()
+  {
+  }
+
+  ACE_Reactor *
+  GUIResource_Factory::get_reactor (void)
+  {
+    // @@Marek, do we need a lock here??
+    // @Bala, I suppose we don't need locking for any
+    //   reasonable use case as this
+    //   factory is intended to be a variable in TSS.
+    //   I can imagine that    someone may try to use it in distinct
+    //   threads, though I do not know
+    //   what for. Nevertheless, just for a case  I sync the creation of reactor.
+    //   I think, that double checked locking is
+    //   not necessary, because the performance is not an issue here.
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+
+    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)
+  {
+    ACE_GUARD ( TAO_SYNCH_MUTEX, ace_mon, this->lock_ );
+
+    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..e10a3770497
--- /dev/null
+++ b/TAO/tao/GUIResource_Factory.h
@@ -0,0 +1,90 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   GUI_Resource_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Marek Brudka <mbrudka@aster.pl>
+ */
+//=============================================================================
+
+#ifndef TAO_GUI_RESOURCE_FACTORY_H
+#define TAO_GUI_RESOURCE_FACTORY_H
+#include /**/ "ace/pre.h"
+#include "ace/Thread_Mutex.h"
+#include "tao/TAO_Export.h"
+#include "tao/orbconf.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.
+   *
+   * 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.
+   * Children of this class will be held in TSS by the ORB Core.
+   */
+  class TAO_Export GUIResource_Factory
+  {
+  public:
+
+    GUIResource_Factory ();
+
+    virtual ~GUIResource_Factory ();
+
+    /** 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 *);
+
+  protected:
+
+    /** Create or return current reactor instance.
+     * Please note that this call is NOT synchronized. Left to the
+     * get_reactor to synchronize access.
+     */
+    virtual ACE_Reactor_Impl *reactor_impl (void) = 0;
+
+  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_;
+
+    /// for internal locking.
+    TAO_SYNCH_MUTEX lock_;
+  };
+}
+
+#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 308f613abd8..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_->resource_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_->resource_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 d5f61469f9c..e3d47cbacf0 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1230,6 +1230,23 @@ TAO_ORB_Core::set_resource_factory (const char *resource_factory_name)
 }
 
 void
+TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory)
+{
+  // @@Marek, I would as well like this to be stored in per-orb TSS
+  // instead of globasl TSS. Please see TAO_ORB_Core_TSS_Resources in
+  // ORB_Core.h for details.
+  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
 TAO_ORB_Core::dynamic_adapter_name (const char *name)
 {
   TAO_ORB_Core_Static_Resources::instance ()->dynamic_adapter_name_ = name;
@@ -1306,6 +1323,13 @@ TAO_ORB_Core::resource_factory (void)
   return this->resource_factory_;
 }
 
+TAO::GUIResource_Factory *
+TAO_ORB_Core::gui_resource_factory (void)
+{
+  return TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
+}
+
+
 TAO_Thread_Lane_Resources_Manager &
 TAO_ORB_Core::thread_lane_resources_manager (void)
 {
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 5e225ddb5f5..4c2ecd1995b 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 */
-
 };
 
 
@@ -293,7 +296,7 @@ public:
    * No-Collocation is a special case of collocation.
    */
   static
-  TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
+TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
                                                   ACE_ENV_ARG_DECL);
   //@}
 
@@ -375,6 +378,9 @@ public:
   /// Returns pointer to the resource factory.
   TAO_Resource_Factory *resource_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);
 
@@ -412,6 +418,13 @@ public:
   /// 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::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);
 
@@ -460,6 +473,7 @@ public:
   /// Gets the value of TAO_ORB_Core::valuetype_adapter_name.
   static const char *valuetype_adapter_name (void);
 
+
   /// See if we have a collocated address, if yes, return the POA
   /// associated with the address.
   int is_collocated (const TAO_MProfile& mprofile);
diff --git a/TAO/tao/QtResource.mpc b/TAO/tao/QtResource.mpc
new file mode 100644
index 00000000000..801422a9219
--- /dev/null
+++ b/TAO/tao/QtResource.mpc
@@ -0,0 +1,19 @@
+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..561fffca095
--- /dev/null
+++ b/TAO/tao/QtResource_Factory.cpp
@@ -0,0 +1,45 @@
+//$Id$
+
+#include "QtResource_Factory.h"
+#include "debug.h"
+#include "ace/QtReactor.h"
+
+ACE_RCSID( TAO_QtResource,
+           QtResource_Factory,
+           "$Id$");
+
+namespace TAO
+{
+
+  QtResource_Factory::QtResource_Factory (QApplication *qapp)
+    : reactor_impl_ (0)
+    , qapp_ (qapp)
+  {
+  }
+
+  ACE_Reactor_Impl *
+  QtResource_Factory::reactor_impl (void)
+  {    // synchronized by external locks
+    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..5e9b78bf60b
--- /dev/null
+++ b/TAO/tao/QtResource_Factory.h
@@ -0,0 +1,65 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   QtResource_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
+ *  @author Marek Brudka <mbrudka@aster.pl>
+ */
+//=============================================================================
+#ifndef TAO_QTRESOURCE_FACTORY_H
+#define TAO_QTRESOURCE_FACTORY_H
+#include /**/ "ace/pre.h"
+
+#include "tao/TAO_QtResource_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include <qapplication.h>
+#include "ace/QtReactor.h"
+#include "tao/GUIResource_Factory.h"
+
+namespace TAO
+{
+
+  /**
+   * @class QtResource_Factory
+   *
+   * @brief 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_);
+
+  protected:
+
+    /// 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_;
+
+    /// for internal locking.
+    TAO_SYNCH_MUTEX lock_;
+  };
+}
+
+#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..70fdae3053c
--- /dev/null
+++ b/TAO/tao/QtResource_Loader.cpp
@@ -0,0 +1,25 @@
+//$Id$
+#include "QtResource_Loader.h"
+#include "ORB_Core.h"
+#include "QtResource_Factory.h"
+
+ACE_RCSID( TAO_QtResource,
+           QtResource_Loader,
+           "$Id$");
+
+namespace TAO
+{
+  QtResource_Loader::QtResource_Loader (QApplication *qapp)
+  {
+    QtResource_Factory *tmp = 0;
+
+    ACE_NEW (tmp,
+             QtResource_Factory (qapp));
+
+    TAO_ORB_Core::set_gui_resource_factory (tmp);
+  }
+
+  QtResource_Loader::~QtResource_Loader (void)
+  {
+  }
+}
diff --git a/TAO/tao/QtResource_Loader.h b/TAO/tao/QtResource_Loader.h
new file mode 100644
index 00000000000..14a2e6d84b6
--- /dev/null
+++ b/TAO/tao/QtResource_Loader.h
@@ -0,0 +1,52 @@
+// -*- 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 "tao/TAO_QtResource_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include <qapplication.h>
+
+namespace TAO
+{
+  /**
+   * @class QtResource_Loader
+   *
+   * @brief Loads TAO resources related with Qt.
+   *
+   * This class changes the default reactor implementation into
+   * ACE_QtReactor one by calling TAO_ORB_Core::set_gui_resource_factory.
+   * User should create an instance of this class before ORB_init
+   * when the TAO server has has to be integrated within Qt event loop.
+   *
+   * 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 (void);
+  };
+}
+#include /**/ "ace/post.h"
+#endif /* TAO_QTRESOURCE_LOADER_H */
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index 266541846ea..d4ae5aa3c54 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -1,4 +1,5 @@
 //$Id$
+
 project : taolib, core {
   sharedname   = TAO_Strategies
   dynamicflags = TAO_STRATEGIES_BUILD_DLL
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 2703a4e1590..8f33d43c0a7 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -1,5 +1,5 @@
 // $Id$
-
+#include "ace/Service_Config.h"
 #include "advanced_resource.h"
 
 #include "UIOP_Factory.h"
@@ -19,14 +19,13 @@
 #include "tao/LF_Follower.h"
 #include "tao/Leader_Follower.h"
 #include "tao/StringSeqC.h"
+#include "tao/ORB_Core.h"
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Service_Config.h"
 #include "ace/Select_Reactor.h"
-#include "ace/FlReactor.h"
-#include "ace/TkReactor.h"
 #include "ace/WFMO_Reactor.h"
 #include "ace/Msg_WFMO_Reactor.h"
 #include "ace/TP_Reactor.h"
@@ -39,6 +38,7 @@ ACE_RCSID(Strategies, advanced_resource, "$Id$")
 
 TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
 {
+
   TAO_ORB_Core::set_resource_factory ("Advanced_Resource_Factory");
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_Advanced_Resource_Factory);
 
@@ -100,6 +100,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
   }
   this->options_processed_ = 1;
 
+
   // If the default resource factory exists, then disable it.
   // This causes any directives for the "Resource_Factory" to
   // report warnings.
@@ -150,19 +151,6 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
                                        ACE_TEXT("select_st")) == 0)
             this->reactor_type_ = TAO_REACTOR_SELECT_ST;
           else if (ACE_OS::strcasecmp (current_arg,
-                                       ACE_TEXT("fl")) == 0)
-#if defined(ACE_HAS_FL)
-            this->reactor_type_ = TAO_REACTOR_FL;
-#else
-            this->report_unsupported_error (ACE_TEXT("FlReactor"));
-#endif /* ACE_HAS_FL */
-          else if (ACE_OS::strcasecmp (current_arg, ACE_TEXT("tk_reactor")) == 0)
-#if defined(ACE_HAS_TK)
-            this->reactor_type_ = TAO_REACTOR_TK;
-#else
-            this->report_unsupported_error (ACE_TEXT("TkReactor"));
-#endif /* ACE_HAS_TK */
-          else if (ACE_OS::strcasecmp (current_arg,
                                        ACE_TEXT("wfmo")) == 0)
 #if defined(ACE_WIN32)
             this->reactor_type_ = TAO_REACTOR_WFMO;
@@ -180,6 +168,16 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
           else if (ACE_OS::strcasecmp (current_arg,
                                        ACE_TEXT("tp")) == 0)
             this->reactor_type_ = TAO_REACTOR_TP;
+          else if (ACE_OS::strcasecmp (current_arg,
+                                       ACE_TEXT("fl")) == 0)
+            this->report_option_value_error (
+                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 by Advanced_Resources_Factory. Please use TAO_TkResource_Loader instead."),
+                         current_arg);
           else
             this->report_option_value_error (ACE_TEXT("-ORBReactorType"), current_arg);
 
@@ -276,7 +274,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO_Advanced_Resource_Factory: -ORBReactorThreadQueue ")
                 ACE_TEXT ("option can only be used with -ORBReactorType ")
-                ACE_TEXT ("tp (default).\n")));
+                ACE_TEXT ("tp.\n")));
   // Explicitely set the default only if not set.
   else if (this->threadqueue_type_ == TAO_THREAD_QUEUE_NOT_SET)
     this->threadqueue_type_ = TAO_THREAD_QUEUE_LIFO;
@@ -305,6 +303,7 @@ TAO_Advanced_Resource_Factory::load_default_protocols (void)
 int
 TAO_Advanced_Resource_Factory::init_protocol_factories (void)
 {
+
   // If the default resource factory exists, then disable it.
   // This causes any directives for the "Resource_Factory" to
   // report warnings.
@@ -618,6 +617,8 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
  return 0;
 }
 
+
+
 TAO_ProtocolFactorySet *
 TAO_Advanced_Resource_Factory::get_protocol_factories (void)
 {
@@ -650,18 +651,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
                       0);
       break;
 
-    case TAO_REACTOR_FL:
-#if defined(ACE_HAS_FL)
-      ACE_NEW_RETURN (impl, ACE_FlReactor, 0);
-#endif /* ACE_HAS_FL */
-      break;
-
-    case TAO_REACTOR_TK:
-#if defined(ACE_HAS_TK)
-      ACE_NEW_RETURN (impl, ACE_TkReactor, 0);
-#endif /* ACE_HAS_TK */
-      break;
-
     case TAO_REACTOR_WFMO:
 #if defined(ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
       ACE_NEW_RETURN (impl, ACE_WFMO_Reactor, 0);
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index 4e3fa7508c6..7cefef08844 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -30,6 +30,7 @@ public:
  * factory can return resource instances which are, e.g., global,
  * stored in thread-specific storage, stored in shared memory,
  * etc.
+ *
  */
 class TAO_Strategies_Export TAO_Advanced_Resource_Factory : public TAO_Default_Resource_Factory
 {
@@ -56,15 +57,13 @@ public:
   enum
   {
     /// Use ACE_Token
-    TAO_REACTOR_SELECT_MT,
+    TAO_REACTOR_SELECT_MT = 1 ,
 
     /// Use ACE_Noop_Token
-    TAO_REACTOR_SELECT_ST,
-    TAO_REACTOR_FL,
-    TAO_REACTOR_TK,
-    TAO_REACTOR_WFMO,
-    TAO_REACTOR_MSGWFMO,
-    TAO_REACTOR_TP
+    TAO_REACTOR_SELECT_ST = 2,
+    TAO_REACTOR_WFMO      = 3,
+    TAO_REACTOR_MSGWFMO   = 4 ,
+    TAO_REACTOR_TP        = 5,
   };
 
   /// Thread queueing Strategy
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_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_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_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 1fb3d2302b0..fa67eead299 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -27,6 +27,11 @@
 #include "tao/Environment.h"
 #include "tao/TAO_Export.h"
 
+// Forward declarations
+namespace TAO
+{
+  class GUIResource_Factory;
+}
 /**
  * @class TAO_TSS_Resources
  *
@@ -88,7 +93,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..765e7a40e02
--- /dev/null
+++ b/TAO/tao/TkResource_Factory.cpp
@@ -0,0 +1,37 @@
+//$Id$
+
+#include "tao/TkResource_Factory.h"
+#include "tao/debug.h"
+#include "ace/TkReactor.h"
+
+ACE_RCSID( TAO_TkResource,
+           TkResource_Factory,
+           "$Id$");
+
+
+namespace TAO
+{
+
+  TkResource_Factory::TkResource_Factory ():
+    reactor_impl_( 0 )
+  {
+  }
+
+  ACE_Reactor_Impl *
+  TkResource_Factory::reactor_impl (void)
+  {
+    // synchronized by external locks
+    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..e08b436d274
--- /dev/null
+++ b/TAO/tao/TkResource_Factory.h
@@ -0,0 +1,59 @@
+// -*- 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/TAO_TkResource_Export.h"
+#include "tao/GUIResource_Factory.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+
+  /**
+   * @class TkResource_Factory
+   *
+   * @brief 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 ();
+
+  protected:
+
+    /// Create or obtain current reactor implementation
+    virtual ACE_Reactor_Impl *reactor_impl (void);
+
+  private:
+
+    /// Reactor created by this factory.
+    ACE_TkReactor *reactor_impl_;
+
+    /// for internal locking.
+    TAO_SYNCH_MUTEX lock_;
+  };
+}
+#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..782fbc92bf0
--- /dev/null
+++ b/TAO/tao/TkResource_Loader.cpp
@@ -0,0 +1,26 @@
+//$Id$
+#include "TkResource_Loader.h"
+#include "ORB_Core.h"
+#include "TkResource_Factory.h"
+
+ACE_RCSID( TAO_TkResource,
+           TkResource_Loader,
+           "$Id$");
+
+namespace TAO
+{
+
+  TkResource_Loader::TkResource_Loader ()
+  {
+    TkResource_Factory *tmp = 0;
+
+    ACE_NEW (tmp,
+             TkResource_Factory ());
+
+    TAO_ORB_Core::set_gui_resource_factory( tmp );
+  }
+
+  TkResource_Loader::~TkResource_Loader ()
+  {
+  }
+}
diff --git a/TAO/tao/TkResource_Loader.h b/TAO/tao/TkResource_Loader.h
new file mode 100644
index 00000000000..9b20a5eac02
--- /dev/null
+++ b/TAO/tao/TkResource_Loader.h
@@ -0,0 +1,49 @@
+// -*- 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/TAO_TkResource_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   * @class TkResource_Loader
+   *
+   * @brief Loads TAO resources related with Tk.
+   *
+   * This class changes the default reactor implementation into
+   * ACE_TkReactor one by calling TAO_ORB_Core::set_gui_resource_factory.
+   * User should create an instance of this class before ORB_init
+   * when the TAO server has has to be integrated within Tk event loop.
+   *
+   * 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..5ca19fba0f0
--- /dev/null
+++ b/TAO/tao/XtResource_Factory.cpp
@@ -0,0 +1,45 @@
+//$Id$
+
+#include "XtResource_Factory.h"
+#include "debug.h"
+#include "ace/XtReactor.h"
+
+ACE_RCSID( TAO_XtResource,
+           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)
+  {
+    // synchronized by external locks
+    if (this->context_ == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT("TAO (%P|%t) - XtAppContext is undefined.")
+                  ACE_TEXT(" 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..5498865a256
--- /dev/null
+++ b/TAO/tao/XtResource_Factory.h
@@ -0,0 +1,61 @@
+// -*- 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 /**/ <X11/Intrinsic.h>
+#include "tao/TAO_XtResource_Export.h"
+#include "ace/XtReactor.h"
+#include "tao/GUIResource_Factory.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+
+  /**
+   * @class XtResource_Factory
+   *
+   * @brief 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_;
+
+    /// for internal locking
+    TAO_SYNCH_MUTEX lock_;
+  };
+}
+
+#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..d2350ddcc00
--- /dev/null
+++ b/TAO/tao/XtResource_Loader.cpp
@@ -0,0 +1,26 @@
+//$Id$
+#include "XtResource_Loader.h"
+#include "ORB_Core.h"
+#include "XtResource_Factory.h"
+
+ACE_RCSID( TAO_XtResource,
+           XtResource_Loader,
+           "$Id$");
+
+namespace TAO
+{
+
+  XtResource_Loader::XtResource_Loader (XtAppContext context)
+  {
+    XtResource_Factory *tmp = 0;
+
+    ACE_NEW (tmp,
+             XtResource_Factory (context));
+
+    TAO_ORB_Core::set_gui_resource_factory( tmp );
+  }
+
+  XtResource_Loader::~XtResource_Loader ()
+  {
+  }
+}
diff --git a/TAO/tao/XtResource_Loader.h b/TAO/tao/XtResource_Loader.h
new file mode 100644
index 00000000000..f3e809ab1ed
--- /dev/null
+++ b/TAO/tao/XtResource_Loader.h
@@ -0,0 +1,50 @@
+// -*- 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 /**/ <X11/Intrinsic.h>
+#include "tao/TAO_XtResource_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   * @class XtResource_Loader
+   *
+   * @brief Loads TAO resources related with Xt.
+   *
+   * This class changes the default reactor implementation into
+   * ACE_XtReactor one by calling TAO_ORB_Core::set_gui_resource_factory.
+   * User should create an instance of this class before ORB_init
+   * when the TAO server has has to be integrated within Xt event loop.
+   *
+   * 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/qt_resource.cpp b/TAO/tao/qt_resource.cpp
deleted file mode 100644
index 5207f41c981..00000000000
--- a/TAO/tao/qt_resource.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//$Id$
-#include "tao/qt_resource.h"
-
-#if defined (ACE_HAS_QT)
-
-#if !defined (__ACE_INLINE__)
-# include "qt_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
-QApplication *TAO_QtResource_Factory::qapp_ = 0 ;
-
-ACE_Reactor_Impl *
-TAO_QtResource_Factory::allocate_reactor_impl (void) const
-{
-  if (this->qapp_ == 0) 
-    return 0;
-
-  ACE_Reactor_Impl *impl = 0; 
-
-  ACE_NEW_RETURN(impl, 
-                 ACE_QtReactor (qapp_), 
-                 0);
-  return 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, TAO_QtResource_Factory)
-
-#endif /* ACE_HAS_QT */
diff --git a/TAO/tao/qt_resource.h b/TAO/tao/qt_resource.h
deleted file mode 100644
index 6e7a84c5b15..00000000000
--- a/TAO/tao/qt_resource.h
+++ /dev/null
@@ -1,63 +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"
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_QT)
-#include "ace/QtReactor.h"
-
-
-/**
- * @class TAO_QtResource_Factory
- *
- * @brief TAO's default resource factory
- *
- * Using a <{resource source specifier}> as a discriminator, the
- * factory can return resource instances which are, e.g., global,
- * stored in thread-specific storage, stored in shared memory,
- * etc.
- */
-class TAO_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_ ;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/qt_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_QtResource_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_QtResource_Factory)
-
-#endif /*ACE_HAS_QT */
-#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/tao.mpc b/TAO/tao/tao.mpc
index eea53137f1b..02a7b9d1efc 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -203,7 +203,6 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
     Profile_Transport_Resolver.cpp
     Protocol_Factory.cpp
     Protocols_Hooks.cpp
-    qt_resource.cpp
     Queued_Message.cpp
     Reactive_Connect_Strategy.cpp
     Reactive_Flushing_Strategy.cpp
@@ -280,11 +279,352 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
     WrongTransactionC.cpp
     WStringSeqA.cpp
     WStringSeqC.cpp
-    xt_resource.cpp
+    GUIResource_Factory.cpp
   }
 
   Header_Files {
-    *.h
+    Abstract_Servant_Base.h
+    Acceptor_Filter.h
+    Acceptor_Impl.h
+    Acceptor_Registry.h
+    Adapter_Factory.h
+    Adapter.h
+    Adapter_Registry.h
+    Allocator.h
+    Any_Arg_Traits.h
+    Any_Array_Impl_T.h
+    Any_Basic_Impl.h
+    Any_Basic_Impl_T.h
+    Any_Dual_Impl_T.h
+    Any.h
+    Any_Impl.h
+    Any_Impl_T.h
+    AnySeqC.h
+    AnySeqS.h
+    Any_Special_Impl_T.h
+    Any_SystemException.h
+    Any_Unknown_IDL_Type.h
+    Arg_Traits_T.h
+    Argument.h
+    Array_VarOut_T.h
+    Asynch_Queued_Message.h
+    Asynch_Reply_Dispatcher_Base.h
+    Auto_Functor.h
+    Base_Transport_Property.h
+    Basic_Arguments.h
+    Basic_Argument_T.h
+    Basic_SArguments.h
+    Basic_SArgument_T.h
+    Basic_Types.h
+    BD_String_Argument_T.h
+    BD_String_SArgument_T.h
+    BiDir_Adapter.h
+    Bind_Dispatcher_Guard.h
+    Blocked_Connect_Strategy.h
+    Block_Flushing_Strategy.h
+    BooleanSeqC.h
+    BooleanSeqS.h
+    BoundsC.h
+    Buffer_Allocator_T.h
+    Buffering_Constraint_Policy.h
+    Cache_Entries.h
+    CDR_Encaps_Codec.h
+    CDR.h
+    CharSeqC.h
+    CharSeqS.h
+    Cleanup_Func_Registry.h
+    ClientRequestInfo.h
+    ClientRequestInfo_i.h
+    ClientRequestInterceptor_Adapter.h
+    Client_Strategy_Factory.h
+    CodecFactory.h
+    CodecFactory_ORBInitializer.h
+    Codeset_Manager.h
+    Codeset_Translator_Factory.h
+    Codeset_Translator_Factory_T.h
+    Collocated_Invocation.h
+    Collocation_Proxy_Broker.h
+    Collocation_Resolver.h
+    Collocation_Strategy.h
+    Condition.h
+    Connection_Handler.h
+    Connection_Purging_Strategy.h
+    Connector_Impl.h
+    Connector_Registry.h
+    Connect_Strategy.h
+    CONV_FRAMEC.h
+    CONV_FRAMES.h
+    CONV_FRAMES_T.h
+    corbafwd.h
+    corba.h
+    CORBALOC_Parser.h
+    CORBA_methods.h
+    CORBANAME_Parser.h
+    CORBA_String.h
+    CurrentC.h
+    debug.h
+    default_client.h
+    Default_Collocation_Resolver.h
+    Default_Endpoint_Selector_Factory.h
+    default_environment.h
+    default_ports.h
+    Default_Protocols_Hooks.h
+    default_resource.h
+    default_server.h
+    Default_Stub_Factory.h
+    Default_Thread_Lane_Resources_Manager.h
+    DLL_Parser.h
+    DomainC.h
+    DoubleSeqC.h
+    DoubleSeqS.h
+    Dynamic_Adapter.h
+    DynamicC.h
+    Dynamic_ParameterC.h
+    Encodable.h
+    Endpoint.h
+    Endpoint_Selector_Factory.h
+    Environment.h
+    Exception_Data.h
+    Exception.h
+    Exclusive_TMS.h
+    Fault_Tolerance_Service.h
+    FILE_Parser.h
+    Fixed_Array_Argument_T.h
+    Fixed_Array_SArgument_T.h
+    Fixed_Size_Argument_T.h
+    Fixed_Size_SArgument_T.h
+    FloatSeqC.h
+    FloatSeqS.h
+    Flushing_Strategy.h
+    GIOPC.h
+    GIOP_Message_Base.h
+    GIOP_Message_Generator_Parser_10.h
+    GIOP_Message_Generator_Parser_11.h
+    GIOP_Message_Generator_Parser_12.h
+    GIOP_Message_Generator_Parser.h
+    GIOP_Message_Generator_Parser_Impl.h
+    GIOP_Message_Lite.h
+    GIOP_Message_Locate_Header.h
+    GIOP_Message_State.h
+    GIOP_Message_Version.h
+    GIOPS.h
+    GIOPS_T.h
+    GIOP_Utils.h
+    GUIResource_Factory.h
+    IFR_Client_Adapter.h
+    IIOP_Acceptor.h
+    IIOPC.h
+    IIOP_Connection_Handler.h
+    IIOP_Connector.h
+    IIOP_Endpoint.h
+    IIOP_EndpointsC.h
+    IIOP_Factory.h
+    IIOP_Lite_Factory.h
+    IIOP_Profile.h
+    IIOP_Transport.h
+    Incoming_Message_Queue.h
+    Interceptor_List.h
+    Invocation_Adapter.h
+    Invocation_Base.h
+    Invocation_Endpoint_Selectors.h
+    Invocation_Utils.h
+    IOPC.h
+    IOP_CodecC.h
+    IOP_IORC.h
+    IOPS.h
+    IOPS_T.h
+    IORInterceptor_Adapter_Factory.h
+    IORInterceptor_Adapter.h
+    IOR_Parser.h
+    Leader_Follower_Flushing_Strategy.h
+    Leader_Follower.h
+    LF_CH_Event.h
+    LF_Connect_Strategy.h
+    LF_Event_Binder.h
+    LF_Event.h
+    LF_Event_Loop_Thread_Helper.h
+    LF_Follower_Auto_Adder.h
+    LF_Follower_Auto_Ptr.h
+    LF_Follower.h
+    LF_Invocation_Event.h
+    LF_Strategy_Complete.h
+    LF_Strategy.h
+    LocalObject.h
+    LocateRequest_Invocation_Adapter.h
+    LocateRequest_Invocation.h
+    LongDoubleSeqC.h
+    LongDoubleSeqS.h
+    LongLongSeqC.h
+    LongLongSeqS.h
+    LongSeqC.h
+    LongSeqS.h
+    LRU_Connection_Purging_Strategy.h
+    Managed_Types.h
+    Marshal.h
+    MCAST_Parser.h
+    Messaging_PolicyValueC.h
+    Messaging_SyncScopeC.h
+    MProfile.h
+    Muxed_TMS.h
+    New_Leader_Generator.h
+    NVList.h
+    Object_Argument_T.h
+    Object.h
+    objectid.h
+    ObjectIdListC.h
+    Object_KeyC.h
+    ObjectKey_Table.h
+    Object_Loader.h
+    Object_Proxy_Broker.h
+    Object_Proxy_Impl.h
+    Object_Ref_Table.h
+    Object_SArgument_T.h
+    Object_T.h
+    Objref_VarOut_T.h
+    OBV_Constants.h
+    OctetSeqC.h
+    OctetSeqS.h
+    operation_details.h
+    orbconf.h
+    ORB_Constants.h
+    ORB_Core_Auto_Ptr.h
+    ORB_Core.h
+    ORB.h
+    ORBInitializer_Registry.h
+    ORBInitInfo.h
+    ORB_Table.h
+    orb_typesC.h
+    orb_typesS.h
+    ParameterModeC.h
+    ParameterModeS.h
+    params.h
+    Parser_Registry.h
+    PICurrent_Copy_Callback.h
+    PICurrent.h
+    PICurrent_ORBInitializer.h
+    PI_ForwardC.h
+    Pluggable_Messaging.h
+    Pluggable_Messaging_Utils.h
+    PolicyC.h
+    PolicyFactory_Registry.h
+    Policy_ForwardC.h
+    Policy_Manager.h
+    Policy_Set.h
+    PolicyS.h
+    Policy_Validator.h
+    PollableC.h
+    PollableS.h
+    PollableS_T.h
+    PortableInterceptorC.h
+    PortableInterceptor.h
+    PortableInterceptorS.h
+    Principal.h
+    Profile.h
+    Profile_Transport_Resolver.h
+    Protocol_Factory.h
+    Protocols_Hooks.h
+    Pseudo_VarOut_T.h
+    Queued_Message.h
+    Reactive_Connect_Strategy.h
+    Reactive_Flushing_Strategy.h
+    Refcounted_ObjectKey.h
+    Remote_Invocation.h
+    Remote_Object_Proxy_Broker.h
+    Reply_Dispatcher.h
+    Request_Dispatcher.h
+    RequestInfo_Util.h
+    Resource_Factory.h
+    Resume_Handle.h
+    Seq_Out_T.h
+    Sequence.h
+    Sequence_T.h
+    Seq_Var_T.h
+    Server_Strategy_Factory.h
+    Service_Callbacks.h
+    Service_Context.h
+    Services_Activate.h
+    ServicesC.h
+    ServicesS.h
+    ServicesS_T.h
+    ShortSeqC.h
+    ShortSeqS.h
+    Special_Basic_Arguments.h
+    Special_Basic_Argument_T.h
+    Special_Basic_SArguments.h
+    Special_Basic_SArgument_T.h
+    StringSeqC.h
+    StringSeqS.h
+    Stub_Factory.h
+    Stub.h
+    Synch_Invocation.h
+    Synch_Queued_Message.h
+    Synch_Refcountable.h
+    Synch_Reply_Dispatcher.h
+    Sync_Strategies.h
+    SystemException.h
+    Tagged_Components.h
+    Tagged_Profile.h
+    TAOC.h
+    TAO_Export.h
+    TAO_Internal.h
+    TAO_Server_Request.h
+    TAOS.h
+    TAO_Singleton.h
+    TAO_Singleton_Manager.h
+    TAOS_T.h
+    target_specification.h
+    TC_Constants_Forward.h
+    Thread_Lane_Resources.h
+    Thread_Lane_Resources_Manager.h
+    Thread_Per_Connection_Handler.h
+    TimeBaseC.h
+    TimeBaseS.h
+    TimeBaseS_T.h
+    Timeprobe.h
+    Transport_Acceptor.h
+    Transport_Cache_Manager.h
+    Transport_Connector.h
+    Transport_Descriptor_Interface.h
+    Transport.h
+    Transport_Mux_Strategy.h
+    Transport_Timer.h
+    TSS_Resources.h
+    Typecode_Constants.h
+    TypeCodeFactory_Adapter.h
+    Typecode.h
+    Typecode_typesC.h
+    Typecode_typesS.h
+    UB_String_Arguments.h
+    UB_String_Argument_T.h
+    UB_String_SArguments.h
+    UB_String_SArgument_T.h
+    ULongLongSeqC.h
+    ULongLongSeqS.h
+    ULongSeqC.h
+    ULongSeqS.h
+    UserException.h
+    UShortSeqC.h
+    UShortSeqS.h
+    UTF16_BOM_Factory.h
+    UTF16_BOM_Translator.h
+    Valuetype_Adapter.h
+    Var_Array_Argument_T.h
+    Var_Array_SArgument_T.h
+    varbase.h
+    VarOut_T.h
+    Var_Size_Argument_T.h
+    Var_Size_SArgument_T.h
+    Version.h
+    Wait_On_Leader_Follower.h
+    Wait_On_LF_No_Upcall.h
+    Wait_On_Reactor.h
+    Wait_On_Read.h
+    Wait_Strategy.h
+    WCharSeqC.h
+    WCharSeqS.h
+    WrongTransactionC.h
+    WStringSeqC.h
+    WStringSeqS.h
   }
 
   Inline_Files {
diff --git a/TAO/tao/xt_resource.cpp b/TAO/tao/xt_resource.cpp
deleted file mode 100644
index 747bf2672e5..00000000000
--- a/TAO/tao/xt_resource.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-#include "tao/xt_resource.h"
-
-#if defined(ACE_HAS_XT)
-
-#if !defined (__ACE_INLINE__)
-# include "tao/xt_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, xt_resource, "$Id$")
-
-XtAppContext
-TAO_XT_Resource_Factory::context_ = 0;
-
-ACE_Reactor_Impl*
-TAO_XT_Resource_Factory::allocate_reactor_impl (void) const
-{
-  if (TAO_XT_Resource_Factory::context_ == 0)
-    return 0;
-
-  ACE_Reactor_Impl *impl = 0;
-
-  ACE_NEW_RETURN (impl, ACE_XtReactor (TAO_XT_Resource_Factory::context_), 0);
-  return impl;
-}
-
-void
-TAO_XT_Resource_Factory::set_context (XtAppContext context)
-{
-  TAO_XT_Resource_Factory::context_ = context;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_XT_Resource_Factory,
-                       ACE_TEXT ("XT_Resource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_XT_Resource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_XT_Resource_Factory)
-
-#endif /* ACE_HAS_XT */
diff --git a/TAO/tao/xt_resource.h b/TAO/tao/xt_resource.h
deleted file mode 100644
index 04274f55e16..00000000000
--- a/TAO/tao/xt_resource.h
+++ /dev/null
@@ -1,68 +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"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_XT)
-
-#include "ace/XtReactor.h"
-
-// ****************************************************************
-
-/**
- * @class TAO_XT_Resource_Factory
- *
- * @brief TAO's default resource factory
- *
- * Using a <{resource source specifier}> as a discriminator, the
- * factory can return resource instances which are, e.g., global,
- * stored in thread-specific storage, stored in shared memory,
- * etc.
- */
-class TAO_XT_Resource_Factory : public TAO_Default_Resource_Factory
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_XT_Resource_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_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/xt_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_XT_Resource_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_XT_Resource_Factory)
-
-#endif /* ACE_HAS_XT */
-
-#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 0b14c74dcf9..00000000000
--- a/TAO/tao/xt_resource.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_XT_Resource_Factory::TAO_XT_Resource_Factory (void)
-{
-}
diff --git a/TAO/tests/FL_Cube/.cvsignore b/TAO/tests/FL_Cube/.cvsignore
new file mode 100644
index 00000000000..f2ad85300eb
--- /dev/null
+++ b/TAO/tests/FL_Cube/.cvsignore
@@ -0,0 +1,2 @@
+client
+server
diff --git a/TAO/tests/FL_Cube/FL_Cube.mpc b/TAO/tests/FL_Cube/FL_Cube.mpc
index e758da35d68..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, strategies {
+project(*client) : taoexe, portableserver, tao_flresource {
   source_files {
     client.cpp
   }
 }
 
-project(*server) : taoexe, portableserver, strategies {
+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 d0c07a5748e..bb4a9dee3c5 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -1,22 +1,10 @@
 // $Id$
-
+#include "tao/FlResource_Loader.h"
 #include "testC.h"
 #include "ace/Get_Opt.h"
-#include "tao/Strategies/advanced_resource.h"
 
 ACE_RCSID(FL_Cube, client, "$Id$")
 
-#if !defined (ACE_HAS_FL)
-
-int main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "FL not supported on this platform\n"));
-  return 0;
-}
-
-#else
-
 #include <FL/Fl.h>
 #include <FL/Fl_Window.h>
 #include <FL/Fl_Roller.h>
@@ -65,6 +53,8 @@ private:
 
 int main (int argc, char* argv[])
 {
+  TAO::FlResource_Loader fl_loader;
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
@@ -207,4 +197,3 @@ Client::parse_args (int argc, char *argv[]
     Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index c7ec9047999..f3c3a235446 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -2,21 +2,10 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
-#include "tao/Strategies/advanced_resource.h"
+#include "tao/FlResource_Loader.h"
 
 ACE_RCSID(FL_Cube, server, "$Id$")
 
-#if !defined (ACE_HAS_FL)
-
-int main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "FL not supported on this platform\n"));
-  return 0;
-}
-
-#else
-
 #include <FL/Fl.h>
 
 const char *ior_output_file = 0;
@@ -51,6 +40,7 @@ int
 main (int argc, char *argv[])
 {
   Fl_Window window(300, 300);
+  TAO::FlResource_Loader fl_loader;
 
   Simple_Window sw (10, 10,
                     window.w () - 20, window.h () - 20);
@@ -131,4 +121,3 @@ main (int argc, char *argv[])
   return 0;
 }
 
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/svc.conf b/TAO/tests/FL_Cube/svc.conf
deleted file mode 100644
index f7d75c036eb..00000000000
--- a/TAO/tests/FL_Cube/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBReactorType fl"
diff --git a/TAO/tests/FL_Cube/svc.conf.xml b/TAO/tests/FL_Cube/svc.conf.xml
deleted file mode 100644
index a640e1362e3..00000000000
--- a/TAO/tests/FL_Cube/svc.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./tests/FL_Cube/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBReactorType fl"/>
-</ACE_Svc_Conf>
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index 5a73baab476..55e557c3341 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -1,8 +1,6 @@
 // $Id$
 
 #include "test_i.h"
-
-#if defined(ACE_HAS_FL)
 #include <GL/gl.h>
 
 ACE_RCSID(FL_Cube, test_i, "$Id$")
@@ -177,4 +175,3 @@ Simple_Window::draw_cube (void)
     glEnd();
 }
 
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h
index ede24fd4ecf..b2573fa173f 100644
--- a/TAO/tests/FL_Cube/test_i.h
+++ b/TAO/tests/FL_Cube/test_i.h
@@ -18,8 +18,6 @@
 
 #include "testS.h"
 
-#if defined(ACE_HAS_FL)
-
 #include <FL/Fl_Gl_Window.h>
 
 
@@ -79,6 +77,4 @@ private:
   // Display the graphics...
 };
 
-#endif /* ACE_HAS_FL */
-
 #endif /* TAO_FL_SERVER_TEST_I_H */
diff --git a/TAO/tests/QtTests/.cvsignore b/TAO/tests/QtTests/.cvsignore
new file mode 100644
index 00000000000..51933fcff4f
--- /dev/null
+++ b/TAO/tests/QtTests/.cvsignore
@@ -0,0 +1,8 @@
+client
+client
+client_moc.cpp
+client_moc.cpp
+server
+server
+test_i_moc.cpp
+test_i_moc.cpp
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index 1013e370e62..a134df67dd0 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, ace_qt, qt_moc {
-  requires += qt
+project(*server): taoexe, portableserver, tao_qtresource  {
 
   MOC_Files {
     test_i.h
@@ -15,8 +14,7 @@ project(*server): taoexe, portableserver, ace_qt, qt_moc {
   }
 }
 
-project(*client): taoexe, ace_qt, qt_moc {
-  requires += qt
+project(*client): taoexe, tao_qtresource {
 
   MOC_Files {
     client.h
diff --git a/TAO/tests/QtTests/README b/TAO/tests/QtTests/README
index f5becbeb352..29393ece1f1 100644
--- a/TAO/tests/QtTests/README
+++ b/TAO/tests/QtTests/README
@@ -20,6 +20,11 @@ library installed.  You should enable the build of the QtReactor by
 initializing qt_reactor. The path should point to the Qt/bin area so
 that the moc could be accessed by the Makefile.
 
+Bugs:
+It seems there is a problem with ORB shutdown, namely client does not
+shutdown nicely after QUIT button. Needs some additional investigations.
+
+
 ---------------------------------------------------------------------
 Technical Description:
 The technical details are similar to that of the XtReactor. Please
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index fc505726700..165651a0181 100755
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -2,27 +2,17 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "tao/QtResource_Loader.h"
 
 ACE_RCSID(QtTests, client, "$Id$")
 
-#if !defined (ACE_HAS_QT)
-
-int
-main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "Qt not supported on this platform\n"));
-  return 0;
-}
-
-#else
 #include "client.h"
 
 int
 main (int argc, char *argv[])
 {
   QApplication app (argc, argv);
-  TAO_QtResource_Factory::set_context (&app);
+  TAO::QtResource_Loader qt_resources (&app);
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -167,4 +157,3 @@ Client::shutdown_call (void)
   this->server_->shutdown ();
 }
 
-#endif /* ACE_HAS_QT*/
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index 36da68ab1f9..e4b50c40a70 100755
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -18,9 +18,6 @@
 
 #include "testC.h"
 
-#if defined (ACE_HAS_QT)
-
-#include "tao/qt_resource.h"
 #include <qapplication.h>
 #include <qvbox.h>
 #include <qslider.h>
@@ -70,6 +67,4 @@ private:
   QApplication *qapp_;
 };
 
-#endif /*ACE_HAS_QT*/
-
 #endif /* _QT_CLIENT_H */
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 1103e4a3358..718c1947c7c 100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -5,22 +5,11 @@
 
 ACE_RCSID (QtTests, server, "$Id$")
 
-#if !defined (ACE_HAS_QT)
-
-int
-main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "Qt not supported on this platform\n"));
-  return 0;
-}
-
-#else
 // who defines index macro?
 #ifdef index
 #undef index
 #endif
-#include "tao/qt_resource.h"
+#include "tao/QtResource_Loader.h"
 #include <qlcdnumber.h>
 #include <qvbox.h>
 #include <qslider.h>
@@ -44,12 +33,14 @@ parse_args (int argc, char *argv[])
 
       case '?':
       default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
+          // ignore the first unknown option
+          return 0;
+//         ACE_ERROR_RETURN ((LM_ERROR,
+//                            "usage:  %s "
+//                            "-o <iorfile>"
+//                            "\n",
+//                            argv [0]),
+//                           -1);
       }
   // Indicates sucessful parsing of the command line
   return 0;
@@ -64,7 +55,7 @@ main (int argc, char *argv[])
 
   // Qt specific stuff for running with TAO...
   QApplication app (argc, argv);
-  TAO_QtResource_Factory::set_context (&app);
+  TAO::QtResource_Loader qt_resources (&app);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -152,5 +143,3 @@ main (int argc, char *argv[])
   ACE_ENDTRY;
   return 0;
 }
-
-#endif /* ACE_HAS_QT */
diff --git a/TAO/tests/QtTests/svc.conf b/TAO/tests/QtTests/svc.conf
deleted file mode 100644
index 7134e5e18a4..00000000000
--- a/TAO/tests/QtTests/svc.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# $Id$
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_QtResource_Factory() ""
diff --git a/TAO/tests/QtTests/svc.conf.xml b/TAO/tests/QtTests/svc.conf.xml
deleted file mode 100644
index ed38f288da0..00000000000
--- a/TAO/tests/QtTests/svc.conf.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./tests/QtTests/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  -->
- <!--  $Id$ -->
- <!--  -->
- <dynamic id="Resource_Factory" type="Service_Object">
-   <initializer path="TAO" init="_make_TAO_QtResource_Factory"/>
- </dynamic>
-</ACE_Svc_Conf>
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 3d97049c81c..0d961989108 100755
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -2,9 +2,9 @@
 
 #include "test_i.h"
 
-#if defined(ACE_HAS_QT)
-
-ACE_RCSID(FL_Cube, test_i, "$Id$")
+ACE_RCSID( QtTests,
+           test_i,
+           "$Id$")
 
 LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
 
@@ -31,4 +31,4 @@ LCD_Display_imp::send_val (CORBA::Long val
               "The value from server is <%d> \n", val));
   emit set_value (val);
 }
-#endif /* ACE_HAS_QT */
+
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index d655bec27da..ac04d36afc9 100755
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -1,5 +1,4 @@
 // $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -18,10 +17,6 @@
 
 #include "testS.h"
 
-
-#if defined(ACE_HAS_QT)
-
-#include "tao/qt_resource.h"
 #include <qapplication.h>
 #include <qobject.h>
 
@@ -56,6 +51,4 @@ private:
   // The ORB
 };
 
-#endif /* ACE_HAS_QT */
-
 #endif /* SERVER_TEST_I_H */
diff --git a/TAO/tests/Xt_Stopwatch/.cvsignore b/TAO/tests/Xt_Stopwatch/.cvsignore
new file mode 100644
index 00000000000..955ffdc75d5
--- /dev/null
+++ b/TAO/tests/Xt_Stopwatch/.cvsignore
@@ -0,0 +1,4 @@
+client
+client
+server
+server
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index e39fb418d95..978e0f3c3b1 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -18,9 +18,8 @@
 
 #include "testC.h"
 
-#if defined (ACE_HAS_XT)
 
-#include "tao/xt_resource.h"
+#include "tao/XtResource_Loader.h"
 class Control;
 
 class Client
@@ -59,5 +58,4 @@ private:
   // The server.
 };
 
-#endif /*ACE_HAS_XT*/
 #endif /* CLIENT_H */
diff --git a/TAO/tests/Xt_Stopwatch/Control.cpp b/TAO/tests/Xt_Stopwatch/Control.cpp
index 9e7745c2f24..6d3de01204b 100644
--- a/TAO/tests/Xt_Stopwatch/Control.cpp
+++ b/TAO/tests/Xt_Stopwatch/Control.cpp
@@ -2,7 +2,6 @@
 
 #include "Control.h"
 
-#if defined (ACE_HAS_XT)
 
 Control::Control (Widget &parent)
 {
@@ -53,4 +52,3 @@ Control::stopwidget (void)
   return this->stopwidget_;
 }
 
-#endif /*ACE_HAS_XT*/
diff --git a/TAO/tests/Xt_Stopwatch/Control.h b/TAO/tests/Xt_Stopwatch/Control.h
index 88aaeada02c..0dea6b7eed9 100644
--- a/TAO/tests/Xt_Stopwatch/Control.h
+++ b/TAO/tests/Xt_Stopwatch/Control.h
@@ -17,7 +17,6 @@
 #define CONTROL_H
 #include "Client.h"
 
-#if defined (ACE_HAS_XT)
 
 #include <Xm/Xm.h>
 #include <Xm/PushB.h>
@@ -60,6 +59,5 @@ class Control
 
 };
 
-#endif /*ACE_HAS_XT */
 
 #endif /* CONTROL_H */
diff --git a/TAO/tests/Xt_Stopwatch/README b/TAO/tests/Xt_Stopwatch/README
index 3bbd0f6f22c..85040fb2895 100644
--- a/TAO/tests/Xt_Stopwatch/README
+++ b/TAO/tests/Xt_Stopwatch/README
@@ -24,22 +24,12 @@ Technical Description:
 In addition to specifying the resources that the ORB needs to allocate
 for an Xt event loop, the ORB also needs the information about the
 XtAppContext in which the user application is initialised. To provide
-these information TAO provides a class by name
-"TAO_XT_Resource_Factory" that inherits from the
-TAO_Default_Resource_factory. This provides the user with a static
-method through which he can set the XtAppContext.
-
-To make TAO understand that the user is in fact wants to use the
-TAO_XT_Resource_Factory and not the default resource factory, the
-application developer must add the following line to his svc.conf
-file. 
-
-dynamic Resource_Factory Service_Object *
-TAO:_make_TAO_XT_Resource_Factory() ""
-
-Please see the line of code in server.cpp that sets the XtAppContext
-in the TAO_XT_Resource_factory.
-
-One more interseting observation would be to note that the server and
-client  run on the Xt event loop by calling the  XtAppMainLoop ().
+these information TAO provides a class by name TAO_XtResource_Loader which is
+responsible for create and instance of TAO_XtResource_Factory that inherits
+from the TAO_Default_Resource_factory. TAO_XtResource_Loader has a constructor
+parameterized the application context necessary for integration of ACE_XtReactor
+with Xt event loop.
+
+Please notice also that the server and client  run on the Xt event loop by
+calling the  XtAppMainLoop ().
 
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
index 9020bdd4e44..9f55249b27b 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
@@ -2,7 +2,6 @@
 
 #include "Stopwatch_display.h"
 
-#if defined (ACE_HAS_XT)
 
 #include "ace/OS_NS_stdio.h"
 
@@ -58,4 +57,3 @@ Stopwatch_display::set_time (CORBA::Float time)
   XmStringFree (xmstr);
 }
 
-#endif /*ACE_HAS_XT*/
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
index dd62dd9d5eb..984d90b4d35 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
@@ -18,8 +18,6 @@
 #include /**/ "ace/pre.h"
 #include "tao/ORB_Constants.h"
 
-#if defined (ACE_HAS_XT)
-
 #include <Xm/Xm.h>
 #include <Xm/Frame.h>
 #include <Xm/Label.h>
@@ -48,7 +46,6 @@ private:
   // Label Widget that is used to display time..
 };
 
-#endif /*ACE_HAS_XT*/
 
 #include /**/ "ace/post.h"
 #endif /* STOPWATCH_H */
diff --git a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
index fa1415dbe43..d98e1e04898 100644
--- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
+++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
-  requires += xt_reactor
+project(*Server): taoexe, portableserver, tao_xtresource, ace_motif {
   Source_Files {
     test_i.cpp
     Stopwatch_display.cpp
@@ -11,8 +10,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
-  requires += xt_reactor
+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 f40fe31f222..5ef015f0e6a 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -5,17 +5,6 @@
 
 ACE_RCSID(Xt_Stopwatch, client, "$Id$")
 
-#if !defined (ACE_HAS_XT)
-
-int
-main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "Xt not supported on this platform\n"));
-  return 0;
-}
-
-#else
 #include "Control.h"
 #include "Client.h"
 
@@ -34,7 +23,7 @@ main (int argc, char *argv[])
                                      NULL,
                                      0);
 
-  TAO_XT_Resource_Factory::set_context (app);
+  TAO::XtResource_Loader xt_loader (app);
 
   Control control (toplevel);
 
@@ -191,4 +180,3 @@ Client::stop_hook (void)
   ACE_CHECK;
 }
 
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index d7febb879c3..374dcb368f0 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -8,20 +8,7 @@ ACE_RCSID (Xt_Stopwatch,
            server,
            "$Id$")
 
-
-#if !defined (ACE_HAS_XT)
-
-int
-main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "Xt not supported on this platform\n"));
-  return 0;
-}
-
-#else
-
-#include "tao/xt_resource.h"
+#include "tao/XtResource_Loader.h"
 #include <Xm/Xm.h>
 #include "Stopwatch_display.h"
 #include "timer.h"
@@ -72,7 +59,7 @@ main (int argc, char *argv[])
                                      NULL,
                                      0);
 
-  TAO_XT_Resource_Factory::set_context (app);
+  TAO::XtResource_Loader xt_loader (app);
 
   Stopwatch_display stopwatch (toplevel);
 
@@ -157,4 +144,3 @@ main (int argc, char *argv[])
   return 0;
 }
 
-#endif /* ACE_HAS_Xt */
diff --git a/TAO/tests/Xt_Stopwatch/svc.conf b/TAO/tests/Xt_Stopwatch/svc.conf
deleted file mode 100644
index 9d6894193c4..00000000000
--- a/TAO/tests/Xt_Stopwatch/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_XT_Resource_Factory() ""
diff --git a/TAO/tests/Xt_Stopwatch/svc.conf.xml b/TAO/tests/Xt_Stopwatch/svc.conf.xml
deleted file mode 100644
index 58ce9b10ea3..00000000000
--- a/TAO/tests/Xt_Stopwatch/svc.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./tests/Xt_Stopwatch/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <!--  -->
- <dynamic id="Resource_Factory" type="Service_Object">
-   <initializer path="TAO" init="_make_TAO_XT_Resource_Factory"/>
- </dynamic>
-</ACE_Svc_Conf>
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index b3e9678fa62..de99f651892 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -2,9 +2,7 @@
 
 #include "test_i.h"
 
-#if defined(ACE_HAS_XT)
-
-ACE_RCSID(FL_Cube, test_i, "$Id$")
+ACE_RCSID(Xt_Stopwatch, test_i, "$Id$")
 
 Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
   : orb_ (CORBA::ORB::_duplicate (orb)),
@@ -33,4 +31,3 @@ Stopwatch_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   this->orb_->shutdown (0);
 }
 
-#endif /* ACE_HAS_XT */
diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h
index 9250769c1b8..33e4e0e826f 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ b/TAO/tests/Xt_Stopwatch/test_i.h
@@ -19,7 +19,6 @@
 #include "testS.h"
 #include "timer.h"
 
-#if defined(ACE_HAS_XT)
 
 class Stopwatch_imp : public POA_Stopwatch
 {
@@ -51,6 +50,4 @@ private:
   // Hold the timer object...
 };
 
-#endif /* ACE_HAS_XT */
-
 #endif /* SERVER_TEST_I_H */
diff --git a/TAO/tests/Xt_Stopwatch/timer.cpp b/TAO/tests/Xt_Stopwatch/timer.cpp
index 35716040392..e9dca4c405e 100644
--- a/TAO/tests/Xt_Stopwatch/timer.cpp
+++ b/TAO/tests/Xt_Stopwatch/timer.cpp
@@ -1,7 +1,6 @@
 //$Id$
 #include "timer.h"
 
-#if defined (ACE_HAS_XT)
 
 Timer_imp::Timer_imp (XtAppContext &app,
                       CORBA::Long interval,
@@ -84,4 +83,3 @@ Timer_imp::report_time (CORBA::Float time)
 }
 
 
-#endif /*ACE_HAS_XT*/
diff --git a/TAO/tests/Xt_Stopwatch/timer.h b/TAO/tests/Xt_Stopwatch/timer.h
index 08ae4345a40..6c2362cb1a3 100644
--- a/TAO/tests/Xt_Stopwatch/timer.h
+++ b/TAO/tests/Xt_Stopwatch/timer.h
@@ -18,7 +18,6 @@
 
 #include "Stopwatch_display.h"
 
-#if defined (ACE_HAS_XT)
 
 #include <Xm/Xm.h>
 
@@ -69,6 +68,5 @@ class Timer_imp
   // Required by Xt functions
 };
 
-#endif /*ACE_HAS_XT*/
 
 #endif /* TIMER_H */
diff --git a/TAO/utils/catior/.cvsignore b/TAO/utils/catior/.cvsignore
new file mode 100644
index 00000000000..cde3a278f0a
--- /dev/null
+++ b/TAO/utils/catior/.cvsignore
@@ -0,0 +1 @@
+catior
diff --git a/TAO/utils/nslist/.cvsignore b/TAO/utils/nslist/.cvsignore
new file mode 100644
index 00000000000..3acf671e95c
--- /dev/null
+++ b/TAO/utils/nslist/.cvsignore
@@ -0,0 +1,3 @@
+nsadd
+nsdel
+nslist