ChangeLogTag:Mon Aug 06 17:17:33 2001 Ossama Othman <ossama@uci.edu>

5 files changed, 83 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ed548e3254..8f878357485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Mon Aug 06 17:17:33 2001  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Service_Config.cpp:
+
+	  Fixed some debugging messages that were not wrapped within an
+	  ACE_LIB_TEXT macro.
+
+	* tests/Service_Config_Test.UTF-16.conf:
+
+	  Interim UTF-16 encoded version of the UTF-8 encoded
+	  Service_Config_Test.conf.  It was generated on a little-endian
+	  host.  Its current purpose is simply to keep our Unicode
+	  regression testing happy until the on-the-fly generation is
+	  implemented.  Once we start generating this file on-the-fly
+	  this file should disappear.
+	
+	* tests/Service_Config_Test.cpp (run_test):
+
+	  When using full Unicode support, use the version of the Service
+	  Configurator file that is UTF-16 encoded (as described above).
+
 Mon Aug 06 11:10:24 2001  Ossama Othman  <ossama@uci.edu>
 
 	* ace/Svc_Conf_l.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 5ed548e3254..8f878357485 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,24 @@
+Mon Aug 06 17:17:33 2001  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Service_Config.cpp:
+
+	  Fixed some debugging messages that were not wrapped within an
+	  ACE_LIB_TEXT macro.
+
+	* tests/Service_Config_Test.UTF-16.conf:
+
+	  Interim UTF-16 encoded version of the UTF-8 encoded
+	  Service_Config_Test.conf.  It was generated on a little-endian
+	  host.  Its current purpose is simply to keep our Unicode
+	  regression testing happy until the on-the-fly generation is
+	  implemented.  Once we start generating this file on-the-fly
+	  this file should disappear.
+	
+	* tests/Service_Config_Test.cpp (run_test):
+
+	  When using full Unicode support, use the version of the Service
+	  Configurator file that is UTF-16 encoded (as described above).
+
 Mon Aug 06 11:10:24 2001  Ossama Othman  <ossama@uci.edu>
 
 	* ace/Svc_Conf_l.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 5ed548e3254..8f878357485 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,24 @@
+Mon Aug 06 17:17:33 2001  Ossama Othman  <ossama@uci.edu>
+
+	* ace/Service_Config.cpp:
+
+	  Fixed some debugging messages that were not wrapped within an
+	  ACE_LIB_TEXT macro.
+
+	* tests/Service_Config_Test.UTF-16.conf:
+
+	  Interim UTF-16 encoded version of the UTF-8 encoded
+	  Service_Config_Test.conf.  It was generated on a little-endian
+	  host.  Its current purpose is simply to keep our Unicode
+	  regression testing happy until the on-the-fly generation is
+	  implemented.  Once we start generating this file on-the-fly
+	  this file should disappear.
+	
+	* tests/Service_Config_Test.cpp (run_test):
+
+	  When using full Unicode support, use the version of the Service
+	  Configurator file that is UTF-16 encoded (as described above).
+
 Mon Aug 06 11:10:24 2001  Ossama Othman  <ossama@uci.edu>
 
 	* ace/Svc_Conf_l.cpp:
diff --git a/tests/Service_Config_Test.UTF-16.conf b/tests/Service_Config_Test.UTF-16.conf
new file mode 100644
index 00000000000..fa5c34d4a75
--- /dev/null
+++ b/tests/Service_Config_Test.UTF-16.conf
diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp
index f1d6e3c1eae..b7485132707 100644
--- a/tests/Service_Config_Test.cpp
+++ b/tests/Service_Config_Test.cpp
@@ -120,10 +120,29 @@ run_test (int argc, ACE_TCHAR *argv[])
 {
   ACE_ARGV new_argv;
 
+  const ACE_TCHAR svc_conf[] =
+#if defined (ACE_USES_WCHAR) && ACE_USES_WCHAR == 1
+    // When using full Unicode support, use the version of the Service
+    // Configurator file that is UTF-16 encoded.
+    //
+    // @@ Note: Some platforms may want other encoding (e.g. UTF-32).
+    //
+    //          iconv(1) found on Linux and Solaris, for example, can
+    //          be used to convert between encodings.
+    //
+    //          Byte ordering is also an issue, so we should be
+    //          generating this file on-the-fly from the UTF-8 encoded
+    //          file by using functions like iconv(1) or iconv(3).
+    ACE_TEXT ("Service_Config_Test.UTF-16.conf");
+#else
+    // ASCII (UTF-8) encoded Service Configurator file.
+    ACE_TEXT ("Service_Config_Test.conf");
+#endif  /* ACE_USES_WCHAR == 1 */
+
   // Process the Service Configurator directives in this test's
   ACE_ASSERT (new_argv.add (argv) != -1
               && new_argv.add (ACE_TEXT ("-f")) != -1
-              && new_argv.add (ACE_TEXT ("Service_Config_Test.conf")) != -1);
+              && new_argv.add (svc_conf) != -1);
 
   // We need this scope to make sure that the destructor for the
   // <ACE_Service_Config> gets called.