Wed Nov 22 11:39:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 22 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ec6b3aeba2e..54a0a44f667 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Wed Nov 22 11:39:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/FlResource/FlResource_Factory.cpp:
+        * tao/FlResource/FlResource_Factory.h:
+        * tao/QtResource/QtResource_Factory.cpp:
+        * tao/QtResource/QtResource_Factory.h:
+        * tao/TkResource/TkResource_Factory.cpp:
+        * tao/TkResource/TkResource_Factory.h:
+        * tao/XtResource/XtResource_Factory.cpp:
+        * tao/XtResource/XtResource_Factory.h:
+          Updated these files because the reactors they use are moved
+          to their own directories in ACE.
+
 Wed Nov 22 10:54:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Strategies.mpc:
diff --git a/TAO/tao/FlResource/FlResource_Factory.cpp b/TAO/tao/FlResource/FlResource_Factory.cpp
index a280383b065..2071a22c25c 100644
--- a/TAO/tao/FlResource/FlResource_Factory.cpp
+++ b/TAO/tao/FlResource/FlResource_Factory.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/FlResource/FlResource_Factory.h"
 #include "tao/debug.h"
-#include "ace/FlReactor.h"
+#include "ace/FlReactor/FlReactor.h"
 
 ACE_RCSID( TAO_FlResource,
            FlResource_Factory,
diff --git a/TAO/tao/FlResource/FlResource_Factory.h b/TAO/tao/FlResource/FlResource_Factory.h
index 28da6ab9341..7d70cf7c5bd 100644
--- a/TAO/tao/FlResource/FlResource_Factory.h
+++ b/TAO/tao/FlResource/FlResource_Factory.h
@@ -20,7 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/FlReactor.h"
+#include "ace/FlReactor/FlReactor.h"
 #include "tao/GUIResource_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp
index e14004464f1..d8ba19c57d0 100644
--- a/TAO/tao/QtResource/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource/QtResource_Factory.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/QtResource/QtResource_Factory.h"
 #include "tao/debug.h"
-#include "ace/QtReactor.h"
+#include "ace/QtReactor/QtReactor.h"
 
 ACE_RCSID (TAO_QtResource,
            QtResource_Factory,
@@ -25,7 +25,7 @@ namespace TAO
       {
         ACE_ERROR ((LM_ERROR,
                     "TAO (%P|%t) - QApplication is undefined.",
-                    " Cannot create ACE_XtReactor \n"));
+                    " Cannot create ACE_QtReactor \n"));
         return 0;
       }
 
diff --git a/TAO/tao/QtResource/QtResource_Factory.h b/TAO/tao/QtResource/QtResource_Factory.h
index 8af126b607a..8c63bc68f18 100644
--- a/TAO/tao/QtResource/QtResource_Factory.h
+++ b/TAO/tao/QtResource/QtResource_Factory.h
@@ -21,7 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include <qapplication.h>
-#include "ace/QtReactor.h"
+#include "ace/QtReactor/QtReactor.h"
 #include "tao/GUIResource_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp
index 622a0fb45cf..32ad31eacb2 100644
--- a/TAO/tao/TkResource/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource/TkResource_Factory.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/TkResource/TkResource_Factory.h"
 #include "tao/debug.h"
-#include "ace/TkReactor.h"
+#include "ace/TkReactor/TkReactor.h"
 
 ACE_RCSID( TAO_TkResource,
            TkResource_Factory,
diff --git a/TAO/tao/TkResource/TkResource_Factory.h b/TAO/tao/TkResource/TkResource_Factory.h
index f4aab08db60..fd2f5461556 100644
--- a/TAO/tao/TkResource/TkResource_Factory.h
+++ b/TAO/tao/TkResource/TkResource_Factory.h
@@ -13,7 +13,7 @@
 #ifndef TAO_TKRESOURCE_FACTORY_H
 #define TAO_TKRESOURCE_FACTORY_H
 #include /**/ "ace/pre.h"
-#include "ace/TkReactor.h"
+#include "ace/TkReactor/TkReactor.h"
 #include "tao/TkResource/TAO_TkResource_Export.h"
 #include "tao/GUIResource_Factory.h"
 
diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp
index 0bd2f417292..3a3ad30376e 100644
--- a/TAO/tao/XtResource/XtResource_Factory.cpp
+++ b/TAO/tao/XtResource/XtResource_Factory.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/XtResource/XtResource_Factory.h"
 #include "tao/debug.h"
-#include "ace/XtReactor.h"
+#include "ace/XtReactor/XtReactor.h"
 
 ACE_RCSID( TAO_XtResource,
            XtResource_Factory,
diff --git a/TAO/tao/XtResource/XtResource_Factory.h b/TAO/tao/XtResource/XtResource_Factory.h
index 5099969e25c..85f184ae631 100644
--- a/TAO/tao/XtResource/XtResource_Factory.h
+++ b/TAO/tao/XtResource/XtResource_Factory.h
@@ -15,7 +15,7 @@
 #include /**/ "ace/pre.h"
 #include /**/ <X11/Intrinsic.h>
 #include "tao/XtResource/TAO_XtResource_Export.h"
-#include "ace/XtReactor.h"
+#include "ace/XtReactor/XtReactor.h"
 #include "tao/GUIResource_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)