ChangeLogTag: Tue Dec 7 20:48:36 2004 Marek Brudka <mbrudka@aster.pl>

13 files changed, 116 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 195c9eb9f0c..fdfdfee6df3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Dec  7 20:48:36 2004  Marek Brudka  <mbrudka@aster.pl>
+
+	* ace/ace_qtreactor.mpc (Module):
+	* ace/QtReactor_export.h (Module):
+	* ace/QtReactor.h (Module):
+	* ace/ACE_QtReactor_export.h (Module):
+	Change QtReactor_export.h into ACE_QtReactor_export.h to avoid possible,
+	though not very probably name conflict and remain consistent
+	with TAO_QtReact_export.
+
 Tue Dec  7 00:23:54 2004  Marek Brudka  <mbrudka@aster.pl>
 
 	* ace/ace_qtreactor.mpc (Module):
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index aacb2cef956..3a15c1d2d28 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Tue Dec  7 21:05:12 2004  Marek Brudka  <mbrudka@aster.pl>
+
+	* tests/QtTests/README (Module):
+	Described a problem with ORB shutdown.
+
+	* tests/QtTests/svc.conf.xml (Module):
+	* tests/QtTests/svc.conf (Module):
+	Change shared library where QtResource factory can be found from TAO to
+	TAO_QtReactor.
+
+	* tests/QtTests/server.cpp (Module):
+	* tests/QtTests/client.cpp (Module):
+	Removed silly mistake related with removing ACE_HAS_QT macros.
+
+Tue Dec  7 20:48:26 2004  Marek Brudka  <mbrudka@aster.pl>
+	* tao/tao_qtreactor.mpc (Module):
+	* tao/qt_resource.h (Module):
+	* tao/TAO_QtReactor_export.h (Module):
+	Created and applied export macros for TAO_QtReactor.
+
 Mon Dec  6 00:35:59 2004  Marek Brudka  <mbrudka@aster.pl>
 
 	* TAO_IDL/.cvsignore (Module):
diff --git a/TAO/tao/TAO_QtReactor_export.h b/TAO/tao/TAO_QtReactor_export.h
new file mode 100644
index 00000000000..fd367efc901
--- /dev/null
+++ b/TAO/tao/TAO_QtReactor_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_QtReactor
+// ------------------------------
+#ifndef TAO_QTREACTOR_EXPORT_H
+#define TAO_QTREACTOR_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_QTREACTOR_HAS_DLL)
+#  define TAO_QTREACTOR_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TAO_QTREACTOR_HAS_DLL */
+
+#if !defined (TAO_QTREACTOR_HAS_DLL)
+#  define TAO_QTREACTOR_HAS_DLL 1
+#endif /* ! TAO_QTREACTOR_HAS_DLL */
+
+#if defined (TAO_QTREACTOR_HAS_DLL) && (TAO_QTREACTOR_HAS_DLL == 1)
+#  if defined (TAO_QTREACTOR_BUILD_DLL)
+#    define TAO_QtReactor_Export ACE_Proper_Export_Flag
+#    define TAO_QTREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_QTREACTOR_BUILD_DLL */
+#    define TAO_QtReactor_Export ACE_Proper_Import_Flag
+#    define TAO_QTREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_QTREACTOR_BUILD_DLL */
+#else /* TAO_QTREACTOR_HAS_DLL == 1 */
+#  define TAO_QtReactor_Export
+#  define TAO_QTREACTOR_SINGLETON_DECLARATION(T)
+#  define TAO_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_QTREACTOR_HAS_DLL == 1 */
+
+// Set TAO_QTREACTOR_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TAO_QTREACTOR_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TAO_QTREACTOR_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TAO_QTREACTOR_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TAO_QTREACTOR_NTRACE */
+
+#if (TAO_QTREACTOR_NTRACE == 1)
+#  define TAO_QTREACTOR_TRACE(X)
+#else /* (TAO_QTREACTOR_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TAO_QTREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TAO_QTREACTOR_NTRACE == 1) */
+
+#endif /* TAO_QTREACTOR_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/qt_resource.h b/TAO/tao/qt_resource.h
index 2892db18fc7..ba001748b91 100644
--- a/TAO/tao/qt_resource.h
+++ b/TAO/tao/qt_resource.h
@@ -16,6 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/default_resource.h"
+#include "tao/TAO_QtReactor_export.h"
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -33,7 +34,7 @@
  * stored in thread-specific storage, stored in shared memory,
  * etc.
  */
-class TAO_Export TAO_QtResource_Factory : public TAO_Default_Resource_Factory
+class TAO_QtReactor_Export TAO_QtResource_Factory : public TAO_Default_Resource_Factory
 {
 
 public:
diff --git a/TAO/tao/tao_qtreactor.mpc b/TAO/tao/tao_qtreactor.mpc
index 3a68f0bc24e..388241090b6 100644
--- a/TAO/tao/tao_qtreactor.mpc
+++ b/TAO/tao/tao_qtreactor.mpc
@@ -1,10 +1,16 @@
 project(TAO_QtReactor) : acelib, taolib, taoversion, core, tao_output, taodefaults, ace_qt {
   sharedname   = TAO_QtReactor
-  dynamicflags += TAO_BUILD_DLL
-
+  dynamicflags += TAO_QTREACTOR_BUILD_DLL
+  Header_Files {
+    TAO_QtReactor_Export.h
+    qt_resource.h
+  }
+  Inline_Files {
+    qt_resource.i.h
+  }
   Source_Files(TAO_COMPONENTS) {
     Default_Resources {
       qt_resource.cpp
-	}
+    }
   }
 }
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 263f52598ef..4adecfe75b2 100755
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -5,15 +5,6 @@
 
 ACE_RCSID(QtTests, client, "$Id$")
 
-int
-main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "Qt not supported on this platform\n"));
-  return 0;
-}
-
-#else
 #include "client.h"
 
 int
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 69f3495e56f..457e701dedf 100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -5,15 +5,6 @@
 
 ACE_RCSID (QtTests, server, "$Id$")
 
-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
@@ -42,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;
diff --git a/TAO/tests/QtTests/svc.conf b/TAO/tests/QtTests/svc.conf
index 7134e5e18a4..b1b5b021ba2 100644
--- a/TAO/tests/QtTests/svc.conf
+++ b/TAO/tests/QtTests/svc.conf
@@ -1,4 +1,4 @@
 #
 # $Id$
 #
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_QtResource_Factory() ""
+dynamic Resource_Factory Service_Object * TAO_QtReactor:_make_TAO_QtResource_Factory() ""
diff --git a/TAO/tests/QtTests/svc.conf.xml b/TAO/tests/QtTests/svc.conf.xml
index ed38f288da0..a181e0fb3aa 100644
--- a/TAO/tests/QtTests/svc.conf.xml
+++ b/TAO/tests/QtTests/svc.conf.xml
@@ -5,6 +5,6 @@
  <!--  $Id$ -->
  <!--  -->
  <dynamic id="Resource_Factory" type="Service_Object">
-   <initializer path="TAO" init="_make_TAO_QtResource_Factory"/>
+   <initializer path="TAO_QtReactor" init="_make_TAO_QtResource_Factory"/>
  </dynamic>
 </ACE_Svc_Conf>
diff --git a/ace/QtReactor_export.h b/ace/ACE_QtReactor_export.h
index 850d2d4dab1..850d2d4dab1 100644
--- a/ace/QtReactor_export.h
+++ b/ace/ACE_QtReactor_export.h
diff --git a/ace/QtReactor.h b/ace/QtReactor.h
index 804a87506c0..b336fdd3d13 100644
--- a/ace/QtReactor.h
+++ b/ace/QtReactor.h
@@ -17,7 +17,7 @@
 
 
 #include "ace/Select_Reactor.h"
-#include "ace/QtReactor_export.h"
+#include "ace/ACE_QtReactor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/ace_qtreactor.mpc b/ace/ace_qtreactor.mpc
index a8e36d8f236..afae95ef46d 100644
--- a/ace/ace_qtreactor.mpc
+++ b/ace/ace_qtreactor.mpc
@@ -11,7 +11,7 @@ project(ACE_QtReactor) : acedefaults, aceversion, core, acelib, ace_qt {
   }
 
   Header_Files {
-    QtReactor_export.h
+    ACE_QtReactor_export.h
   }
 
   Source_Files(ACE_COMPONENTS) {