Merge pull request #1948 from mitza-oci/a6t2-merge

[ACE6-TAO2] Merge selected recent changes from ACE7-TAO3

70 files changed, 892 insertions, 500 deletions

diff --git a/ACE/ACEXML/apps/svcconf/ACEXML_XML_Svc_Conf_Parser.rc b/ACE/ACEXML/apps/svcconf/ACEXML_XML_Svc_Conf_Parser.rc
new file mode 100644
index 00000000000..1d6036f1ea0
--- /dev/null
+++ b/ACE/ACEXML/apps/svcconf/ACEXML_XML_Svc_Conf_Parser.rc
@@ -0,0 +1,30 @@
+#include "../../../ace/Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACEXML_XML_Svc_Conf_Parser\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACEXML_XML_Svc_Conf_ParserDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACEXML_XML_Svc_Conf_Parser.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/ACEXML/common/ACEXML.rc b/ACE/ACEXML/common/ACEXML.rc
new file mode 100644
index 00000000000..12abc38b63e
--- /dev/null
+++ b/ACE/ACEXML/common/ACEXML.rc
@@ -0,0 +1,30 @@
+#include "../../ace/Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACEXML\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACEXMLDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACEXML.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/ACEXML/parser/parser/ACEXML_Parser.rc b/ACE/ACEXML/parser/parser/ACEXML_Parser.rc
new file mode 100644
index 00000000000..ea134a6ba13
--- /dev/null
+++ b/ACE/ACEXML/parser/parser/ACEXML_Parser.rc
@@ -0,0 +1,30 @@
+#include "../../../ace/Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACEXML_Parser\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACEXML_ParserDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACEXML_Parser.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp
index 0ff5080d688..a4379dec41e 100644
--- a/ACE/ace/ACE.cpp
+++ b/ACE/ace/ACE.cpp
@@ -2343,11 +2343,7 @@ ACE::format_hexdump (const char *buffer,
       textver[j] = 0;
 
       ACE_OS::snprintf (obuf, obuf_sz - (obuf - obuf_start),
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                       ACE_TEXT ("  %ls\n"),
-#else
-                       ACE_TEXT ("  %s\n"),
-#endif
+                       ACE_TEXT ("  %") ACE_TEXT_PRIs ACE_TEXT ("\n"),
                        textver);
 
       while (*obuf != '\0')
@@ -2384,11 +2380,7 @@ ACE::format_hexdump (const char *buffer,
 
       textver[i] = 0;
       ACE_OS::snprintf (obuf, obuf_sz - (obuf - obuf_start),
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                       ACE_TEXT ("  %ls\n"),
-#else
-                       ACE_TEXT ("  %s\n"),
-#endif
+                       ACE_TEXT ("  %") ACE_TEXT_PRIs ACE_TEXT ("\n"),
                        textver);
     }
   return size;
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h
index 78db98fcdd0..60cc3f17276 100644
--- a/ACE/ace/Asynch_IO.h
+++ b/ACE/ace/Asynch_IO.h
@@ -840,7 +840,7 @@ public:
   private:
     /// Here just to provide an dummpy implementation, since the
     /// one auto generated by MSVC is flagged as infinitely recursive
-    void operator= (Result &) {};
+    void operator= (Result &) {}
   };
 private:
   ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Write_File &))
@@ -1651,9 +1651,9 @@ public:
   class ACE_Export Proxy
   {
   public:
-    Proxy (ACE_Handler *handler) : handler_ (handler) {};
-    void reset (void) { this->handler_ = 0; };
-    ACE_Handler *handler (void) { return this->handler_; };
+    Proxy (ACE_Handler *handler) : handler_ (handler) {}
+    void reset (void) { this->handler_ = 0; }
+    ACE_Handler *handler (void) { return this->handler_; }
   private:
     ACE_Handler *handler_;
   };
diff --git a/ACE/ace/Compression/ACE_Compression.rc b/ACE/ace/Compression/ACE_Compression.rc
new file mode 100644
index 00000000000..54d61b2b83f
--- /dev/null
+++ b/ACE/ace/Compression/ACE_Compression.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACE_Compression\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACE_CompressionDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACE_Compression.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/ace/Compression/rle/ACE_RLECompression.rc b/ACE/ace/Compression/rle/ACE_RLECompression.rc
new file mode 100644
index 00000000000..9dba63f19dc
--- /dev/null
+++ b/ACE/ace/Compression/rle/ACE_RLECompression.rc
@@ -0,0 +1,30 @@
+#include "../../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACE_RLECompression\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACE_RLECompressionDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACE_RLECompression.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/ace/ETCL/ACE_ETCL.rc b/ACE/ace/ETCL/ACE_ETCL.rc
new file mode 100644
index 00000000000..ec78ac7aeef
--- /dev/null
+++ b/ACE/ace/ETCL/ACE_ETCL.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACE_ETCL\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACE_ETCLDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACE_ETCL.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index 70eedf9f954..d5cc97cfc81 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -50,20 +50,12 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
     + 5 // ACE_OS::strlen ("65535"), Assuming the max port number.
     + 1 // sizeof (':'), addr/port sep
     + 1; // sizeof ('\0'), terminating NUL
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-  ACE_TCHAR const *format = ACE_TEXT("%ls:%d");
-#else
-  ACE_TCHAR const *format = ACE_TEXT("%s:%d");
-#endif /* !ACE_WIN32 && ACE_USES_WCHAR */
+  ACE_TCHAR const *format = ACE_TEXT("%") ACE_TEXT_PRIs ACE_TEXT(":%d");
 #if defined (ACE_HAS_IPV6)
   if (ACE_OS::strchr (hoststr, ACE_TEXT (':')) != 0)
     {
       total_len += 2; // ACE_OS::strlen ("[]") IPv6 addr frames
-#  if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-      format = ACE_TEXT("[%ls]:%d");
-#  else
-      format = ACE_TEXT("[%s]:%d");
-#  endif /* !ACE_WIN32 && ACE_USES_WCHAR */
+      format = ACE_TEXT("[%") ACE_TEXT_PRIs ACE_TEXT("]:%d");
     }
 #endif // ACE_HAS_IPV6
 
diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h
index 36ff94901b8..c7425bf4e81 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.h
+++ b/ACE/ace/Intrusive_Auto_Ptr.h
@@ -48,7 +48,7 @@ class ACE_Intrusive_Auto_Ptr
 {
 protected:
   /// Used to define a proper boolean conversion for "if (sp) ..."
-  static void unspecified_bool(ACE_Intrusive_Auto_Ptr<X>***){};
+  static void unspecified_bool(ACE_Intrusive_Auto_Ptr<X>***){}
   typedef void (*unspecified_bool_type)(ACE_Intrusive_Auto_Ptr<X>***);
 
 public:
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index dbf09f5d3da..2490004c2f4 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1241,11 +1241,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   break;
 
                 case 'N':             // Source file name
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                  ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else
-                  ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+                  ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
                   if (can_check)
                     this_len = ACE_OS::snprintf (bp, bspace, format,
                                                  this->file () ?
@@ -1260,11 +1256,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   break;
 
                 case 'n':             // Program name
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                  ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else /* ACE_WIN32 && ACE_USES_WCHAR */
-                  ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+                  ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
                   if (can_check)
                     this_len = ACE_OS::snprintf (bp, bspace, format,
                                                  ACE_Log_Msg::program_name_ ?
@@ -1504,11 +1496,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   {
                       // Nope, print out standard priority_name() string
 
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                      ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else
-                      ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+                      ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
                       if (can_check)
                         this_len = ACE_OS::snprintf
                           (bp, bspace, format,
@@ -1538,11 +1526,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                       {
 #endif
 
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                        ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else /* ACE_WIN32 && ACE_USES_WCHAR */
-                        ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+                        ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
                         if (can_check)
                           this_len = ACE_OS::snprintf
                             (bp, bspace, format, ACE_TEXT_CHAR_TO_TCHAR (msg));
@@ -1722,11 +1706,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                                       sizeof (day_and_time) / sizeof (ACE_TCHAR),
                                       true);
                     }
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                    ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else
-                    ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+                    ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
                     if (can_check)
                       this_len = ACE_OS::snprintf
                         (bp, bspace, format, day_and_time);
@@ -1740,11 +1720,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                           // hour:minute:sec.usec format.
                   {
                     ACE_TCHAR day_and_time[27];
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                    ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else
-                    ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+                    ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
                     // Did we find the flag indicating a time value argument
                     if (format[1] == ACE_TEXT('#'))
                     {
@@ -1819,11 +1795,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   {
 #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
                     wchar_t *str = va_arg (argp, wchar_t *);
-                    ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
 #else /* ACE_WIN32 && ACE_USES_WCHAR */
                     ACE_TCHAR *str = va_arg (argp, ACE_TCHAR *);
-                    ACE_OS::strcpy (fp, ACE_TEXT ("s"));
 #endif /* ACE_WIN32 && ACE_USES_WCHAR */
+                    ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
                     if (can_check)
                       this_len = ACE_OS::snprintf
                         (bp, bspace, format, str ? str : ACE_TEXT ("(null)"));
@@ -2977,11 +2952,7 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority,
   if (text)
     wr_ptr += ACE_OS::snprintf (wr_ptr,
                                   end_ptr - wr_ptr,
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                                  ACE_TEXT ("%ls - "),
-#else
-                                  ACE_TEXT ("%s - "),
-#endif
+                                  ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" - "),
                                   text);
 
   wr_ptr += ACE_OS::snprintf (wr_ptr,
diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp
index 68c4ef78a1d..603101a154d 100644
--- a/ACE/ace/Log_Record.cpp
+++ b/ACE/ace/Log_Record.cpp
@@ -235,16 +235,6 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
   /* yyyy-mm-dd hh:mm:ss.mmmmmm<nul> */
   ACE_TCHAR timestamp[27]; // Only used by VERBOSE and VERBOSE_LITE.
 
-  // The sprintf format needs to be different for Windows and POSIX
-  // in the wide-char case.
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-  const ACE_TCHAR *verbose_fmt =      ACE_TEXT ("%s@%s@%u@%s@%s");
-  const ACE_TCHAR *verbose_lite_fmt = ACE_TEXT ("%s@%s@%s");
-#else
-  const ACE_TCHAR *verbose_fmt = ACE_TEXT ("%ls@%ls@%u@%ls@%ls");
-  const ACE_TCHAR *verbose_lite_fmt = ACE_TEXT ("%ls@%ls@%ls");
-#endif
-
   if (ACE_BIT_ENABLED (verbose_flag,
                        ACE_Log_Msg::VERBOSE)
       || ACE_BIT_ENABLED (verbose_flag,
@@ -269,7 +259,10 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
                                       ? ACE_TEXT ("<local_host>")
                                       : host_name);
       ACE_OS::snprintf (verbose_msg, verbose_msg_size,
-                       verbose_fmt,
+                       ACE_TEXT ("%") ACE_TEXT_PRIs
+                       ACE_TEXT ("@%") ACE_TEXT_PRIs
+                       ACE_TEXT ("@%u@%") ACE_TEXT_PRIs
+                       ACE_TEXT ("@%") ACE_TEXT_PRIs,
                        timestamp,
                        lhost_name,
                        this->pid_,
@@ -278,7 +271,9 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
     }
   else if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE_LITE))
     ACE_OS::snprintf (verbose_msg, verbose_msg_size,
-                     verbose_lite_fmt,
+                     ACE_TEXT ("%") ACE_TEXT_PRIs
+                     ACE_TEXT ("@%") ACE_TEXT_PRIs
+                     ACE_TEXT ("@%") ACE_TEXT_PRIs,
                      timestamp,
                      ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)),
                      this->msg_data_);
@@ -318,15 +313,9 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[],
             {
               int const verbose_msg_len =
                 static_cast<int> (ACE_OS::strlen (verbose_msg));
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-              int const fwrite_result = ACE_OS::fprintf (fp,
-                                                         ACE_TEXT ("%ls"),
-                                                         verbose_msg);
-#else
               int const fwrite_result = ACE_OS::fprintf (fp,
-                                                         ACE_TEXT ("%s"),
+                                                         ACE_TEXT ("%") ACE_TEXT_PRIs,
                                                          verbose_msg);
-#endif
               // We should have written everything
               if (fwrite_result != verbose_msg_len)
                 result = -1;
diff --git a/ACE/ace/Monitor_Control/Monitor_Control.rc b/ACE/ace/Monitor_Control/Monitor_Control.rc
new file mode 100644
index 00000000000..118f0457042
--- /dev/null
+++ b/ACE/ace/Monitor_Control/Monitor_Control.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACE_Monitor_Control\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACE_Monitor_ControlDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACE_Monitor_Control.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/ace/Null_Barrier.h b/ACE/ace/Null_Barrier.h
index 50e4e2789ea..7be1409dffa 100644
--- a/ACE/ace/Null_Barrier.h
+++ b/ACE/ace/Null_Barrier.h
@@ -27,17 +27,17 @@ public:
   /// Initialize the barrier to synchronize <count> threads.
   ACE_Null_Barrier (unsigned int,
                     const char * = 0,
-                    void * = 0) {};
+                    void * = 0) {}
 
   /// Default dtor.
   ~ACE_Null_Barrier (void) {};
 
   /// Block the caller until all <count> threads have called <wait> and
   /// then allow all the caller threads to continue in parallel.
-  int wait (void) { return 0; };
+  int wait () { return 0; }
 
   /// Dump the state of an object.
-  void dump (void) const {};
+  void dump () const {}
 
   /// Declare the dynamic allocation hooks.
   //ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Null_Condition.h b/ACE/ace/Null_Condition.h
index a86e0c54bec..3e6bd4d2039 100644
--- a/ACE/ace/Null_Condition.h
+++ b/ACE/ace/Null_Condition.h
@@ -66,7 +66,7 @@ public:
 
   /// Returns 0.
   int broadcast (void) {return 0;}
-  ACE_Null_Mutex &mutex (void) {return this->mutex_;};
+  ACE_Null_Mutex &mutex () {return this->mutex_;}
 
   /// Dump the state of an object.
   void dump (void) const {}
diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp
index 2ab3c7ebe47..ad8b188d457 100644
--- a/ACE/ace/OS_NS_time.cpp
+++ b/ACE/ace/OS_NS_time.cpp
@@ -253,11 +253,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res)
   FileTimeToSystemTime (&localtime, &systime);
 
   res->tm_hour = systime.wHour;
-
-  if(pTz.DaylightBias!=0)
-    res->tm_isdst = 1;
-  else
-    res->tm_isdst = 1;
+  res->tm_isdst = pTz.DaylightBias != 0;
 
    int iLeap;
    iLeap = (res->tm_year % 4 == 0 && (res->tm_year% 100 != 0 || res->tm_year % 400 == 0));
diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp
index 7384dcc6332..2f31e82288e 100644
--- a/ACE/ace/Pipe.cpp
+++ b/ACE/ace/Pipe.cpp
@@ -98,11 +98,13 @@ ACE_Pipe::open (int buffer_size)
     result = -1;
   else
     {
-      ACE_INET_Addr sv_addr (my_addr.get_port_number (),
-                             ACE_LOCALHOST);
-
+      ACE_INET_Addr sv_addr;
+      if (sv_addr.set (my_addr.get_port_number (), ACE_LOCALHOST) == -1)
+        {
+          result == -1;
+        }
       // Establish a connection within the same process.
-      if (connector.connect (writer, sv_addr) == -1)
+      else if (connector.connect (writer, sv_addr) == -1)
         result = -1;
       else if (acceptor.accept (reader) == -1)
         {
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index ed29ffd5c5a..a1921102960 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -407,8 +407,8 @@ ACE_Process::spawn (ACE_Process_Options &options)
 # endif /* ACE_LACKS_SETPGID */
 
 # if !defined (ACE_LACKS_SETREGID)
-      if (options.getrgid () != (uid_t) -1
-          || options.getegid () != (uid_t) -1)
+      if (options.getrgid () != (gid_t) -1
+          || options.getegid () != (gid_t) -1)
         if (ACE_OS::setregid (options.getrgid (),
                               options.getegid ()) == -1)
           {
@@ -836,8 +836,8 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
     stderr_ (ACE_INVALID_HANDLE),
     ruid_ ((uid_t) -1),
     euid_ ((uid_t) -1),
-    rgid_ ((uid_t) -1),
-    egid_ ((uid_t) -1),
+    rgid_ ((gid_t) -1),
+    egid_ ((gid_t) -1),
 #endif /* ACE_WIN32 */
     handle_inheritance_ (true),
     set_handles_called_ (0),
@@ -1041,14 +1041,9 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
   ACE_NEW_RETURN (newformat, ACE_TCHAR[buflen], -1);
   ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_newformat (newformat);
 
-# if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-  const ACE_TCHAR *fmt = ACE_TEXT ("%ls=%ls");
-# else
-  const ACE_TCHAR *fmt = ACE_TEXT ("%s=%s");
-# endif
-
   // Add in the variable name.
-  ACE_OS::snprintf (safe_newformat.get (), buflen, fmt,
+  ACE_OS::snprintf (safe_newformat.get (), buflen,
+                    ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT ("=%") ACE_TEXT_PRIs,
                     variable_name, format);
 
   // Add the rest of the varargs.
diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h
index 1465103ef63..fc6b1af745d 100644
--- a/ACE/ace/Process.h
+++ b/ACE/ace/Process.h
@@ -347,12 +347,12 @@ public:
   int setreugid (const ACE_TCHAR* user);
   void setruid (uid_t id);
   void seteuid (uid_t id);
-  void setrgid (uid_t id);
-  void setegid (uid_t id);
+  void setrgid (gid_t id);
+  void setegid (gid_t id);
   uid_t getruid (void) const;
   uid_t geteuid (void) const;
-  uid_t getrgid (void) const;
-  uid_t getegid (void) const;
+  gid_t getrgid () const;
+  gid_t getegid () const;
 
   /**
    * Get the inherit_environment flag.
@@ -418,8 +418,8 @@ protected:
   //   These should be set to -1 to leave unchanged (default).
   uid_t ruid_;
   uid_t euid_;
-  uid_t rgid_;
-  uid_t egid_;
+  gid_t rgid_;
+  gid_t egid_;
 #endif /* ACE_WIN32 */
 
   /// Default true.
diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl
index 66241f43661..3617c292d83 100644
--- a/ACE/ace/Process.inl
+++ b/ACE/ace/Process.inl
@@ -291,13 +291,13 @@ ACE_Process_Options::seteuid (uid_t id)
 }
 
 ACE_INLINE void
-ACE_Process_Options::setrgid (uid_t id)
+ACE_Process_Options::setrgid (gid_t id)
 {
   this->rgid_ = id;
 }
 
 ACE_INLINE void
-ACE_Process_Options::setegid (uid_t id)
+ACE_Process_Options::setegid (gid_t id)
 {
   this->egid_ = id;
 }
@@ -314,13 +314,13 @@ ACE_Process_Options::geteuid (void) const
   return this->euid_;
 }
 
-ACE_INLINE uid_t
+ACE_INLINE gid_t
 ACE_Process_Options::getrgid (void) const
 {
   return this->rgid_;
 }
 
-ACE_INLINE uid_t
+ACE_INLINE gid_t
 ACE_Process_Options::getegid (void) const
 {
   return this->egid_;
diff --git a/ACE/ace/QoS/ACE_QoS.rc b/ACE/ace/QoS/ACE_QoS.rc
new file mode 100644
index 00000000000..421855dc8ba
--- /dev/null
+++ b/ACE/ace/QoS/ACE_QoS.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACE_QoS\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACE_QoSDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACE_QoS.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/ace/SSL/ACE_SSL.rc b/ACE/ace/SSL/ACE_SSL.rc
new file mode 100644
index 00000000000..82a7c08eb3b
--- /dev/null
+++ b/ACE/ace/SSL/ACE_SSL.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACE_SSL\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACE_SSLDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACE_SSL.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h
index d3097d54439..203a7ad1ded 100644
--- a/ACE/ace/TSS_T.h
+++ b/ACE/ace/TSS_T.h
@@ -237,11 +237,11 @@ public:
 
   /// TYPE conversion.  Inlined here so that it should _always_ be
   /// inlined.
-  operator TYPE () const { return value_; };
+  operator TYPE () const { return value_; }
 
   /// TYPE & conversion.  Inlined here so that it should _always_ be
   /// inlined.
-  operator TYPE &() { return value_; };
+  operator TYPE &() { return value_; }
 
 private:
   /// The wrapped value.
diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h
index 7afc673328b..37197c1c968 100644
--- a/ACE/ace/ace_wchar.h
+++ b/ACE/ace/ace_wchar.h
@@ -94,6 +94,11 @@ typedef char ACE_ANTI_TCHAR;
 # define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep ()
 # define ACE_TEXT_WCHAR_TO_TCHAR(STRING) STRING
 # define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep ()
+# if !defined (ACE_WIN32)
+#   define ACE_TEXT_PRIs ACE_TEXT("ls")
+# else
+#   define ACE_TEXT_PRIs ACE_TEXT("s")
+# endif
 #else /* ACE_USES_WCHAR */
 typedef char ACE_TCHAR;
 typedef wchar_t ACE_ANTI_TCHAR;
@@ -103,6 +108,7 @@ typedef wchar_t ACE_ANTI_TCHAR;
 # define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING
 # define ACE_TEXT_WCHAR_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep ()
 # define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep ()
+# define ACE_TEXT_PRIs ACE_TEXT("s")
 #endif /* ACE_USES_WCHAR */
 
 // The OS_String module defines some wide-char functions that are not
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index a4c945249e4..219f549a20d 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -31,17 +31,25 @@
 #  define ACE_HAS_NEW_NOTHROW
 #endif /* __GNUC__ >= 3.3 */
 
-#if __cplusplus >= 201103L
-# define ACE_HAS_CPP11
-#endif
-#if __cplusplus >= 201402L
-# define ACE_HAS_CPP14
+#if __cplusplus >= 202002L
+# define ACE_HAS_CPP20
 #endif
 #if __cplusplus >= 201703L
 # define ACE_HAS_CPP17
+# define ACE_FALLTHROUGH [[fallthrough]]
 #endif
-#if __cplusplus >= 202002L
-# define ACE_HAS_CPP20
+#if __cplusplus >= 201402L
+# define ACE_HAS_CPP14
+#endif
+#if __cplusplus >= 201103L
+# define ACE_HAS_CPP11
+# if !defined (ACE_FALLTHROUGH)
+#  if __GNUC__ >= 7
+#   define ACE_FALLTHROUGH [[gnu::fallthrough]]
+#  else
+#   define ACE_FALLTHROUGH
+#  endif
+# endif
 #endif
 
 #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
diff --git a/ACE/apps/mkcsregdb/mkcsregdb.cpp b/ACE/apps/mkcsregdb/mkcsregdb.cpp
index bb6c427d0d2..afc194e3eb9 100644
--- a/ACE/apps/mkcsregdb/mkcsregdb.cpp
+++ b/ACE/apps/mkcsregdb/mkcsregdb.cpp
@@ -248,7 +248,6 @@ csdb_generator::init_output (const char *srcfile)
                       -1);
   outf_ = ACE_OS::fdopen (fd, "w");
 
-  ACE_OS::fprintf (outf_,"// $ID: $\n");
   ACE_OS::fprintf (outf_,"/*\n * Codeset registry DB, generated %s * source: %s\n",
                    ACE_OS::asctime (ACE_OS::localtime(&now)),
                    srcfile);
@@ -258,7 +257,7 @@ csdb_generator::init_output (const char *srcfile)
   ACE_OS::fprintf (outf_," * a text file containing all the desired codeset information, build and run\n");
   ACE_OS::fprintf (outf_," * mkcsregdb. The source is in $ACE_ROOT/apps/mkcsregdb. It will generate a new\n");
   ACE_OS::fprintf (outf_," * copy of this file, with the registry_db_ array properly initialized.\n */\n");
-  ACE_OS::fprintf (outf_,"\n#include \"ace/Codeset_Registry.h\"\n\n%s\n%s\n{\n",
+  ACE_OS::fprintf (outf_,"\n#include \"ace/Codeset_Registry.h\"\n\nACE_BEGIN_VERSIONED_NAMESPACE_DECL\n\n%s\n%s\n{\n",
                    "ACE_Codeset_Registry::registry_entry const",
                    "ACE_Codeset_Registry::registry_db_[] =");
   return 0;
@@ -302,7 +301,7 @@ csdb_generator::fini_output (const char *tgt)
   ACE_OS::sprintf (target,"%s/ace/%s",ace_src_,tgt);
   if (count_ == 0)
     write_dummy_entry();
-  ACE_OS::fprintf (outf_,"\n};\n\nsize_t const ACE_Codeset_Registry::num_registry_entries_ = %d;\n\n",count_);
+  ACE_OS::fprintf (outf_,"\n};\n\nsize_t const ACE_Codeset_Registry::num_registry_entries_ = %d;\n\nACE_END_VERSIONED_NAMESPACE_DECL\n",count_);
   ACE_OS::fclose (outf_);
   ACE_stat buf;
   if (ACE_OS::stat (target,&buf) == 0)
diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html
index 26d1b6062c2..45bd3672ab4 100644
--- a/ACE/docs/ACE-guidelines.html
+++ b/ACE/docs/ACE-guidelines.html
@@ -830,6 +830,14 @@ Foo::bar ()
      <li>Do not use the Win32 <code>TCHAR</code> macros.  The wide character-ness of ACE
          is separate from UNICODE and _UNICODE.
 
+     <li>If you have a <code>printf</code>-like format specifier that
+         uses <code>%s</code> to format a string, certain WCHAR implementations
+         require <code>%ls</code> instead.
+         The macro <code>ACE_TEXT_PRIs</code> contains <code>"s"</code> or <code>"ls"</code>
+         depending upon the WCHAR implementation, and may be used as
+         <code>ACE_TEXT("%") ACE_TEXT_PRI_s</code>, where the first argument may also
+         contain flags and width specifiers.
+
      <li>For TAO, don't use <code>ACE_TCHAR</code> or <code>ACE_TEXT</code>.  The CORBA specification
          defines APIs as using char.  So most of the time there is no need
          to use wide characters.
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
index 8a74e8039b4..3cafe8d1149 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
@@ -125,11 +125,6 @@ Consumer_Router::put (ACE_Message_Block *mb,
 }
 
 // Return information about the <Consumer_Router>.
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-#  define FMTSTR  ACE_TEXT ("%s\t %d/%s %s (%s)\n")
-#else
-#  define FMTSTR  ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n")
-#endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
 int
 Consumer_Router::info (ACE_TCHAR **strp, size_t length) const
@@ -142,7 +137,11 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const
     return -1;
 
   ACE_OS::sprintf (buf,
-                   FMTSTR,
+                   ACE_TEXT ("%") ACE_TEXT_PRIs
+                   ACE_TEXT ("\t %d/%") ACE_TEXT_PRIs
+                   ACE_TEXT (" %") ACE_TEXT_PRIs
+                   ACE_TEXT (" (%") ACE_TEXT_PRIs
+                   ACE_TEXT (")\n"),
                    module_name,
                    addr.get_port_number (),
                    ACE_TEXT ("tcp"),
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
index 81e20cfc3c7..68ac0b56e6c 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
@@ -131,11 +131,6 @@ Supplier_Router::put (ACE_Message_Block *mb,
 }
 
 // Return information about the <Supplier_Router>.
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-#  define FMTSTR  ACE_TEXT ("%s\t %d/%s %s (%s)\n")
-#else
-#  define FMTSTR  ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n")
-#endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 
 int
 Supplier_Router::info (ACE_TCHAR **strp, size_t length) const
@@ -148,7 +143,11 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const
     return -1;
 
   ACE_OS::sprintf (buf,
-                   FMTSTR,
+                   ACE_TEXT ("%") ACE_TEXT_PRIs
+                   ACE_TEXT ("\t %d/%") ACE_TEXT_PRIs
+                   ACE_TEXT (" %") ACE_TEXT_PRIs
+                   ACE_TEXT (" (%") ACE_TEXT_PRIs
+                   ACE_TEXT (")\n"),
                    module_name,
                    addr.get_port_number (),
                    ACE_TEXT ("tcp"),
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
index 153fbd557e4..75755e7d538 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
@@ -117,13 +117,10 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const
   if (sa.get_local_addr (addr) == -1)
     return -1;
 
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-# define FMTSTR ACE_TEXT ("%ls\t %ls/ %ls")
-#else
-# define FMTSTR ACE_TEXT ("%s\t %s/ %s")
-#endif
-
-  ACE_OS::sprintf (buf, FMTSTR,
+  ACE_OS::sprintf (buf,
+                   ACE_TEXT ("%") ACE_TEXT_PRIs
+                   ACE_TEXT ("\t %") ACE_TEXT_PRIs
+                   ACE_TEXT ("/ %") ACE_TEXT_PRIs,
                    module_name, ACE_TEXT ("upipe"),
                    ACE_TEXT ("# consumer router\n"));
 
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
index f372147bf67..9eaa54699a4 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
@@ -116,13 +116,10 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const
   if (sa.get_local_addr (addr) == -1)
     return -1;
 
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-# define FMTSTR ACE_TEXT ("%ls\t %ls/ %ls")
-#else
-# define FMTSTR ACE_TEXT ("%s\t %s/ %s")
-#endif
-
-  ACE_OS::sprintf (buf, FMTSTR,
+  ACE_OS::sprintf (buf,
+                   ACE_TEXT ("%") ACE_TEXT_PRIs
+                   ACE_TEXT ("\t %") ACE_TEXT_PRIs
+                   ACE_TEXT ("/ %") ACE_TEXT_PRIs,
                    module_name, ACE_TEXT ("upipe"),
                    ACE_TEXT ("# supplier router\n"));
 
diff --git a/ACE/examples/OS/Process/imore.cpp b/ACE/examples/OS/Process/imore.cpp
index 827e7ec4ccb..7ed44665763 100644
--- a/ACE/examples/OS/Process/imore.cpp
+++ b/ACE/examples/OS/Process/imore.cpp
@@ -241,7 +241,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ACE_ERROR_RETURN ((LM_ERROR, "Error, bailing out!\n"), -1);
     }
 
-  options.command_line (executable);
+  options.command_line (ACE_TEXT("%") ACE_TEXT_PRIs, executable);
   if (new_process.spawn (options) == -1)
     {
       int const error_number = ACE_OS::last_error ();
@@ -261,7 +261,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   // if your child process don't need to interact with the terminal,
   // we can use the exact code for Unixes on NT.
   ACE_Process_Options options;
-  options.command_line (executable);
+  options.command_line (ACE_TEXT("%") ACE_TEXT_PRIs, executable);
   options.set_handles (infile);
   if (new_process.spawn (options) == -1)
     {
diff --git a/ACE/examples/OS/Process/process.cpp b/ACE/examples/OS/Process/process.cpp
index 17e27597fa4..369e7b34f2c 100644
--- a/ACE/examples/OS/Process/process.cpp
+++ b/ACE/examples/OS/Process/process.cpp
@@ -125,7 +125,7 @@ test_more (void)
 
   ACE_Process new_process;
   ACE_Process_Options options;
-  options.command_line (executable);
+  options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs, executable);
   options.set_handles (infile);
 
   if (new_process.spawn (options) == -1)
@@ -154,7 +154,7 @@ static void
 test_date (void)
 {
   ACE_Process_Options options;
-  options.command_line (DATE_PATH);
+  options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs, DATE_PATH);
 
   // Try to create a new process running date.
   ACE_Process new_process;
@@ -181,11 +181,7 @@ static void
 test_ls (void)
 {
   ACE_Process_Options options;
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-  options.command_line (ACE_TEXT ("%s -al"), LS_PATH);
-#else
-  options.command_line (ACE_TEXT ("%ls -al"), LS_PATH);
-#endif
+  options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -al"), LS_PATH);
   ACE_Process new_process;
   if (new_process.spawn (options) == -1)
     {
@@ -207,11 +203,7 @@ static void
 test_wait (void)
 {
   ACE_Process_Options options;
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-  options.command_line (ACE_TEXT ("%s 10"), SLEEP_PATH);
-#else
-  options.command_line (ACE_TEXT ("%ls 10"), SLEEP_PATH);
-#endif
+  options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" 10"), SLEEP_PATH);
   ACE_Process process1;
   if (process1.spawn (options) == -1)
     {
@@ -466,11 +458,7 @@ test_setenv (const ACE_TCHAR *argv0)
   options.setenv (ACE_TEXT ("ACE_PROCESS_TEST= here's a large number %u"),
                   0 - 1);
   options.setenv (ACE_TEXT ("ACE_PROCESS_TEST2"), ACE_TEXT ("ophilli"));
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-  options.command_line ("%s -g", argv0);
-#else
-  options.command_line ("%ls -g", argv0);
-#endif
+  options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -g"), argv0);
   ACE_Process process;
   if (process.spawn (options) == -1)
     {
@@ -522,13 +510,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   if (run_all)
     {
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-      const ACE_TCHAR *cmdline = ACE_TEXT ("%s -d -l -s -w");
-#else
-      const ACE_TCHAR *cmdline = ACE_TEXT ("%ls -d -l -s -w");
-#endif
       ACE_Process_Options options;
-      options.command_line (cmdline, argv[0]);
+      options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -d -l -s -w"), argv[0]);
       ACE_Process process;
       if (process.spawn (options) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/ACE/protocols/ace/HTBP/HTBP.rc b/ACE/protocols/ace/HTBP/HTBP.rc
new file mode 100644
index 00000000000..7a0673ffbc8
--- /dev/null
+++ b/ACE/protocols/ace/HTBP/HTBP.rc
@@ -0,0 +1,30 @@
+#include "../../../ace/Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACE_HTBP\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACE_HTBPDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACE_HTBP.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/protocols/ace/INet/INet.rc b/ACE/protocols/ace/INet/INet.rc
new file mode 100644
index 00000000000..dfa4476f0f7
--- /dev/null
+++ b/ACE/protocols/ace/INet/INet.rc
@@ -0,0 +1,30 @@
+#include "../../../ace/Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACE_INet\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACE_INetDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACE_INet.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/protocols/ace/RMCast/RMCast.rc b/ACE/protocols/ace/RMCast/RMCast.rc
new file mode 100644
index 00000000000..8f7581ff372
--- /dev/null
+++ b/ACE/protocols/ace/RMCast/RMCast.rc
@@ -0,0 +1,30 @@
+#include "../../../ace/Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACE_RMCast\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACE_RMCastDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACE_RMCast.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/protocols/ace/TMCast/TMCast.rc b/ACE/protocols/ace/TMCast/TMCast.rc
new file mode 100644
index 00000000000..a3c8b8f17a3
--- /dev/null
+++ b/ACE/protocols/ace/TMCast/TMCast.rc
@@ -0,0 +1,30 @@
+#include "../../../ace/Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "ACE_TMCast\0"
+            VALUE "FileVersion", ACE_VERSION "\0"
+            VALUE "InternalName", "ACE_TMCastDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ACE_TMCast.DLL\0"
+            VALUE "ProductName", "ACE\0"
+            VALUE "ProductVersion", ACE_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/ACE/tests/MEM_Stream_Test.cpp b/ACE/tests/MEM_Stream_Test.cpp
index 0819d766df4..940e0dd4088 100644
--- a/ACE/tests/MEM_Stream_Test.cpp
+++ b/ACE/tests/MEM_Stream_Test.cpp
@@ -281,12 +281,7 @@ test_reactive (const ACE_TCHAR *prog,
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n ()")));
 #else
   ACE_Process_Options opts;
-#  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-  const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%s -p%d -r");
-#  else
-  const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%ls -p%d -r");
-#  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
-  opts.command_line (cmdline_fmt, prog, sport);
+  opts.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -p%d -r"), prog, sport);
   if (ACE_Process_Manager::instance ()->spawn_n (NUMBER_OF_REACTIVE_CONNECTIONS,
                                                  opts) == -1)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n ()")));
@@ -372,12 +367,7 @@ test_concurrent (const ACE_TCHAR *prog,
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n()")));
 #else
   ACE_Process_Options opts;
-#  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-  const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%s -p%d -m");
-#  else
-  const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%ls -p%d -m");
-#  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
-  opts.command_line (cmdline_fmt, prog, sport);
+  opts.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -p%d -m"), prog, sport);
   if (ACE_Process_Manager::instance ()->spawn_n (NUMBER_OF_MT_CONNECTIONS,
                                                  opts) == -1)
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n()")));
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index 02b6854d416..d8bd50fe7f4 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -358,12 +358,10 @@ run_main (int argc, ACE_TCHAR *argv[])
       // No arguments means we're the parent process.
       ACE_Process_Options options (1);
 
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-      static const ACE_TCHAR* format = ACE_TEXT ("%ls%ls%ls");
-#else
-      static const ACE_TCHAR* format = ACE_TEXT ("%s%s%s");
-#endif /* !ACE_WIN32 && ACE_USES_WCHAR */
-      options.command_line (format, EXE_LOCATION,
+      options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs
+                            ACE_TEXT ("%") ACE_TEXT_PRIs
+                            ACE_TEXT ("%") ACE_TEXT_PRIs,
+                            EXE_LOCATION,
                             argc > 0 ? argv[0] : ACE_TEXT ("Malloc_Test"),
                             ACE_TEXT (" run_as_test"));
 
diff --git a/ACE/tests/Naming_Test.cpp b/ACE/tests/Naming_Test.cpp
index 42a825ed381..c171a74aa70 100644
--- a/ACE/tests/Naming_Test.cpp
+++ b/ACE/tests/Naming_Test.cpp
@@ -259,11 +259,7 @@ run_main (int argc, ACE_TCHAR *argv[])
         }
       // Set the database name using the pid. mktemp isn't always available.
       ACE_OS::snprintf(temp_file, BUFSIZ,
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-                       ACE_TEXT ("%ls%d"),
-#else
-                       ACE_TEXT ("%s%d"),
-#endif
+                       ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT ("%d"),
                        pname,
                        (int)(ACE_OS::getpid ()));
 
diff --git a/ACE/tests/Pipe_Test.cpp b/ACE/tests/Pipe_Test.cpp
index b98d33d37e3..026619e1be1 100644
--- a/ACE/tests/Pipe_Test.cpp
+++ b/ACE/tests/Pipe_Test.cpp
@@ -113,14 +113,10 @@ run_main (int argc, ACE_TCHAR *argv[])
       ACE_START_TEST (ACE_TEXT("Pipe_Test"));
       ACE_INIT_LOG (ACE_TEXT("Pipe_Test-children"));
 
-#  if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-      const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%s -c%s");
-#  else
-      const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%ls -c%ls");
-#  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
       ACE_Process_Options options;
 #  ifndef ACE_LACKS_VA_FUNCTIONS
-      options.command_line (cmdline_fmt,
+      options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs
+                            ACE_TEXT (" -c%") ACE_TEXT_PRIs,
                             argc > 0 ? argv[0] : ACE_TEXT ("Pipe_Test"),
                             close_pipe == 0 ? ACE_TEXT (" -d") : ACE_TEXT (""));
 #  else
diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp
index d08152588d6..334c8c1e751 100644
--- a/ACE/tests/Process_Manager_Test.cpp
+++ b/ACE/tests/Process_Manager_Test.cpp
@@ -241,7 +241,7 @@ command_line_test (void)
   ACE_Process_Options options (1, command_len + 1);
 
 #ifndef ACE_LACKS_VA_FUNCTIONS
-  options.command_line (command);
+  options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs, command);
 #endif
 
   ACE_TCHAR * const *procargv = options.command_line_argv ();
diff --git a/ACE/tests/Process_Mutex_Test.cpp b/ACE/tests/Process_Mutex_Test.cpp
index 74d9aa65663..82beb03f78b 100644
--- a/ACE/tests/Process_Mutex_Test.cpp
+++ b/ACE/tests/Process_Mutex_Test.cpp
@@ -146,18 +146,14 @@ run_main (int argc, ACE_TCHAR *argv[])
       ACE_Process_Mutex mutex( mutex_name );
 #     endif
 
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-      static const ACE_TCHAR* format = ACE_TEXT ("%ls -c -n %ls%ls");
-#else
-      static const ACE_TCHAR* format = ACE_TEXT ("%s -c -n %s%s");
-#endif /* !ACE_WIN32 && ACE_USES_WCHAR */
       ACE_Process_Options options;
 
 #ifndef ACE_LACKS_VA_FUNCTIONS
-      options.command_line (format, argc > 0 ? argv[0] : ACE_TEXT ("Process_Mutex_Test"), mutex_name,
+      options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs
+                            ACE_TEXT (" -c -n %") ACE_TEXT_PRIs
+                            ACE_TEXT ("%") ACE_TEXT_PRIs,
+                            argc > 0 ? argv[0] : ACE_TEXT ("Process_Mutex_Test"), mutex_name,
                             release_mutex == 0 ? ACE_TEXT (" -d") : ACE_TEXT (""));
-#else
-      ACE_UNUSED_ARG (format);
 #endif
 
 #ifdef ACE_HAS_PROCESS_SPAWN
diff --git a/ACE/tests/Process_Test.cpp b/ACE/tests/Process_Test.cpp
index 328702994b5..444f879ab1d 100644
--- a/ACE/tests/Process_Test.cpp
+++ b/ACE/tests/Process_Test.cpp
@@ -34,13 +34,7 @@ test_setenv (void)
     ACE_OS::strcat (bigval,
                     ACE_TEXT ("01234567890123456789012345678901234567890123456789"));
 #ifndef ACE_LACKS_VA_FUNCTIONS
-# if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-  const ACE_TCHAR *fmt = ACE_TEXT ("%ls");
-# else
-  const ACE_TCHAR *fmt = ACE_TEXT ("%s");
-# endif
-
-  if (0 != opts.setenv (ACE_TEXT ("A"), fmt, bigval))
+  if (0 != opts.setenv (ACE_TEXT ("A"), ACE_TEXT ("%") ACE_TEXT_PRIs, bigval))
     {
       status = errno;
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("setenv")));
diff --git a/ACE/tests/RW_Process_Mutex_Test.cpp b/ACE/tests/RW_Process_Mutex_Test.cpp
index 7c84597df70..960bdae1468 100644
--- a/ACE/tests/RW_Process_Mutex_Test.cpp
+++ b/ACE/tests/RW_Process_Mutex_Test.cpp
@@ -431,11 +431,6 @@ run_main (int argc, ACE_TCHAR *argv[])
                       mutex_name.c_str (),
                       ACE_TEXT ("ctor")));
         }
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-      static const ACE_TCHAR* format = ACE_TEXT ("%ls -c %d -p %u -n %ls");
-#else
-      static const ACE_TCHAR* format = ACE_TEXT ("%s -c %d -p %u -n %s");
-#endif /* !ACE_WIN32 && ACE_USES_WCHAR */
 
       // The parent process reads time ranges sent from the children via
       // UDP. Grab an unused UDP port to tell the children to send to.
@@ -462,13 +457,12 @@ run_main (int argc, ACE_TCHAR *argv[])
           Child *child = (i == 0 ? &writer : &readers[i-1]);
           ACE_Process_Options options;
 #ifndef ACE_LACKS_VA_FUNCTIONS
-          options.command_line (format,
+          options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs
+                                ACE_TEXT (" -c %d -p %u -n %") ACE_TEXT_PRIs,
                                 argc > 0 ? argv[0] : ACE_TEXT ("RW_Process_Mutex_Test"),
                                 i,
                                 (unsigned int)me.get_port_number (),
                                 mutex_name.c_str ());
-#else
-          ACE_UNUSED_ARG (format);
 #endif
           if (child->spawn (options) == -1)
             {
diff --git a/ACE/tests/Time_Service_Test.cpp b/ACE/tests/Time_Service_Test.cpp
index f8350526b36..295d784f5f9 100644
--- a/ACE/tests/Time_Service_Test.cpp
+++ b/ACE/tests/Time_Service_Test.cpp
@@ -65,7 +65,7 @@ run_main (int, ACE_TCHAR *[])
   const ACE_TCHAR *server_cl = APPLICATION ACE_TEXT ("server.conf");
   ACE_Process_Options server_options;
 #ifndef ACE_LACKS_VA_FUNCTIONS
-  server_options.command_line (server_cl);
+  server_options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs, server_cl);
 #endif
   ACE_Process server;
 
@@ -85,7 +85,7 @@ run_main (int, ACE_TCHAR *[])
   const ACE_TCHAR *clerk_cl = APPLICATION ACE_TEXT ("clerk.conf");
   ACE_Process_Options clerk_options;
 #ifndef ACE_LACKS_VA_FUNCTIONS
-  clerk_options.command_line (clerk_cl);
+  clerk_options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs, clerk_cl);
 #endif
   ACE_Process clerk;
 
diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h
index e606f048a21..79b21ec8099 100644
--- a/ACE/tests/test_config.h
+++ b/ACE/tests/test_config.h
@@ -149,14 +149,12 @@ size_t const ACE_MAX_THREADS = 4;
     }
 
 #else /* ! VXWORKS */
-#  if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-#    define ACE_INIT_LOG_FMT ACE_TEXT ("%ls%ls%ls")
-#  else
-#    define ACE_INIT_LOG_FMT ACE_TEXT ("%s%s%s")
-#  endif /* !ACE_WIN32 && ACE_USES_WCHAR */
 #define ACE_INIT_LOG(NAME) \
   ACE_TCHAR temp[MAXPATHLEN]; \
-  ACE_OS::sprintf (temp, ACE_INIT_LOG_FMT, \
+  ACE_OS::sprintf (temp, \
+                   ACE_TEXT ("%") ACE_TEXT_PRIs \
+                   ACE_TEXT ("%") ACE_TEXT_PRIs \
+                   ACE_TEXT ("%") ACE_TEXT_PRIs, \
                    ACE_LOG_DIRECTORY, \
                    ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR), \
                    ACE_LOG_FILE_EXT_NAME); \
diff --git a/ACE/websvcs/lib/URL_Addr.cpp b/ACE/websvcs/lib/URL_Addr.cpp
index 7439bdd4f7d..325dd4ae423 100644
--- a/ACE/websvcs/lib/URL_Addr.cpp
+++ b/ACE/websvcs/lib/URL_Addr.cpp
@@ -41,16 +41,6 @@ static size_t tn3270_size = sizeof(tn3270)/sizeof(tn3270[0]) - 1;
 static ACE_TCHAR gopher[] = ACE_TEXT ("gopher:");
 static size_t gopher_size = sizeof(gopher)/sizeof(gopher[0]) - 1;
 
-// When assembling URLs, sprintf() is often used. The format specifier for
-// a string changes depending on the platform and char width being fed to it.
-// Since we use ACE_TCHAR for strings, and it changes with the char width,
-// the printf specifier needs to change with the platform.
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-#  define ACE_PRINTF_S ACE_TEXT ("%s")
-#else
-#  define ACE_PRINTF_S ACE_TEXT ("%ls")
-#endif
-
 ACE_URL_Addr::ACE_URL_Addr (void)
   : url_ (0)
 {
@@ -531,11 +521,11 @@ ACE_HTTP_Addr::addr_to_string (ACE_TCHAR *buffer,
   if (flags == 0)
     {
       ACE_INET_Addr inet = this->get_inet_address ();
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, inet.get_host_addr ());
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, inet.get_host_addr ());
     }
   else
     {
-     n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->hostname_);
+     n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, this->hostname_);
     }
 
   if (this->port_number_ != ACE_DEFAULT_HTTP_PORT)
@@ -545,13 +535,13 @@ ACE_HTTP_Addr::addr_to_string (ACE_TCHAR *buffer,
   if (this->path_ != 0)
     {
       n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT ("/") ACE_PRINTF_S,
+                            ACE_TEXT ("/%") ACE_TEXT_PRIs,
                             this->path_);
     }
   if (this->query_ != 0)
     {
       n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT ("?") ACE_PRINTF_S,
+                            ACE_TEXT ("?%") ACE_TEXT_PRIs,
                             this->query_);
     }
   return 0;
@@ -704,12 +694,12 @@ ACE_FTP_Addr::addr_to_string (ACE_TCHAR *buffer,
 
   if (this->user_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->user_);
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, this->user_);
     }
   if (this->password_ != 0)
     {
       n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT (":") ACE_PRINTF_S,
+                            ACE_TEXT (":%") ACE_TEXT_PRIs,
                             this->password_);
     }
 
@@ -721,16 +711,16 @@ ACE_FTP_Addr::addr_to_string (ACE_TCHAR *buffer,
   if (flags == 0)
     {
       ACE_INET_Addr inet = this->get_inet_address ();
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, inet.get_host_addr ());
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, inet.get_host_addr ());
     }
   else
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->hostname_);
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, this->hostname_);
     }
   if (this->path_ != 0)
     {
       n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT ("/") ACE_PRINTF_S,
+                            ACE_TEXT ("/%") ACE_TEXT_PRIs,
                             this->path_);
     }
   return 0;
@@ -915,12 +905,12 @@ ACE_Mailto_Addr::addr_to_string (ACE_TCHAR *buffer,
     return -1;
 
   size_t n = ACE_OS::sprintf (buffer,
-                              ACE_TEXT ("mailto:") ACE_PRINTF_S ACE_TEXT
-                              ("@") ACE_PRINTF_S,
+                              ACE_TEXT ("mailto:%") ACE_TEXT_PRIs
+                              ACE_TEXT ("@%") ACE_TEXT_PRIs,
                               this->user_, this->hostname_);
   if (this->headers_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("?") ACE_PRINTF_S,
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("?%") ACE_TEXT_PRIs,
                             this->headers_);
     }
 
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index 9ed972220fb..1a8ed76c9f9 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -1344,7 +1344,7 @@ AST_Decl::set_name (UTL_ScopedName *n)
 }
 
 Identifier *
-AST_Decl::local_name (void)
+AST_Decl::local_name () const
 {
   return this->pd_local_name;
 }
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 161f71115d9..8393eeb9a46 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -237,7 +237,7 @@ public:
 
   void set_name (UTL_ScopedName *n);
 
-  Identifier *local_name (void);
+  Identifier *local_name () const;
   void local_name (Identifier *id);
 
   Identifier *compute_local_name (const char *prefix,
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
index 9489421c04f..8b8f0a4fd78 100644
--- a/TAO/TAO_IDL/include/utl_string.h
+++ b/TAO/TAO_IDL/include/utl_string.h
@@ -93,7 +93,7 @@ public:
   virtual void dump (ACE_OSTREAM_TYPE &o);
   // Dump to the ostream.
 
-  char *get_string (void) {return this->p_str;}
+  char *get_string () const {return this->p_str;}
   // Get contents of utl_string.
 
   char *get_canonical_rep (void);
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index aeb2d6bfb1c..ff81d3bc106 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -103,7 +103,8 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   const int ENV_BUF_LEN = 512;
   ACE_TCHAR buf[ENV_BUF_LEN];
   server_addr.addr_to_string(buf,ENV_BUF_LEN,0);
-  options.setenv(ACE_TEXT("EventChannelFactoryAddr"), buf);
+  options.setenv(ACE_TEXT("EventChannelFactoryAddr"),
+                 ACE_TEXT("%") ACE_TEXT_PRIs, buf);
 
   // extract the object ID from the criteria
   for (CORBA::ULong i = 0; i < the_criteria.length(); ++i)
@@ -114,7 +115,8 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
       const char* id_str = name[0].id.in();
       the_criteria[i].val >>= val;
       if (id_str[0] != '-') // environment variable
-        options.setenv(ACE_TEXT_CHAR_TO_TCHAR(id_str), ACE_TEXT("%s"), val);
+        options.setenv(ACE_TEXT_CHAR_TO_TCHAR(id_str),
+                       ACE_TEXT("%") ACE_TEXT_PRIs, val);
       else {// command line option
         ACE_OS::sprintf(buf, ACE_TEXT(" %s %s"), id_str, val);
         str += buf;
@@ -124,7 +126,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
 
   ORBSVCS_DEBUG((LM_DEBUG, "Command Line : %s\n", str.c_str()));
 
-  options.command_line(str.c_str());
+  options.command_line(ACE_TEXT("%") ACE_TEXT_PRIs, str.c_str());
 
   // Try to create a new process running date.
   ACE_Process new_process;
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index ab2e06d5c0f..8551aad3601 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -537,7 +537,7 @@ ImR_Activator_i::start_server(const char* name,
                                  1,
                                  cmdline_buf_len + 1,
                                  this->env_buf_len_, this->max_env_vars_);
-  proc_opts.command_line (ACE_TEXT_CHAR_TO_TCHAR(cmdline));
+  proc_opts.command_line (ACE_TEXT("%") ACE_TEXT_PRIs, ACE_TEXT_CHAR_TO_TCHAR(cmdline));
   proc_opts.working_directory (dir);
   // Win32 does not support the CLOSE_ON_EXEC semantics for sockets
   // the way unix does, so in order to avoid having the child process
@@ -564,13 +564,13 @@ ImR_Activator_i::start_server(const char* name,
     {
       CORBA::String_var ior = orb_->object_to_string (locator_.in ());
       proc_opts.setenv (ACE_TEXT ("ImplRepoServiceIOR"),
-                        ACE_TEXT_CHAR_TO_TCHAR (ior.in ()));
+                        ACE_TEXT("%") ACE_TEXT_PRIs, ACE_TEXT_CHAR_TO_TCHAR (ior.in ()));
     }
 
   for (CORBA::ULong i = 0; i < env.length (); ++i)
     {
       proc_opts.setenv (ACE_TEXT_CHAR_TO_TCHAR (env[i].name.in ()),
-                        ACE_TEXT_CHAR_TO_TCHAR (env[i].value.in ()));
+                        ACE_TEXT("%") ACE_TEXT_PRIs, ACE_TEXT_CHAR_TO_TCHAR (env[i].value.in ()));
     }
 
   pid = this->process_mgr_.spawn (proc_opts, this);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
index 621833f7ec4..e7f36ffbf2e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
@@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_FTEC_Fault_Listener
 {
 public:
-  virtual ~TAO_FTEC_Fault_Listener(){};
+  virtual ~TAO_FTEC_Fault_Listener() {}
   virtual void connection_closed()=0;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index 80a774bfcd4..7ee05a895c7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -93,7 +93,7 @@ private:
   Interceptor_Destoryer();
   inline void do_it(void) {
     destroy_interceptors();
-  };
+  }
 };
 
 struct FTEC_Gateway_Impl
@@ -264,7 +264,6 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin()
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void)
 {
-
   FtRtecEventComm::ObjectId** remote_proxy_oid_ptr;
   ACE_NEW_THROW_EX(remote_proxy_oid_ptr, FtRtecEventComm::ObjectId*, CORBA::NO_MEMORY());
 
@@ -341,7 +340,6 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer (
   RtecEventComm::PushConsumer_ptr push_consumer,
   const RtecEventChannelAdmin::ConsumerQOS &qos)
 {
-
   FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
 
   *oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
index f60d6788010..f607d296d74 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
@@ -36,7 +36,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Timer : public TAO_Notify_Refcountable
 public:
   typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Timer > Ptr;
   /// Destructor
-  virtual ~TAO_Notify_Timer (){};
+  virtual ~TAO_Notify_Timer () {}
 
   /// Schedule a timer
   virtual long schedule_timer (ACE_Event_Handler *handler,
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 1190037fc93..95e2648cc07 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -235,7 +235,6 @@ ACE_Scheduler_Factory::server (void)
 }
 
 static char header[] =
-"// $Id $\n\n"
 "// This file was automatically generated by the Scheduler_Factory.\n"
 "// Before editing the file please consider generating it again.\n"
 "\n"
diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h
index d44559b8963..4bb8f2982ae 100644
--- a/TAO/orbsvcs/tests/HTIOP/test_config.h
+++ b/TAO/orbsvcs/tests/HTIOP/test_config.h
@@ -126,14 +126,12 @@ size_t const ACE_MAX_THREADS = 4;
     }
 
 #else /* ! VXWORKS */
-#  if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
-#    define ACE_INIT_LOG_FMT ACE_TEXT ("%ls%ls%ls")
-#  else
-#    define ACE_INIT_LOG_FMT ACE_TEXT ("%s%s%s")
-#  endif /* !ACE_WIN32 && ACE_USES_WCHAR */
 #define ACE_INIT_LOG(NAME) \
   ACE_TCHAR temp[MAXPATHLEN]; \
-  ACE_OS::sprintf (temp, ACE_INIT_LOG_FMT, \
+  ACE_OS::sprintf (temp, \
+                   ACE_TEXT ("%") ACE_TEXT_PRIs \
+                   ACE_TEXT ("%") ACE_TEXT_PRIs \
+                   ACE_TEXT ("%") ACE_TEXT_PRIs, \
                    ACE_LOG_DIRECTORY, \
                    ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR), \
                    ACE_LOG_FILE_EXT_NAME); \
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
index 7c9af9920c1..1921d9ea10d 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
@@ -1,30 +1,42 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+MIIDfTCCAmWgAwIBAgIUAJl4rVO3FCXlqUTipB/Q+uvt6OYwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGY2xpZW50MCAXDTIyMDkxNTEzNTU1
+MVoYDzIwNTAwMTMwMTM1NTUxWjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZjbGll
+bnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xU5YemdyBOfpmVIi
+LqNn7PXJBoJlR53M8ClzQKPhEieAmuvICH8l1/W1+PLspPFjZ+lu0s0xvRtvi5qF
+FM6J3/D9QbrKhMDdTFtMMZ5KE+DSxsjpL9ldJJ68ZdENYnzhck05F3gldK4MZXNc
+Kv8mH7ZMrUo/uOkEU+2q1QRxoynfzLEpJVlCGEctx7h4e/uTeaDf3rB4KaDOB9cz
+1QTx8EuYy/NeYr41xkVOkP3flR2vyxdYq6ETWY2duCViptbBNtcqdRCOJ7xeO7cI
+xVPW3CdGCY6t1tpKqjBeIfnF2gb/YmUVgHoG99hlHZq2Z5MjROFOKriexHjO7pbr
+ZIe7AgMBAAGjUzBRMB0GA1UdDgQWBBQwVMUpq/fwvG3ivOUmQZv78vwDojAfBgNV
+HSMEGDAWgBQwVMUpq/fwvG3ivOUmQZv78vwDojAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQAYMfP5PYjCMW+QSzeDGnSIlI72iSWWCWqfD4naaPxB
+yVwKzRjS8RqQby0XgqrpDdz1eUuqnOg+4fkQ5taly43tgevJcprKTD3LYvYkVisM
+Yim0yNB08X6oXrkr4Rmh65x2rG/1aWLm8/tMfVZQrT/48BP2vMIEITcpG4RYoZid
+3hxhFoFqdYINJ2aPcs1bid1AKIH3taO/LF11hvYafQGLd3M6xkuLhIJFNCYnbJjk
+nzdz8GVvqBGHQbfMO+1eRnnBT4uccX/twTZkdbEr908ZH3BVO4My226NblfR0Tod
+s2SmwCNGXzm4GVCNnqGBEtvkbOUwnYURZdhFA5WXkQdQ
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
index 1ac5a1ae820..a574db7b541 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
index 4debafe74d4..71984e28a51 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMIjTrAy7JyH8lWQ
-d6Qkhxe0fouwWk00/L0TlT289TjNI18lUTDNCrA7bu6mmOvIHrAK0803GdOmVRG0
-DgnuLkiTZ280LdoN43ukDQK0QYODY9iQQPEGEgNiI+tBd/cn05lGrssoTshjyT3Y
-BBQ9AuAUfMzWC1ti4GnWxCa6PoNxAgMBAAECgYBIbuv5CccGUCK2kgRRld9hlNJy
-RAYtMEvsL9ZLBqln3AIKid3VG2uVfVdSa446ypvIiwGjW5+jPDgZNtjWE6voeNCy
-gJNvxfJzADznzastxdivkLirBqGdFdNa73wL8bPgxun3WNe9owsHNtx+UhbEsmJ6
-ESCFcNThsk1gUoA5AQJBAPlVC1A7KbYAtTvEg5pcPwcLkE2as/ZkVMww3eYi18Gx
-qlH4/S2i5Bah8YneMImYuObjnPZMbaq4VFH6Ht/sgzkCQQDHVGWizrZGhmyXxhaL
-+1fSlnTNw/l6QEy5Cd4hbQp7yQrb+TRXZhje9zLS3MIWcdRU2MDGokHWiSF2ZJMj
-5On5AkBwzUsLB1k9oGBeI/AuW+Gf/FlS4tTcelPq9YjO36ChXxHheDaC+RkcLDQs
-3bsz5UZyHzQaMkXDYRW06OYjBMvxAkBriOB8AMDdM1AKYVdwlVw/w+Onzn4cseuy
-N9yac9UgCsnM+ph+PhpUz0+f6nDa4vYGABmgD5EtSDXBRWkMCEchAkAE6v3PKzOe
-ryn/BKaLX6Z0OTCVIcZWu40onGME40t8f7xCoF65611A6rmj/9KddZf8WCgmQLFJ
-GzcLNDmr4ccC
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3xU5YemdyBOfp
+mVIiLqNn7PXJBoJlR53M8ClzQKPhEieAmuvICH8l1/W1+PLspPFjZ+lu0s0xvRtv
+i5qFFM6J3/D9QbrKhMDdTFtMMZ5KE+DSxsjpL9ldJJ68ZdENYnzhck05F3gldK4M
+ZXNcKv8mH7ZMrUo/uOkEU+2q1QRxoynfzLEpJVlCGEctx7h4e/uTeaDf3rB4KaDO
+B9cz1QTx8EuYy/NeYr41xkVOkP3flR2vyxdYq6ETWY2duCViptbBNtcqdRCOJ7xe
+O7cIxVPW3CdGCY6t1tpKqjBeIfnF2gb/YmUVgHoG99hlHZq2Z5MjROFOKriexHjO
+7pbrZIe7AgMBAAECggEBAKs49ORPN+7uTz5Bklsy5SFBkUf5/qhq78Ywxg4SXh6o
+kZGrxp+b+wvBibhA+eYvUJF0EfUmB/Wd4uAtTI1Oc5nWw2zUPzvOMPx/1ljJqlgO
+6Vy5xhwubvHv2s5id0NnTj+oBfd5vIH5kukN5Uws64oT5gDPPOzeVo2nvTt8OiW9
+cZzPCvcqv6wF0hhwAFEeSht9IsyDhwHUF5ffO4XpjxBeEKLdlVdOOg6lsbM7SxJk
+Gd6+GQNTuWnA3ADWododJ7GqVXyt6lBazUYUo8ltXylr52il0DHn9lgk42x+rkmo
+KYSgZBdn3DFc4j+I9wDGs5fRqqQGdhDkYiJIOelnneECgYEA5vmRbyOGeKPcVRuO
+Woai+7GJ67m+gIlJCmFEMqwZACsU2yxpYVx2HH1vy9tk1GTae/FVzBjMbnaA2pL+
+U8PPVafgvrL6AFqHpvsyutQun3PuMugxSU2HC+rIxEo49v4hLZpYaVY0B2ZDG8AV
+liYwL5yjqQEVnUf8feeqTAdSlikCgYEAy65163SFURCmBdEMNgT4mwVzHWiTKcxN
+OZzBjItnCrJkq8Jyar7fN/DNifBsGqoh6GRLlp+7yyDQyx3D7ZswrcDs88Uizs55
+LdeLPtcRGvBnX4PhzzvexsCP2NuhUyxhkvMdDDUsjZ9AOuUHQKaY0etpRhh4iOhO
+1r6sggX2w0MCgYBC9YCy3nKiUKaUSavIFJX1L2/TVYKjkqkJCE+T/Q42XUbrjwFx
+xzM6aSbay1x8skwgeEMuKtZBA7uxIcH3GKHnrAZcYlhVd+kxgEshnFdzxFD+kw+O
+t5n523OebAH9oIiPxtnwl5v3tS6pQdNANwvrEZbkbLsOYIsTGPDmn4zSmQKBgAg5
+NP2aqL9LIsjdVdbggIERyUIItNhdLUkEMTRRdImUBkiBA0mYBz8k88d784FoGRJe
+6kZckKJ04rkwrHZta5u4TFjTPsKGx5G4QCD7Ye9qgWHz2ywYyLfRkn048NyA0De0
+pRmXFANryJYYJSDRGR5wmMGBv2wXpQc6j5B4WSwtAoGBAOKHHWOdS3ZkvUjtd4Nt
+YMk1nG/k6iozIh6bz06Cry4EkDE9Qi7zLe8FP2hRAJkbF1clbrhfOGyfoNjZ/Zjt
+ouKkl2HWcJSKVbMLM3GTktjdnOoowAznzQSGAdTxl+zJEctTpPDy5M+HzbsHmjmi
+fVCV7vbCgOjxuGpyFz+Nv0kC
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
index af092fb60c5..e69147e73f9 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIDfTCCAmWgAwIBAgIUQ2HUuuPwxy7ChX8dJUETFpwf/mwwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRIwEAYDVQQHDAlTdC4gTG91
+aXMxDDAKBgNVBAoMA09DSTEPMA0GA1UEAwwGc2VydmVyMCAXDTIyMDkxNTEzNTU1
+MVoYDzIwNTAwMTMwMTM1NTUxWjBNMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTU8x
+EjAQBgNVBAcMCVN0LiBMb3VpczEMMAoGA1UECgwDT0NJMQ8wDQYDVQQDDAZzZXJ2
+ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZzEImzIbS4eidyWnt
+Rxg2bH9YvGOV37XdQ7dJ7iV/6O+e9wUw21XLUc8v5FiI2Ta0V3yPnreIa8v6R3tO
+0P60LXoqgJd0TCgN5N5rlzeW7bCHhDDRi6oIzv27Wzb4vstqysftpQ+JKAIg4TKs
+SmahMYX5XuGw8oLyInKFZzisAUDd8ANw0TMQZ8QzAXEq9qcR+oStoLyddfu2KSI4
+1BWcNyRoJZWilLKcFxzPRHfDGs5yKbVkaa1eXnfN7O3Xv7T+iU88HbEXCshwIw2I
+ypDILTraSzWub9MjrCTd21K7+GvWdYpkWD5ujyWZjtSmVvuRuCe229KBRH1zxmjG
+yUOdAgMBAAGjUzBRMB0GA1UdDgQWBBQdbqSqh4WXVO84H9hXbOtcbFlTYTAfBgNV
+HSMEGDAWgBQdbqSqh4WXVO84H9hXbOtcbFlTYTAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4IBAQAxwOsIDBW0WyHfvVrYltysf+BOPEA8j4C3jfMy8170
+n0cCl+yyXrpQjCdSCkClc1mdH2uRbKlzitL0/pQntGk2ejBO6JqqtftUiLpiU8yM
+GiQJCgnW0a2uHQPnEBotmr/FK0kfQy5SfWk7BS3FDwbCdAAMUFeED7e94Nd+I3tl
+dITYI5jUrafpf/evMhTkB5EdQx1Y3FYdRPYSEBqO64bBWz7xE8ZmNqb993fIfrTR
+tJ00U0Mitd+4zDNhmJGtPF96FRAbr5HW25r1CCIc8TubsbggrqqjYaxxvKRJ0wH8
+Qxr2KZNxjrQgnryJuB0UfLQNv8VzVKMK6aUaOxxGJTHq
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
index a0264ef1abd..bfe1f853da9 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKwncxO5IsX3aqLY
-ZX/IjrXzNt45Tfp42FJ9Z5mgskfCy+0uRWTV/TN0hxMABy8cEYzjPtAfCERR5Rn6
-bW1IUPzSJupvWD6Nez4oDRt6ezi8pvTAyeoLLV/IBb8CEuQiNbu3w5X4U6eaca/9
-jKmHhMVUdjj0QRUNQOlaSimjJxhbAgMBAAECgYAIJVG3pDH2BhAAppae5kGCcICv
-IS0EZgVuWcq2JTlqVdhKX78e11VEwwXFK2Iro3tdHD+Tn3RHr0xU31mgKyTRzcfg
-elZkI7FqEELS+P3kd/U43pCaHmNZ6eZ4JkAkWEDIPXCGkYkf5/sWfoPnua8rjeHf
-1RppyM1gFFfCTq0oaQJBANxljEq+Xl6GUAGM2ZWCreqsN4vL7SZ3CzdBVT5p3sjV
-YOlm4KxKrj/elF/Cx7B+KL+NYjnytFmsF3vVZjCaNCcCQQDH9tdlqhl4DcyT5PQ5
-7ho6mdW+PZSg5Ya80chk8ly9wGgpWyOViJDqDdOUWC95gDGrfnNAhMpFMYRfv8Bb
-ZZatAkAK8yCdNggKOjIPYagNvYhWeGfqEh+eIZv1CtHpX+kpoTBHaE0RQkSV98D3
-YP36zsnHeoa+ykgbjGk+RcPl9kNRAkEAuoL6ldD6wIfecXP0eLQlstMaEr/NieWM
-r0Hc8Is/BZ4ZibmAj1E6GZWb65n1bhasPZFMXrl9EN0G42gvOxCeYQJAFA2/sc/z
-WSAz9qTBr6uJo/ZCptBTBN2qf7JXd24t2Hrl2xV69ey22gFLrmvn4C3tXOeHhWuN
-9AsMMQrC7dUU0Q==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCZzEImzIbS4eid
+yWntRxg2bH9YvGOV37XdQ7dJ7iV/6O+e9wUw21XLUc8v5FiI2Ta0V3yPnreIa8v6
+R3tO0P60LXoqgJd0TCgN5N5rlzeW7bCHhDDRi6oIzv27Wzb4vstqysftpQ+JKAIg
+4TKsSmahMYX5XuGw8oLyInKFZzisAUDd8ANw0TMQZ8QzAXEq9qcR+oStoLyddfu2
+KSI41BWcNyRoJZWilLKcFxzPRHfDGs5yKbVkaa1eXnfN7O3Xv7T+iU88HbEXCshw
+Iw2IypDILTraSzWub9MjrCTd21K7+GvWdYpkWD5ujyWZjtSmVvuRuCe229KBRH1z
+xmjGyUOdAgMBAAECggEASUM+4+Kb+wr4V2mh1xD93LcUdr3PJo7ZwFxIjKQwIt1g
+gDYlt99T4DXJX4QEFLR8Va4zPOsbfJX1JfU1LRdrrYLYZjS5cQHyNqQmu9Pd/Dyf
+0f5LjxZb2jRYNA7Agf/JQMb2NCNj4i83zFfaXq5Wc0T3EBJ9ql/rttJoAVppaa22
+IE8NjmIk9PYM+7tP5ZMjG2/pm3TsaxsR//pklVPtnz8RH7n9qd4QLrHTfMTWVKXb
+g1ErdzFHKFLh9wpgy177I//ReE4qlNthrboGI2F4lhnEBsJee0YT8fBylUwxKnQi
+I6PNz3td8olGsOq1B5WCDpbV7tKbVY55SwxQT9KL4QKBgQDGr5nhNRE35/GYEeD5
+tCkNEELe6IPrQjd5OlutuAzRBQQP9apkSMMfx4SaJB3NYWC0lS+aXSRQgYRSl/4s
+Z71bmDCUoOZ1W7XpMsYvLq/585mJ2amsNDOXzcEqHafrVyn/AYGClfqgzl81gxLc
+7iuZM2Ow4UO1+joPBqXpoCHzyQKBgQDGKczhh9/NkpiMPJx692nsYWvFdeDmgzUn
+CQnYL6iRKXv53TJjh1Tl9x6RNfGgUwwTkn9s1pKMOMRhPH1sQ8mmOAQkBJ11BqI4
+MaF9B4o3xyaBbd61Qsw7iEN0ZMeCyxelwDcvl0BJ3LXrAI3HXnjUSso2vrHqfStb
+Kwdko4rzNQKBgFj2zf9CRMh0qf/+mW8V1X/M9TRchp0z1CULFXvuuoZpKY1/4eDv
+l7dGHkDqxRFudd/GIT+MTzNhGv/koOH/PZGizrXuaeLIwuZ9XrJHxHI2Oly4Qroh
+0aw6bDDQgJznNZ3CbdwsDcItRgJvA2Y7mvgJQ60y4J++QHrz7hxzIGDJAoGAUpkX
+yiXtlm11YnbdLrA0GZBd8Jd63/puzE+LJ+5tj9w/zd1yZGQDcjt4JUTb61zSWtIk
+hQRHX2VGDdW93cO/qKYOq8i0rRPPyCZ/znK3HRrIpQhb3SfzoxjgLQLY2l63A6LE
+HfUomeECfurjLefl628lLH5+AGSeDsk3sq4se8UCgYBspQ70kknXqUZmVs+bCewZ
+LYaZnPkWaKhQDPgd+hddJfoHEz7Koljad7BMKe+1MGo/hIxvxFpOFvIB6LFKY7HG
+cA273ZncnD8u//wLLnjQrZR5GXvj1VYEpRcEeql7bAPdsD9CoyHCD6bh1ZWqBqqf
+IxzRIPaJwoaZA2Dfe7t6eQ==
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
index e9b17485db7..2de95d001d7 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
@@ -1,30 +1,42 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
index 84697501f07..58a298d6c34 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICaDCCAdGgAwIBAgIJAM3CfzOObfOTMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3QuIExvdWlzMQwwCgYDVQQK
-DANPQ0kxDzANBgNVBAMMBmNsaWVudDAeFw0xMjA4MjgwOTEzMDJaFw0yMjA4MjYw
-OTEzMDJaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNTzESMBAGA1UEBwwJU3Qu
-IExvdWlzMQwwCgYDVQQKDANPQ0kxDzANBgNVBAMMBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAvwjlFgnEbTY2TKSc0FXEY+UVm8HKrPusXF6I98mo
-gCOcx+3MBBFgW5rc9R1XFkQowF4y8IW/0HXtziBcxlqPFDIi3zfnTn+8xEIK+3j1
-CEbUCpfdf23t2MIedd+/VKZ9T83DTxGfo7jjOeD0x6rjhLfZPzE+kq4tDFdr8ZMV
-VE8CAwEAAaNQME4wHQYDVR0OBBYEFJFL46pVEsip1DNKpRwbe25OW4L8MB8GA1Ud
-IwQYMBaAFJFL46pVEsip1DNKpRwbe25OW4L8MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADgYEAPjw7GXbGKDj7rHSNu/ILuz+eYAC0lPu8ncZXPgVnLfBZs1tJ
-zJvREYsoU5f3qi0M7IStntq/t0GgJ2azd7KK8hMRWPEDN1JPBdvTDew2EKGOj+by
-wPRqhgY3+hpdaSaQ6SG1O9+0YUxdODSpBN0Xf9FpudALpHcFqKgXtRVyITA=
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
index 71cde978fe0..cece95b57e3 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAL8I5RYJxG02Nkyk
-nNBVxGPlFZvByqz7rFxeiPfJqIAjnMftzAQRYFua3PUdVxZEKMBeMvCFv9B17c4g
-XMZajxQyIt83505/vMRCCvt49QhG1AqX3X9t7djCHnXfv1SmfU/Nw08Rn6O44zng
-9Meq44S32T8xPpKuLQxXa/GTFVRPAgMBAAECgYEAhyTow9V3E3fFpCTUFwKF49Gd
-nsnS8ts8jUAHj5wmyzfmYv3UVZBhZYzCAdmW0Va4qZY6XTORhgzXhfoZB+3qxzhU
-y8vFzjYdHKoDZyfsOXa/74UqctHHOGE4uY0t9ANY4c/eRDYtQ1Xm1Ze0LYmRgtZI
-/7c1tbULjZD69j/zM/kCQQD7Y3JkbW1ta19GsjHxJQpY1dhxaZfGlLEfeDDb1LAX
-wlOJbu8WMXt2Ow4wfyLajZo2lknsLYR+PL7mBxpUy8JTAkEAwooE4MNsC9hEcpYc
-E8ohnb6j6X5084qM8xaWLEbp9+3qizdNk3jAHwqXW79sNRJ9LtoXTGy0QfF950oF
-WXqelQJBAKonQrtVEfc48PFCFem5/4nnnKwPI8smw8igKrnw+Qvr3W0tqCimb4G0
-MUOEGkxCAjqmePyiRobHiRLbhegVTr8CQQCaBs8/6lp0smHXW9SVMpgVHmkHKTGN
-1igtG7gBDJCY1Y27dij810E+EpOud8xD5QSqgNCrmPHLuFmYM7oyk2xVAkEApncl
-77y5+vjjOBuVIOujfls52NQIliK5DwwrG9s2rnvPcQ8UGeNb9cpWxBnr8ENALj6Y
-dO8d7Zudp94vU/mSkg==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQd7Xhe06WRK9K
+DLsQwDxSsG2TT7kPgYYhhFqYc+KKWYG6wSA07WU/JptKMCu5n8IVWezTDyx0aluw
+3pu1PravUDUm/sPkeVKh5EUskFmY+xGly45fFMAwurr0ebK4kRmBsnEJrWMnwN1d
+Zismckqp7xt20u0Sc6Tf65Fr5F1XiiUrj8IHaYNtv5JjDJaEtZp47r2zbZBQNP35
+M44Mi6Jhe/3cHqWzdhUEDE/2BHUB60u3lfZy016W+Zntbmp1Cwy43SB1zTp+doUT
+4PzUJplYYCEsRhff2ukToz/qCkh5sWwyGWpGDRP+lC6iM+ufwJM1wSwFDOqLMkN0
+G/N/YaVHAgMBAAECggEAT4Npj0B+ABjglyj17PS1zYBXuxlsZ7qqk3wtJfsFjGmJ
+btcc1rM5q/Wow4pOEzYZTBWJnBMsjJbItFSkJWRvP70jGOWRiEKyPueXbuD8G7qf
+x5I1kpSSncOLbZZBkd5eUTbjoKJOsKoChQ5kJPzw95Io8pCPNjt/xpzOUc2/wJRS
+xS2/raReRe+1xLzacgSOyFsQ1SEHeC+LjhHchLL7OvRMpUSXM+fg8bwSAvUoOyUb
+WCKGpk5myAKUXZpL3hrzK7cnIAvjNlfpMRpnKbWaKUKNb8XlEfiaGnkA754sRobJ
+EUilb4k9LC2F98sBhYh+DKkr5F9tsIhsRf/XqJdTqQKBgQD55j6D4kxqTmsfYxPE
+ngIDKHyMVsYmmlMsV9lkRO/dl0na4CS4reBO0BJ08vwd4p+shEvPB+l7FwXMhfF3
+laRJWRUKe2Mc3QLVDDd8YNZ9OMkcbOS/BHyLWIfXgZO5FVXOSlaG9sQI9hbbNIoY
+sq6OduxU8JMMaIPJt+THAr7bywKBgQDVjoltdzeVM7XI7fDmzgpl1FrKKLjbnHk1
+FjiJBHTsqNrvyvWWyRwZh5XSYNHtPs3gA72v/xKtuAo00Xz+v5VzOs60DKyrvFA6
+HL4ilqMoRVotsuxssg8RSiKNUkJPesZ6W3g41RR/kvbeB6k3au9YlBzsKT3yFfX2
+FxMTstpk9QKBgQDO3GMfdPJghW1zW+Z/OXTc/GStHx+D0PfMmyPfNpmASr3eKvD6
+1yP42ZCNsp40duZKPnEqfZguRk6MkMvje8G03cLnHGBdAi5YAXbkxJyIp7sChrmL
+zcDy8GPyZtbLvPd8fljF+/sml98vsXwnGbIZSCQ147c17EY7crg0bPdkpQKBgCue
+g39yXE4DU9wIja3247TM3QZxruBcY31uXnnOCTvVeXKFGAiGZ1DnmrhvwjEdJNve
+p73s8Zm9/4euSkOWSiZRGqs384TYX+KewE88SXMOR08SPqws6lrzs37+EEE/qI6R
+ZErnatpr4DSViACjvONwzT+HZPmvdp+fMuxRGb6JAoGBAKrCbGUDfEJdBfHpfU2G
+8P4kW+eAU4tMl9BeMhWmYB2aUIkHgcivQKNNBLSYnKt9B/0fe2qoyPteyFOi/mur
+68IIc0aZm8ut8rw3QguX6HnKa6Lmxz7KO3/rrcDY1iOUbvu9rLncqWipTsavurRi
+GDdTB467Bg1cPkS+1u3hZa2k
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
index 285f66707b9..2ff8794143d 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
index 570f605a1a0..65ef88f36da 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
@@ -1,31 +1,49 @@
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOAjx/Urmya7Gnrr
-uobLLvy28zojXBd/1HocK3ZEQNutLs6X3Iz2GSO6uVUP6/A8J4CTtjLK2WVCdldH
-lx1Mjzgfz9X+3A0Ycr+KUGRqtorowb+OQgTqHoNscpyOh8KD1/RdnfC/8eGi4aM/
-dRhsbVJmh1rN5xUAbnBsGBwLK6oBAgMBAAECgYAuEWyhyYqkFUTGCvlVhyFrM7ce
-NfJRqiZjyrJsJm8mN5wtPi1Ik7RrEY/SGemmgNalqLaEDglMtLJaEg7PKNMulWpN
-FIP1uBfA6Kv8vTJvf3PWNiZ9E70Yxsj9xxYDiIhwaNd8UMDMu9i4ipOkZkUWGkTr
-bPESK4sSytRh8K3+2QJBAPYLGJnqNVb+e8b5Z5S8bNiQaP5ZWUgUSlsUhcpcI5sy
-h3HQhTK/Z0sbGANpW8OVa3RM3SP43mJk+FD2WY11+/MCQQDpNcX4Gea7FBRRZ9Zi
-hGLTgLXRAeLR2oxQFs8KCZb0RyRMAjuKNg+FeXORQvxKZbY6qCga41I9PSgsBjAE
-TkM7AkALgb9Xy21NMT+msZlXimxowHA4nQMg7NoBYndTXHXJ11YgS4k/M1ZoW88G
-sdG51u4clU+uVABKh8BZQPw1MnRjAkEAvE1sBTE8yW+kHDsAstl8RpTVueaQ86tI
-wl44XD10AtfyqeDfnHCcRcTUGMWCmrvX0TL39wX34HSiHDH+0Ws0AwJAMuzL2UA4
-2aBTBcTe4CZu1zUHnJHQLKfWdDdjDQML8Dh9cOczibmNi3D4v9XDuCk8xOvzyG5d
-3VSuogRvmdH1GA==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC1pNAwDrGOATwa
+YmnfseWdDJ/E2ubRGDNn6i7zTqjZG91RGvOHRkoL1rxZMZToalS/z0FPVosUU1Oy
+PwyLR7VIaNwySd6T7zuzS7frvEWPKRasrXSXffaMQixCwEbSht7SjtkD0MrkT82a
+/KT23Xuot4lGYBm1vNOImS6WOBYYcYyh1hfa5ozdk1F7mkZX6vUFPxMx4kK+MzES
+l5h8AfbaItAcR0UK4bhyjbbq8O/A6EcuatlBN+uPATdc08KqX2uvOTkhdkLa0AbX
+u7teHDNREY0oxIu7Vxtjy8hPAr1WNJmtfPORi7JBfWtZzp/UVipLEYBzJTnpbPN9
+PrJH+S+fAgMBAAECggEASxYFJUh9pxjlknaKE3lDVGdKiCKA9YBOh68rl1I1xAGb
+vBIrBwlMRJaQp0Iyrtx9igiPk89PkKhdWbpsYgrTakpGc9dLVdW31QcA0Uazbllq
+0RimsJTWXOZhy3oWDKLJ6zo3hTdDF5vRfzberlmh631rFpdVKWYT/0xrEJfAsntS
+akrYm+oFH83hLayJhf/hii/N6c9vjhE0Wa4cgnaEqQZnf50anZdGSp0J0LaLVj/o
+wypN0Bb74Rr9J8ks5WdngKWB4UDMjqx/sAlETJDnEoWTu1xdKRnLeU3Hq2RWCCJ/
+MOUGX6pOD3gldYysMMNBIoRBBBc/f1xDkCkaNHuXyQKBgQDw310b07h2dUKRJhYZ
+YbcEic1LodaG1QVDBT1cNHs/QG3+1gBQmxHLP+uf/mofADkR27ell9MgvyhUZirj
+LyTA3GWIW7OLRcg0Zrr4SmAFv5zXXbVfbigZapd+MJpUXPVKbUzX6zBy/2BDNG0x
+dplxkzSm2nAMdSOVyybCTYQPqwKBgQDBDTKkcRERPX1ajmfhrk5nF+YVrU7cWywv
+7TgohjSUbuYce+XsgIBVWkpHjdjsPly46v1acHPAVNez8bu38rUd0zlE42g6rpAc
+VR4XK8N5/iiIxCtpv4F1s8GqbYUm3nZI0j+08dfX1YuMUKPHicmEb4DQoo+qmXRJ
+dcLBRdH73QKBgQDOWnz4xvQDv8dMdDWAfx78q1WOUtJnZn2Agi+kG23urTLOm+Vf
+KMogtt0Ujy+46Ub7DqGRIrWEG1/gljptsMiq1OXC4NS7Hwg6JDxPU+BZbGNgee5V
+GBkQVSn9uIOufIjDv0mSvPEfw7pjOLnHI1SnYTY9L2vIsF3RCV5mHWRiywKBgHZX
+z9aslUjbR+/uYlIfl2JtbReWwUQmA+VxZz64Xp0ripalgSJE9+bazbQliXfxFsgp
+DZyWWO7rU7u0kV3HRC3/YRkQysFGZ4NmzmZn5pHvMwv8LZzKz+LGig8eykQ0lZA4
+iuMyah2eg8hFWtEkb0tnSzEapjVvkrDBptzyHzJlAoGBAM7yA/XnbKpaHJzAswgd
+Ks6FLHK/94e9aw3YjqR48FcFGtLuHOVSvXhT/WlwmQB6wUTDUWk+hEDTPJ4yeENd
+pgFpg2G3eDxWh3mzhOKJmyQM8OMCoohnOpBljceMADRUFum8CckJ7cy/HCU2p4do
+JQluDrECO1IkRC8UUTWpyMAA
 -----END PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h
index fbc520aea4e..4c804211cd8 100644
--- a/TAO/tao/Transport_Selection_Guard.h
+++ b/TAO/tao/Transport_Selection_Guard.h
@@ -70,26 +70,26 @@ namespace TAO
     TAO_Transport* operator-> (void) const
     {
       return this->get ();
-    };
+    }
 
     /// getter
     TAO_Transport& operator* (void) const
     {
       return *this->get ();
-    };
+    }
 
     /// Getter
     TAO_Transport* get (void) const
     {
       return this->curr_;
-    };
+    }
 
     /// Setter
     Transport_Selection_Guard& set (TAO_Transport* t)
     {
       this->curr_ = t;
       return *this;
-    };
+    }
 
   Transport_Selection_Guard& operator=(const Transport_Selection_Guard& rhs) {
     if (this != &rhs)
diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp
index 917d965291b..344b85c517f 100644
--- a/TAO/utils/catior/Catior_i.cpp
+++ b/TAO/utils/catior/Catior_i.cpp
@@ -1100,7 +1100,7 @@ Catior_i::cat_codeset_info (TAO_InputCDR& cdr)
                        "for char.\n"),
                       false);
 
-  ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for char %u\n", c_ccslen);
+  ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for char: %u\n", c_ccslen);
   buffer_ += buf;
 
   if (c_ccslen)
@@ -1131,7 +1131,7 @@ Catior_i::cat_codeset_info (TAO_InputCDR& cdr)
                        "for wchar.\n"),
                       false);
 
-  ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for wchar %u\n", w_ccslen);
+  ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for wchar: %u\n", w_ccslen);
   buffer_ += buf;
 
   if (w_ccslen)