ChangeLogTag:Fri Aug 27 12:01:37 2004 Steve Huston <shuston@riverace.com>

12 files changed, 308 insertions, 292 deletions

diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index 8861c5f7dfc..ec93d250348 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -300,12 +300,12 @@ ACE_Client_Logging_Handler::send (ACE_Log_Record &log_record)
   // since otherwise the values of the <log_record> fields will be in
   // network byte order.
   if (orig_ostream)
-    log_record.print ("<localhost>",
+    log_record.print (ACE_TEXT ("<localhost>"),
                       ACE_Log_Msg::instance ()->flags (),
                       *orig_ostream);
 
   if (this->logging_output_ == ACE_STDERR)
-    log_record.print ("<localhost>",
+    log_record.print (ACE_TEXT ("<localhost>"),
                       ACE_Log_Msg::instance ()->flags (),
                       stderr);
   else
@@ -345,13 +345,13 @@ public:
 
 protected:
   // = Dynamic linking hooks.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Called when service is linked.
 
   virtual int fini (void);
   // Called when service is unlinked.
 
-  virtual int info (char **strp, size_t length) const;
+  virtual int info (ACE_TCHAR **strp, size_t length) const;
   // Called to determine info about the service.
 
   virtual int make_svc_handler (ACE_Client_Logging_Handler *&sh);
@@ -362,10 +362,10 @@ protected:
   virtual int resume (void);
 
 private:
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse svc.conf arguments.
 
-  const char *server_host_;
+  const ACE_TCHAR *server_host_;
   // Host where the logging server is located.
 
   u_short server_port_;
@@ -375,7 +375,7 @@ private:
   ACE_INET_Addr server_addr_;
   // Address of the logging server.
 
-  const char *logger_key_;
+  const ACE_TCHAR *logger_key_;
   // Communication endpoint where the client logging daemon will
   // listen for connections from clients.
 
@@ -411,11 +411,11 @@ ACE_Client_Logging_Acceptor::make_svc_handler (ACE_Client_Logging_Handler *&sh)
 }
 
 int
-ACE_Client_Logging_Acceptor::info (char **strp, size_t length) const
+ACE_Client_Logging_Acceptor::info (ACE_TCHAR **strp, size_t length) const
 {
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
 
-  ACE_OS::sprintf (buf, "%d/%s %s",
+  ACE_OS::sprintf (buf, ACE_TEXT ("%d/%s %s"),
 		   this->server_addr_.get_port_number (), "tcp",
 		   "# client logging daemon\n");
 
@@ -435,10 +435,10 @@ ACE_Client_Logging_Acceptor::ACE_Client_Logging_Acceptor (void)
 }
 
 int
-ACE_Client_Logging_Acceptor::init (int argc, char *argv[])
+ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[])
 {
   // We'll log *our* error and debug messages to stderr!
-  ACE_LOG_MSG->open ("Client Logging Service");
+  ACE_LOG_MSG->open (ACE_TEXT ("Client Logging Service"));
 
   // Use the options hook to parse the command line arguments and set
   // options.
@@ -495,9 +495,9 @@ ACE_Client_Logging_Acceptor::init (int argc, char *argv[])
 }
 
 int
-ACE_Client_Logging_Acceptor::parse_args (int argc, char *argv[])
+ACE_Client_Logging_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "h:k:p:", 0);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("h:k:p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/netsvcs/lib/Log_Message_Receiver.cpp b/netsvcs/lib/Log_Message_Receiver.cpp
index 7c032c453ef..b6496232bd3 100644
--- a/netsvcs/lib/Log_Message_Receiver.cpp
+++ b/netsvcs/lib/Log_Message_Receiver.cpp
@@ -10,8 +10,8 @@ ACE_RCSID(lib, Log_Message_Receiver, "$Id$")
 
 // Type based log message receiver
 template<ACE_SYNCH_DECL> void
-Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (char const *hostname,
-						      ACE_Log_Record &record)
+Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostname,
+                                                        ACE_Log_Record &record)
 {
 #if defined (ACE_HAS_THREADS)
     static ACE_SYNCH_MUTEX_T lock_;
@@ -24,7 +24,7 @@ Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (char const *hostname,
 }
 
 template<ACE_SYNCH_DECL> void
-Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_output (char const *hostname,
+Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_output (const ACE_TCHAR *hostname,
                                                         ACE_Log_Record &record,
                                                         ostream *outputfile)
 {
@@ -106,8 +106,8 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::detach (Log_Message_Receiver_Impl<ACE_
 
 // Type based log message receiver
 template<ACE_SYNCH_DECL> void
-Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (char const *hostname,
-						    ACE_Log_Record &record)
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostname,
+                                                      ACE_Log_Record &record)
 {
   ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, print_lock_));
   record.print (hostname,
@@ -116,7 +116,7 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (char const *hostname,
 }
 
 template<ACE_SYNCH_DECL> void
-Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_output (char const *hostname,
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_output (const ACE_TCHAR *hostname,
                                                       ACE_Log_Record &record,
                                                       ostream *outputfile)
 {
@@ -152,15 +152,15 @@ Log_Message_Receiver<ACE_SYNCH_USE>::Log_Message_Receiver
 
 // Type based log message receiver
 template<ACE_SYNCH_DECL> void
-Log_Message_Receiver<ACE_SYNCH_USE>::log_record(char const *hostname,
-                                              ACE_Log_Record &record)
+Log_Message_Receiver<ACE_SYNCH_USE>::log_record(const ACE_TCHAR *hostname,
+                                                ACE_Log_Record &record)
 {
   ACE_ASSERT (receiver_impl_ != 0);
   receiver_impl_->log_record (hostname, record);
 }
 
 template<ACE_SYNCH_DECL> void
-Log_Message_Receiver<ACE_SYNCH_USE>::log_output(char const *hostname,
+Log_Message_Receiver<ACE_SYNCH_USE>::log_output(const ACE_TCHAR *hostname,
                                                 ACE_Log_Record &record,
                                                 ostream *outputfile)
 {
diff --git a/netsvcs/lib/Log_Message_Receiver.h b/netsvcs/lib/Log_Message_Receiver.h
index d72a07ac809..1124b3f4884 100644
--- a/netsvcs/lib/Log_Message_Receiver.h
+++ b/netsvcs/lib/Log_Message_Receiver.h
@@ -38,7 +38,7 @@
 //  The requiremnts on a log manager receiver, T, are quite simple.
 //  1: There must exist one "log_record" member function with the following
 //     prototype:
-//        void log_record(char const* hostname,
+//        void log_record(const ACE_TCHAR *hostname,
 //                        ACE_Log_Record &record);
 //
 //  2: There must exist a public destructor.
@@ -53,7 +53,7 @@
 //  receiver.
 //
 //  Methods:
-//    void log_record(char const* hostname,
+//    void log_record(const ACE_TCHAR* hostname,
 //                    ACE_Log_Record& record)
 //  Description:
 //    Processes the log record "record" from the host "hostname"
@@ -104,12 +104,12 @@ class Static_Log_Message_Receiver
   //  prints the content of log_records on stderr.
 
 public:
-  static void log_record(const char *hostname,
+  static void log_record(const ACE_TCHAR *hostname,
                          ACE_Log_Record &record);
   // Prints the log_record to stderr using record.print (hostname, 0, stderr).
   // Serializes the output by using a ACE_SYNCH_MUTEX.
 
-  static void log_output(const char *hostname,
+  static void log_output(const ACE_TCHAR *hostname,
                          ACE_Log_Record &record,
                          ostream *output);
   // Prints the log_record to a user specified ostream.
@@ -159,10 +159,10 @@ public:
   Log_Message_Receiver(Log_Message_Receiver<ACE_SYNCH_USE> const &rhs);
   ~Log_Message_Receiver (void);
 
-  void log_record (const char *hostname,
+  void log_record (const ACE_TCHAR *hostname,
                    ACE_Log_Record &record);
 
-  void log_output(const char *hostname,
+  void log_output(const ACE_TCHAR *hostname,
                   ACE_Log_Record &record,
                   ostream *output);
 private:
@@ -185,10 +185,10 @@ public:
   static Log_Message_Receiver_Impl *attach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body);
   static void detach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body);
 
-  void log_record (const char *hostname,
+  void log_record (const ACE_TCHAR *hostname,
                    ACE_Log_Record &record);
 
-  void log_output(const char *hostname,
+  void log_output(const ACE_TCHAR *hostname,
                   ACE_Log_Record &record,
                   ostream *output);
 
diff --git a/netsvcs/lib/Makefile.am b/netsvcs/lib/Makefile.am
index a527f3ef54b..7fd980d3c3b 100644
--- a/netsvcs/lib/Makefile.am
+++ b/netsvcs/lib/Makefile.am
@@ -1,53 +1,51 @@
-##---------------------------------------------------------------------------
-##       $Id$
+##  Process this file with automake to create Makefile.in
 ##
-##       Makefile for the server-side ACE network services
+## $Id$
 ##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -hierarchy -make_coexistence -exclude build,Kokyu
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+ACE_BUILDDIR = $(top_builddir)
 
-lib_LTLIBRARIES = libnetsvcs.la
+## Makefile.netsvcs.am 
+noinst_LTLIBRARIES = libnetsvcs.la
 
-libnetsvcs_la_SOURCES = \
-         Base_Optimizer.cpp  \
-         Client_Logging_Handler.cpp  \
-         Log_Message_Receiver.cpp  \
-         Name_Handler.cpp  \
-         Server_Logging_Handler.cpp  \
-         Server_Logging_Handler_T.cpp  \
-         TS_Clerk_Handler.cpp  \
-         TS_Server_Handler.cpp  \
-         Token_Handler.cpp
+libnetsvcs_la_CPPFLAGS = \
+  -I$(top_builddir) \
+  -I$(top_srcdir) \
+  -I$(ACE_BUILDDIR) \
+  -DACE_NETSVCS_BUILD_DLL
 
-libnetsvcs_la_LDFLAGS = \
-         -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
+libnetsvcs_la_SOURCES = \
+  Base_Optimizer.cpp \
+  Client_Logging_Handler.cpp \
+  Log_Message_Receiver.cpp \
+  Name_Handler.cpp \
+  Server_Logging_Handler.cpp \
+  TS_Clerk_Handler.cpp \
+  TS_Server_Handler.cpp \
+  Token_Handler.cpp
+
+libnetsvcs_la_LIBADD = \
+ $(top_builddir)/ace/libACE.la
 
 noinst_HEADERS = \
-         Base_Optimizer.h  \
-         Client_Logging_Handler.h  \
-         Log_Message_Receiver.h  \
-         Name_Handler.h  \
-         Server_Logging_Handler.h  \
-         Server_Logging_Handler_T.h  \
-         TS_Clerk_Handler.h  \
-         TS_Server_Handler.h  \
-         Token_Handler.h
+  Base_Optimizer.h \
+  Client_Logging_Handler.h \
+  Log_Message_Receiver.h \
+  Name_Handler.h \
+  Server_Logging_Handler.h \
+  Server_Logging_Handler_T.h \
+  TS_Clerk_Handler.h \
+  TS_Server_Handler.h \
+  Token_Handler.h \
+  Server_Logging_Handler_T.cpp
 
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
-
-## What do we about the below?  It was in the original libnetsvcs Makefile.
-##  ifeq ($(SUPPRESS_DASH_G),1)
-##  #### Build this target without -g on some platforms.
-##  $(VDIR)Server_Logging_Handler.o $(VSHDIR)Server_Logging_Handler.$(SOEXT):
-##          $(COMPILE-NO_DASH_G.cc) -o $@ $<
-##  endif # SUPPRESS_DASH_G
-
+	-rm -f gcctemp.c gcctemp so_locations
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp
index 63bb145c537..a0c20e4c386 100644
--- a/netsvcs/lib/Name_Handler.cpp
+++ b/netsvcs/lib/Name_Handler.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #define ACE_BUILD_SVC_DLL
 
 #include "ace/Containers.h"
@@ -42,15 +44,15 @@ template ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX> *
 #define ACE_LIST_MAP(INDEX, MASK) (((unsigned long) (INDEX & MASK)) >> 3)
 
 int
-ACE_Name_Acceptor::parse_args (int argc, char *argv[])
+ACE_Name_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRACE ("ACE_Name_Acceptor::parse_args");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Acceptor::parse_args"));
 
   int service_port = ACE_DEFAULT_SERVER_PORT;
 
-  ACE_LOG_MSG->open ("Name Service");
+  ACE_LOG_MSG->open (ACE_TEXT ("Name Service"));
 
-  ACE_Get_Opt get_opt (argc, argv, "p:", 0);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -61,7 +63,7 @@ ACE_Name_Acceptor::parse_args (int argc, char *argv[])
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                            "%n:\n[-p server-port]\n%a", 1),
+                            ACE_TEXT ("%n:\n[-p server-port]\n")),
                            -1);
         }
     }
@@ -71,9 +73,9 @@ ACE_Name_Acceptor::parse_args (int argc, char *argv[])
 }
 
 int
-ACE_Name_Acceptor::init (int argc, char *argv[])
+ACE_Name_Acceptor::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRACE ("ACE_Name_Acceptor::init");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Acceptor::init"));
 
   // Use the options hook to parse the command line arguments and set
   // options.
@@ -85,11 +87,11 @@ ACE_Name_Acceptor::init (int argc, char *argv[])
                   ACE_Reactor::instance (),
                   0, 0, 0,
                   &this->scheduling_strategy_,
-                  "Name Server",
-                  "ACE naming service") == -1)
+                  ACE_TEXT ("Name Server"),
+                  ACE_TEXT ("ACE naming service")) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%n: %p on port %d\n",
-                       "acceptor::open failed",
+                       ACE_TEXT ("%n: %p on port %d\n"),
+                       ACE_TEXT ("acceptor::open failed"),
                        this->service_addr_.get_port_number ()),
                       -1);
 
@@ -103,14 +105,14 @@ ACE_Name_Acceptor::init (int argc, char *argv[])
   // Figure out what port we're really bound to.
   if (this->acceptor ().get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_local_addr"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_local_addr")),
                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "starting up Name Server at port %d on handle %d\n",
-             server_addr.get_port_number (),
-             this->acceptor ().get_handle ()));
+              ACE_TEXT ("starting up Name Server at port %d on handle %d\n"),
+              server_addr.get_port_number (),
+              this->acceptor ().get_handle ()));
   return 0;
 }
 
@@ -124,7 +126,7 @@ ACE_SVC_FACTORY_DEFINE (ACE_Name_Acceptor)
 ACE_Name_Handler::ACE_Name_Handler (ACE_Thread_Manager *tm)
   : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (tm)
 {
-  ACE_TRACE ("ACE_Name_Handler::ACE_Name_Handler");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::ACE_Name_Handler"));
 
   // Set up pointers to member functions for the top-level dispatching
   // of client requests.
@@ -165,13 +167,13 @@ ACE_Name_Handler::ACE_Name_Handler (ACE_Thread_Manager *tm)
 /* VIRTUAL */ int
 ACE_Name_Handler::open (void *)
 {
-  ACE_TRACE ("ACE_Name_Handler::open");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::open"));
 
   // Call down to our parent to register ourselves with the Reactor.
   if (ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::open (0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                       -1);
   return 0;
 }
@@ -182,7 +184,7 @@ ACE_Name_Handler::open (void *)
 ACE_Name_Handler::send_reply (ACE_INT32 status,
                               ACE_UINT32 err)
 {
-  ACE_TRACE ("ACE_Name_Handler::send_reply");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::send_reply"));
   void *buf;
   this->name_reply_.msg_type (status);
   this->name_reply_.errnum (err);
@@ -197,8 +199,8 @@ ACE_Name_Handler::send_reply (ACE_INT32 status,
 
   if (n != len)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n, expected len = %d, actual len = %d",
-                      "send failed",
+                       ACE_TEXT ("%p\n, expected len = %d, actual len = %d"),
+                       ACE_TEXT ("send failed"),
                        len,
                        n),
                       -1);
@@ -209,21 +211,21 @@ ACE_Name_Handler::send_reply (ACE_INT32 status,
 /* VIRTUAL */ int
 ACE_Name_Handler::send_request (ACE_Name_Request &request)
 {
-  ACE_TRACE ("ACE_Name_Handler::send_request");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::send_request"));
   void *buffer;
   ssize_t length = request.encode (buffer);
 
   if (length == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "encode failed"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("encode failed")),
                       -1);
   // Transmit request via a blocking send.
 
   if (this->peer ().send_n (buffer, length) != length)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "send_n failed"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("send_n failed")),
                       -1);
   return 0;
 }
@@ -234,7 +236,7 @@ ACE_Name_Handler::send_request (ACE_Name_Request &request)
 /* VIRTUAL */ int
 ACE_Name_Handler::abandon (void)
 {
-  ACE_TRACE ("ACE_Name_Handler::abandon");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::abandon"));
   return this->send_reply (-1, errno);
 }
 
@@ -243,7 +245,7 @@ ACE_Name_Handler::abandon (void)
 /* VIRTUAL */ int
 ACE_Name_Handler::handle_timeout (const ACE_Time_Value &, const void *)
 {
-  ACE_TRACE ("ACE_Name_Handler::handle_timeout");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::handle_timeout"));
   return this->abandon ();
 }
 
@@ -252,7 +254,7 @@ ACE_Name_Handler::handle_timeout (const ACE_Time_Value &, const void *)
 /* VIRTUAL */ ACE_HANDLE
 ACE_Name_Handler::get_handle (void) const
 {
-  ACE_TRACE ("ACE_Name_Handler::get_handle");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::get_handle"));
   return this->peer ().get_handle ();
 }
 
@@ -261,7 +263,7 @@ ACE_Name_Handler::get_handle (void) const
 /* VIRTUAL */ int
 ACE_Name_Handler::dispatch (void)
 {
-  ACE_TRACE ("ACE_Name_Handler::dispatch");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::dispatch"));
   // Dispatch the appropriate request.
   int index = this->name_request_.msg_type ();
 
@@ -281,7 +283,7 @@ ACE_Name_Handler::dispatch (void)
 /* VIRTUAL */ int
 ACE_Name_Handler::recv_request (void)
 {
-  ACE_TRACE ("ACE_Name_Handler::recv_request");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::recv_request"));
   // Read the first 4 bytes to get the length of the message This
   // implementation assumes that the first 4 bytes are the length of
   // the message.
@@ -292,11 +294,11 @@ ACE_Name_Handler::recv_request (void)
     case -1:
       /* FALLTHROUGH */
       ACE_DEBUG ((LM_DEBUG,
-                  "****************** recv_request returned -1\n"));
+                  ACE_TEXT ("****************** recv_request returned -1\n")));
     default:
       ACE_ERROR ((LM_ERROR,
-                  "%p got %d bytes, expected %d bytes\n",
-                 "recv failed",
+                  ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
+                  ACE_TEXT ("recv failed"),
                   n,
                   sizeof (ACE_UINT32)));
       /* FALLTHROUGH */
@@ -314,7 +316,7 @@ ACE_Name_Handler::recv_request (void)
         if (length > (ssize_t) sizeof this->name_request_)
           {
             ACE_ERROR ((LM_ERROR,
-                        "length %d too long\n",
+                        ACE_TEXT ("length %d too long\n"),
                         length));
             return this->abandon ();
           }
@@ -328,8 +330,8 @@ ACE_Name_Handler::recv_request (void)
         // Subtract off the size of the part we skipped over...
         if (n != (length - (ssize_t) sizeof (ACE_UINT32)))
           {
-            ACE_ERROR ((LM_ERROR, "%p expected %d, got %d\n",
-                       "invalid length", length, n));
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p expected %d, got %d\n"),
+                       ACE_TEXT ("invalid length"), length, n));
             return this->abandon ();
           }
 
@@ -337,8 +339,8 @@ ACE_Name_Handler::recv_request (void)
         if (this->name_request_.decode () == -1)
           {
             ACE_ERROR ((LM_ERROR,
-                        "%p\n",
-                        "decode failed"));
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("decode failed")));
             return this->abandon ();
           }
       }
@@ -352,7 +354,7 @@ ACE_Name_Handler::recv_request (void)
 /* VIRTUAL */ int
 ACE_Name_Handler::handle_input (ACE_HANDLE)
 {
-  ACE_TRACE ("ACE_Name_Handler::handle_input");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::handle_input"));
 
   if (this->recv_request () == -1)
     return -1;
@@ -363,14 +365,14 @@ ACE_Name_Handler::handle_input (ACE_HANDLE)
 int
 ACE_Name_Handler::bind (void)
 {
-  ACE_TRACE ("ACE_Name_Handler::bind");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::bind"));
   return this->shared_bind (0);
 }
 
 int
 ACE_Name_Handler::rebind (void)
 {
-  ACE_TRACE ("ACE_Name_Handler::rebind");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::rebind"));
   int result = this->shared_bind (1);
   return result == 1 ? 0 : result;
 }
@@ -378,7 +380,7 @@ ACE_Name_Handler::rebind (void)
 int
 ACE_Name_Handler::shared_bind (int rebind)
 {
-  ACE_TRACE ("ACE_Name_Handler::shared_bind");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::shared_bind"));
   ACE_NS_WString a_name (this->name_request_.name (),
                          this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
   ACE_NS_WString a_value (this->name_request_.value (),
@@ -388,7 +390,7 @@ ACE_Name_Handler::shared_bind (int rebind)
     {
 #if 0
       ACE_DEBUG ((LM_DEBUG,
-                  "request for BIND \n"));
+                  ACE_TEXT ("request for BIND \n")));
 #endif /* 0 */
       result = NAMING_CONTEXT::instance ()->bind (a_name,
                                                   a_value,
@@ -398,7 +400,7 @@ ACE_Name_Handler::shared_bind (int rebind)
     {
 #if 0
       ACE_DEBUG ((LM_DEBUG,
-                  "request for REBIND \n"));
+                  ACE_TEXT ("request for REBIND \n")));
 #endif /* 0 */
       result = NAMING_CONTEXT::instance ()->rebind (a_name,
                                                     a_value,
@@ -415,9 +417,9 @@ ACE_Name_Handler::shared_bind (int rebind)
 int
 ACE_Name_Handler::resolve (void)
 {
-  ACE_TRACE ("ACE_Name_Handler::resolve");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::resolve"));
 #if 0
-  ACE_DEBUG ((LM_DEBUG, "request for RESOLVE \n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for RESOLVE \n")));
 #endif /* 0 */
   ACE_NS_WString a_name (this->name_request_.name (),
                          this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
@@ -448,9 +450,9 @@ ACE_Name_Handler::resolve (void)
 int
 ACE_Name_Handler::unbind (void)
 {
-  ACE_TRACE ("ACE_Name_Handler::unbind");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::unbind"));
 #if 0
-  ACE_DEBUG ((LM_DEBUG, "request for UNBIND \n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for UNBIND \n")));
 #endif /* 0 */
   ACE_NS_WString a_name (this->name_request_.name (),
                          this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
@@ -464,7 +466,7 @@ ACE_Name_Handler::unbind (void)
 ACE_Name_Request
 ACE_Name_Handler::name_request (ACE_NS_WString *one_name)
 {
-  ACE_TRACE ("ACE_Name_Handler::name_request");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::name_request"));
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_name_urep (one_name->rep ());
   return ACE_Name_Request (ACE_Name_Request::LIST_NAMES,
                            one_name_urep.get (),
@@ -476,7 +478,7 @@ ACE_Name_Handler::name_request (ACE_NS_WString *one_name)
 ACE_Name_Request
 ACE_Name_Handler::value_request (ACE_NS_WString *one_value)
 {
-  ACE_TRACE ("ACE_Name_Handler::value_request");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::value_request"));
   ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_value_urep (one_value->rep ());
   return ACE_Name_Request (ACE_Name_Request::LIST_VALUES,
                            0, 0,
@@ -488,7 +490,7 @@ ACE_Name_Handler::value_request (ACE_NS_WString *one_value)
 ACE_Name_Request
 ACE_Name_Handler::type_request (ACE_NS_WString *one_type)
 {
-  ACE_TRACE ("ACE_Name_Handler::type_request");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::type_request"));
   return ACE_Name_Request (ACE_Name_Request::LIST_TYPES,
                            0, 0,
                            0, 0,
@@ -499,7 +501,7 @@ ACE_Name_Handler::type_request (ACE_NS_WString *one_type)
 int
 ACE_Name_Handler::lists (void)
 {
-  ACE_TRACE ("ACE_Name_Handler::lists");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::lists"));
 
   ACE_PWSTRING_SET set;
   ACE_NS_WString pattern (this->name_request_.name (),
@@ -550,7 +552,7 @@ ACE_Name_Handler::lists (void)
 int
 ACE_Name_Handler::lists_entries (void)
 {
-  ACE_TRACE ("ACE_Name_Handler::lists_entries");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::lists_entries"));
   ACE_BINDING_SET set;
   ACE_NS_WString pattern (this->name_request_.name (),
                           this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
@@ -569,7 +571,7 @@ ACE_Name_Handler::lists_entries (void)
     {
 #if 0
       ACE_DEBUG ((LM_DEBUG,
-                  "request for LIST_NAME_ENTRIES \n"));
+                  ACE_TEXT ("request for LIST_NAME_ENTRIES \n")));
 #endif /* 0 */
       result = NAMING_CONTEXT::instance ()->
         ACE_Naming_Context::list_name_entries (set, pattern);
@@ -578,7 +580,7 @@ ACE_Name_Handler::lists_entries (void)
     {
 #if 0
       ACE_DEBUG ((LM_DEBUG,
-                  "request for LIST_VALUE_ENTRIES \n"));
+                  ACE_TEXT ("request for LIST_VALUE_ENTRIES \n")));
 #endif /* 0 */
       result = NAMING_CONTEXT::instance ()->
         ACE_Naming_Context::list_value_entries (set, pattern);
@@ -587,7 +589,7 @@ ACE_Name_Handler::lists_entries (void)
     {
 #if 0
       ACE_DEBUG ((LM_DEBUG,
-                  "request for LIST_TYPE_ENTRIES \n"));
+                  ACE_TEXT ("request for LIST_TYPE_ENTRIES \n")));
 #endif /* 0 */
       result = NAMING_CONTEXT::instance ()->
         ACE_Naming_Context::list_type_entries (set, pattern);
@@ -639,9 +641,9 @@ ACE_Name_Handler::lists_entries (void)
 
 ACE_Name_Handler::~ACE_Name_Handler (void)
 {
-  ACE_TRACE ("ACE_Name_Handler::~ACE_Name_Handler");
+  ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::~ACE_Name_Handler"));
 #if 0
-  ACE_DEBUG ((LM_DEBUG, "closing down Handle  %d\n",
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("closing down Handle  %d\n"),
               this->get_handle ()));
 #endif /* 0 */
 }
diff --git a/netsvcs/lib/Name_Handler.h b/netsvcs/lib/Name_Handler.h
index 02e0146d13d..300da03bfdc 100644
--- a/netsvcs/lib/Name_Handler.h
+++ b/netsvcs/lib/Name_Handler.h
@@ -197,10 +197,10 @@ class ACE_Name_Acceptor : public ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOC
   //     This class contains the service-specific methods that can't
   //     easily be factored into the <ACE_Strategy_Acceptor>.
 public:
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Dynamic linking hook.
 
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse svc.conf arguments.
 
 private:
diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index e3d16f378da..abb2d82affb 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -34,7 +34,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::AC
   : receiver_ (receiver, ACE_CString (" ", 1))
 #else
   : receiver_ (receiver),
-    host_name_ (ACE_CString (" ", 1))
+    host_name_ (ACE_TString (ACE_TEXT (" "), 1))
 #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */
 {
 }
@@ -49,7 +49,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
   return result > 0 ? 0 : -1;
 }
 
-template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> const char *
+template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> const ACE_TCHAR *
 ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::host_name (void)
 {
 #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
@@ -77,14 +77,14 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
     default:
     case -1:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p at host %s\n",
-                         "server logger",
+                         ACE_TEXT ("%p at host %s\n"),
+                         ACE_TEXT ("server logger"),
                          this->host_name ()),
                         -1);
       /* NOTREACHED */
     case 0:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "closing log daemon at host %s\n",
+                         ACE_TEXT ("closing log daemon at host %C\n"),
                          this->host_name ()),
                         -1);
       /* NOTREACHED */
@@ -100,7 +100,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
 #  if 0
         u_long count = this->request_count_;
         ACE_DEBUG ((LM_DEBUG,
-                    "request count = %d, length = %d\n",
+                    ACE_TEXT ("request count = %d, length = %d\n"),
                     count,
                     length));
 #  endif /* 0 */
@@ -111,10 +111,10 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
                                           length);
         if (n != length)
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "%d != %d, %p at host %s\n",
+                             ACE_TEXT ("%d != %d, %p at host %C\n"),
                              n,
                              length,
-                             "server logger",
+                             ACE_TEXT ("server logger"),
                              this->host_name ()),
                             -1);
 
@@ -135,7 +135,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
           }
         else
           ACE_ERROR ((LM_ERROR,
-                      "error, lp.length = %d, n = %d\n",
+                      ACE_TEXT ("error, lp.length = %d, n = %d\n"),
                       lp.length (),
                       n));
         return n;
@@ -154,26 +154,28 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::op
   // Shut off non-blocking IO if it was enabled...
   if (this->peer ().disable (ACE_NONBLOCK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "disable"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("disable")),
                       -1);
   ACE_PEER_STREAM_ADDR client_addr;
 
   // Determine the address of the client and display it.
   if (this->peer ().get_remote_addr (client_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_remote_addr"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_remote_addr")),
                       -1);
 
 #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
-  this->receiver_.m_ = ACE_CString (client_addr.get_host_name ());
+  this->receiver_.m_ =
+    ACE_TString (ACE_TEXT_CHAR_TO_TCHAR (client_addr.get_host_name ()));
 #else
-  this->host_name_ = ACE_CString (client_addr.get_host_name ());
+  this->host_name_ =
+    ACE_TString (ACE_TEXT_CHAR_TO_TCHAR (client_addr.get_host_name ()));
 #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%t) accepted connection from host %s on fd %d\n",
+              ACE_TEXT ("(%t) accepted connection from host %C on fd %d\n"),
               client_addr.get_host_name (),
               this->peer ().get_handle ()));
 
@@ -202,9 +204,9 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::scheduling_strategy (void)
 }
 
 template<class SLH, class LMR, class SST> int
-ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, char *argv[])
+ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRACE ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init");
+  ACE_TRACE (ACE_TEXT ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init"));
 
   // Use the options hook to parse the command line arguments and set
   // options.
@@ -216,11 +218,11 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, char *argv[])
                   ACE_Reactor::instance (),
                   0, 0, 0,
                   &this->scheduling_strategy(),
-                  "Logging Server",
-                  "ACE logging service") == -1)
+                  ACE_TEXT ("Logging Server"),
+                  ACE_TEXT ("ACE logging service")) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%n: %p on port %d\n",
-                       "acceptor::open failed",
+                       ACE_TEXT ("%n: %p on port %d\n"),
+                       ACE_TEXT ("acceptor::open failed"),
                        this->service_addr_.get_port_number ()),
                       -1);
   // Ignore SIGPIPE so that each <SVC_HANDLER> can handle this on its
@@ -233,26 +235,26 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, char *argv[])
   // Figure out what port we're really bound to.
   if (this->acceptor ().get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_local_addr"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_local_addr")),
                       -1);
   ACE_DEBUG ((LM_DEBUG,
-              "starting up Logging Server at port %d on handle %d\n",
-             server_addr.get_port_number (),
-             this->acceptor ().get_handle ()));
+              ACE_TEXT ("starting up Logging Server at port %d on handle %d\n"),
+              server_addr.get_port_number (),
+              this->acceptor ().get_handle ()));
   return 0;
 }
 
 template<class SLH, class LMR, class SST> int
-ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, char *argv[])
+ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRACE ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args");
+  ACE_TRACE (ACE_TEXT ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args"));
 
   int service_port = ACE_DEFAULT_SERVER_PORT;
 
-  ACE_LOG_MSG->open ("Logging Service");
+  ACE_LOG_MSG->open (ACE_TEXT ("Logging Service"));
 
-  ACE_Get_Opt get_opt (argc, argv, "p:", 0);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -263,8 +265,8 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, char *argv[]
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                            "%n:\n[-p server-port]\n%a", 1),
-                           -1);
+                             ACE_TEXT ("%n:\n[-p server-port]\n")),
+                            -1);
         }
     }
 
@@ -339,8 +341,8 @@ ACE_Thr_Server_Logging_Handler<LOG_MESSAGE_RECEIVER>::open (void *)
   // control all the threads.
   if (this->activate (THR_BOUND | THR_DETACHED) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "spawn"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("spawn")),
                       -1);
   return 0;
 }
diff --git a/netsvcs/lib/Server_Logging_Handler_T.h b/netsvcs/lib/Server_Logging_Handler_T.h
index 229e4aeb339..4cf1a5d3fbc 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.h
+++ b/netsvcs/lib/Server_Logging_Handler_T.h
@@ -76,9 +76,9 @@ protected:
   // a class with no instance data.
 #else
   LOG_MESSAGE_RECEIVER receiver_;
-  ACE_CString host_name_;
+  ACE_TString host_name_;
 #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */
-  const char *host_name (void);
+  const ACE_TCHAR *host_name (void);
   // Name of the host we are connected to.
 
   LOG_MESSAGE_RECEIVER &receiver (void){ return receiver_; }
@@ -106,11 +106,11 @@ class ACE_Server_Logging_Acceptor_T : public ACE_Strategy_Acceptor<SERVER_LOGGIN
   //     easily be factored into the <ACE_Strategy_Acceptor>.
 public:
   ACE_Server_Logging_Acceptor_T (void);
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Dynamic linking hook.
 
 protected:
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse svc.conf arguments.
 
   virtual int make_svc_handler (SERVER_LOGGING_HANDLER *&);
diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp
index d8e6a3d7612..8346156fa47 100644
--- a/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -28,7 +28,7 @@ ACE_TS_Clerk_Handler::ACE_TS_Clerk_Handler (ACE_TS_Clerk_Processor *processor,
 void
 ACE_TS_Clerk_Handler::state (ACE_TS_Clerk_Handler::State state)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::state");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::state"));
   this->state_ = state;
 }
 
@@ -36,7 +36,7 @@ ACE_TS_Clerk_Handler::state (ACE_TS_Clerk_Handler::State state)
 ACE_TS_Clerk_Handler::State
 ACE_TS_Clerk_Handler::state (void)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::state");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::state"));
   return this->state_;
 }
 
@@ -44,7 +44,7 @@ ACE_TS_Clerk_Handler::state (void)
 void
 ACE_TS_Clerk_Handler::timeout (int to)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::timeout");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::timeout"));
   if (to > this->max_timeout_)
     to = this->max_timeout_;
 
@@ -57,7 +57,7 @@ ACE_TS_Clerk_Handler::timeout (int to)
 int
 ACE_TS_Clerk_Handler::timeout (void)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::timeout");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::timeout"));
   int old_timeout = this->timeout_;
   this->timeout_ *= 2;
 
@@ -79,7 +79,7 @@ ACE_TS_Clerk_Handler::handle_signal (int, siginfo_t *, ucontext_t *)
 void
 ACE_TS_Clerk_Handler::max_timeout (int mto)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::max_timeout");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::max_timeout"));
   this->max_timeout_ = mto;
 }
 
@@ -87,14 +87,14 @@ ACE_TS_Clerk_Handler::max_timeout (int mto)
 int
 ACE_TS_Clerk_Handler::max_timeout (void)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::max_timeout");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::max_timeout"));
   return this->max_timeout_;
 }
 
 int
 ACE_TS_Clerk_Handler::open (void *)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::open");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::open"));
   ACE_INET_Addr server_addr;
 
   // Set connection state as established
@@ -104,23 +104,26 @@ ACE_TS_Clerk_Handler::open (void *)
   // reconnections.
 #if !defined (ACE_WIN32)
   if (ACE_Reactor::instance ()->register_handler (SIGPIPE, this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%n: %p\n",
-                       "register_handler (SIGPIPE)"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%n: %p\n"),
+                       ACE_TEXT ("register_handler (SIGPIPE)")), -1);
 #endif /* ACE_WIN32 */
 
   // Register ourselves with the reactor to receive input
   if (ACE_Reactor::instance ()->register_handler (this->get_handle (),
-                                                        this,
+                                                  this,
                                                         ACE_Event_Handler::READ_MASK |
                                                         ACE_Event_Handler::EXCEPT_MASK) == -1)
-    ACE_ERROR ((LM_ERROR, "%n: %p\n", "register_handler (this)"));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("%n: %p\n"),
+                ACE_TEXT ("register_handler (this)")));
 
   // Figure out what remote port we're really bound to.
   else if (this->peer ().get_remote_addr (server_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_remote_addr"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_remote_addr")),
+                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "TS Clerk Daemon connected to port %d on handle %d\n",
+              ACE_TEXT ("TS Clerk Daemon connected to port %d on handle %d\n"),
               server_addr.get_port_number (),
               this->peer ().get_handle ()));
 
@@ -130,7 +133,7 @@ ACE_TS_Clerk_Handler::open (void *)
 ACE_HANDLE
 ACE_TS_Clerk_Handler::get_handle (void) const
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::get_handle");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::get_handle"));
   return this->peer().get_handle ();
 }
 
@@ -138,10 +141,11 @@ int
 ACE_TS_Clerk_Handler::handle_close (ACE_HANDLE,
                                     ACE_Reactor_Mask mask)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::handle_close");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::handle_close"));
   ACE_UNUSED_ARG (mask);
 
-  ACE_DEBUG ((LM_DEBUG, "(%t) shutting down on handle %d\n", this->get_handle ()));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shutting down on handle %d\n"),
+              this->get_handle ()));
 
   return this->reinitiate_connection ();
 }
@@ -149,7 +153,7 @@ ACE_TS_Clerk_Handler::handle_close (ACE_HANDLE,
 int
 ACE_TS_Clerk_Handler::reinitiate_connection (void)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::reinitiate_connection");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::reinitiate_connection"));
   // Skip over deactivated descriptors.
 
   // Set state to connecting so that we don't try to send anything
@@ -157,12 +161,14 @@ ACE_TS_Clerk_Handler::reinitiate_connection (void)
   this->state (ACE_TS_Clerk_Handler::CONNECTING);
   if (this->get_handle () != ACE_INVALID_HANDLE)
     {
-      ACE_DEBUG ((LM_DEBUG, "(%t) Scheduling reinitiation of connection\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("(%t) Scheduling reinitiation of connection\n")));
 
       // Reschedule ourselves to try and connect again.
       if (ACE_Reactor::instance ()->schedule_timer (this, 0,
-                                                          this->timeout ()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_timer"), -1);
+                                                    this->timeout ()) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
+                           ACE_TEXT ("schedule_timer")), -1);
     }
   return 0;
 }
@@ -171,7 +177,7 @@ ACE_TS_Clerk_Handler::reinitiate_connection (void)
 int
 ACE_TS_Clerk_Handler::handle_input (ACE_HANDLE)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::handle_input");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::handle_input"));
   // We're getting a time update message from a server
   ACE_Time_Request reply;
   if (this->recv_reply (reply) != 0)
@@ -201,9 +207,9 @@ int
 ACE_TS_Clerk_Handler::handle_timeout (const ACE_Time_Value &,
                                       const void *)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::handle_timeout");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::handle_timeout"));
   ACE_DEBUG ((LM_DEBUG,
-              "(%t) attempting to reconnect to server with timeout = %d\n",
+              ACE_TEXT ("(%t) attempting to reconnect to server with timeout = %d\n"),
               this->timeout_));
 
   // Close down peer to reclaim descriptor if need be. Note this is
@@ -216,21 +222,21 @@ ACE_TS_Clerk_Handler::handle_timeout (const ACE_Time_Value &,
 void
 ACE_TS_Clerk_Handler::remote_addr (ACE_INET_Addr &addr)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::remote_addr");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::remote_addr"));
   this->remote_addr_ = addr;
 }
 
 ACE_INET_Addr &
 ACE_TS_Clerk_Handler::remote_addr (void)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::remote_addr");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::remote_addr"));
   return this->remote_addr_;
 }
 
 int
 ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::recv_reply");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::recv_reply"));
   const int bytes_expected = reply.size ();
 
   // Since Time_Request messages are fixed size, read the entire
@@ -243,10 +249,10 @@ ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply)
         {
         case -1:
           // FALLTHROUGH
-          ACE_DEBUG ((LM_DEBUG, "****************** recv_reply returned -1\n"));
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("****************** recv_reply returned -1\n")));
         default:
-          ACE_ERROR ((LM_ERROR, "%p got %d bytes, expected %d bytes\n",
-                      "recv failed", n, bytes_expected));
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
+                      ACE_TEXT ("recv failed"), n, bytes_expected));
           // FALLTHROUGH
         case 0:
           // We've shutdown unexpectedly
@@ -255,7 +261,8 @@ ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply)
         }
     }
   else if (reply.decode () == -1)       // Decode the request into host byte order.
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "decode failed"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("decode failed")), -1);
   return 0;
 }
 
@@ -263,7 +270,7 @@ ACE_TS_Clerk_Handler::recv_reply (ACE_Time_Request &reply)
 int
 ACE_TS_Clerk_Handler::send_request (ACE_UINT32 sequence_num, ACE_Time_Info &time_info)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Handler::send_request");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Handler::send_request"));
   void    *buffer;
   ssize_t length;
 
@@ -278,7 +285,8 @@ ACE_TS_Clerk_Handler::send_request (ACE_UINT32 sequence_num, ACE_Time_Info &time
   ACE_Time_Request request (ACE_Time_Request::TIME_UPDATE, 0, 0);
 
   if ((length = request.encode (buffer)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "encode failed"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("encode failed")), -1);
 
   // Compute start time of sending request (needed to compute
   // roundtrip delay)
@@ -286,7 +294,9 @@ ACE_TS_Clerk_Handler::send_request (ACE_UINT32 sequence_num, ACE_Time_Info &time
 
   // Send the request
   if (this->peer ().send_n (buffer, length) != length)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "send_n failed"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("send_n failed")),
+                      -1);
 
   return 0;
 }
@@ -305,13 +315,13 @@ ACE_TS_Clerk_Processor::ACE_TS_Clerk_Processor ()
                          MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX
     {
       ACE_ERROR ((LM_ERROR,
-                  "Temporary path too long, "
-                  "defaulting to current directory\n"));
+                  ACE_TEXT ("Temporary path too long, ")
+                  ACE_TEXT ("defaulting to current directory\n")));
       this->poolname_[0] = 0;
     }
 
   // Add the filename to the end
-  ACE_OS::strcat (this->poolname_, "ace-malloc-XXXXXX");
+  ACE_OS::strcat (this->poolname_, ACE_TEXT ("ace-malloc-XXXXXX"));
 
 #endif /* ACE_DEFAULT_BACKING_STORE */
 }
@@ -319,7 +329,7 @@ ACE_TS_Clerk_Processor::ACE_TS_Clerk_Processor ()
 void
 ACE_TS_Clerk_Processor::alloc (void)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Processor::alloc");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::alloc"));
   ACE_NEW (this->shmem_, ALLOCATOR (this->poolname_));
 
   // Only create the state if it doesn't already exist.
@@ -347,14 +357,14 @@ int
 ACE_TS_Clerk_Processor::handle_timeout (const ACE_Time_Value &,
                                         const void *)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Processor::handle_timeout");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::handle_timeout"));
   return this->update_time ();
 }
 
 int
 ACE_TS_Clerk_Processor::update_time ()
 {
-  ACE_TRACE ("ACE_TS_Clerk_Processor::update_time");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::update_time"));
   ACE_UINT32 expected_sequence_num = this->cur_sequence_num_;
 
   // Increment sequence number
@@ -380,7 +390,9 @@ ACE_TS_Clerk_Processor::update_time ()
                    time_info.sequence_num_ == expected_sequence_num)
             {
               count++;
-              ACE_DEBUG ((LM_DEBUG, "[%d] Delta time: %d\n", count, time_info.delta_time_));
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("[%d] Delta time: %d\n"),
+                          count, time_info.delta_time_));
 
               // #### Can check here if delta value falls within a threshold ####
               total_delta += time_info.delta_time_;
@@ -406,7 +418,8 @@ ACE_TS_Clerk_Processor::update_time ()
   // Update the last local time
   *(this->system_time_.last_local_time_) = ACE_OS::time (0);
 
-  ACE_DEBUG ((LM_DEBUG, "Average delta time: %d\n", *(this->system_time_.delta_time_)));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Average delta time: %d\n"),
+              *(this->system_time_.delta_time_)));
   return 0;
 }
 
@@ -414,7 +427,7 @@ ACE_TS_Clerk_Processor::update_time ()
 int
 ACE_TS_Clerk_Processor::fini (void)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Processor::fini");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::fini"));
 
   // Cancel the timer
   if (this->timer_id_ != -1)
@@ -444,16 +457,16 @@ ACE_TS_Clerk_Processor::fini (void)
 }
 
 int
-ACE_TS_Clerk_Processor::info (char **, size_t) const
+ACE_TS_Clerk_Processor::info (ACE_TCHAR **, size_t) const
 {
-  ACE_TRACE ("ACE_TS_Clerk_Processor::info");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::info"));
   return 0;
 }
 
 int
-ACE_TS_Clerk_Processor::init (int argc, char *argv[])
+ACE_TS_Clerk_Processor::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRACE ("ACE_TS_Clerk_Processor::init");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::init"));
   // Use the options hook to parse the command line arguments and set
   // options.
   this->parse_args (argc, argv);
@@ -481,9 +494,9 @@ ACE_TS_Clerk_Processor::init (int argc, char *argv[])
   // Now set up timer to receive updates from server
   // set the timer to go off after timeout value
   this->timer_id_ = ACE_Reactor::instance ()->schedule_timer (this,
-                                                                    NULL,
-                                                                    ACE_Time_Value (this->timeout_),
-                                                                    ACE_Time_Value (this->timeout_));
+                                                              NULL,
+                                                              ACE_Time_Value (this->timeout_),
+                                                              ACE_Time_Value (this->timeout_));
   return 0;
 }
 
@@ -491,16 +504,16 @@ int
 ACE_TS_Clerk_Processor::initiate_connection (ACE_TS_Clerk_Handler *handler,
                                              ACE_Synch_Options &synch_options)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Processor::initiate_connection");
-  char buf[MAXHOSTNAMELEN + 1];
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::initiate_connection"));
+  ACE_TCHAR buf[MAXHOSTNAMELEN + 1];
 
   // Mark ourselves as idle so that the various iterators will ignore
   // us until we are connected/reconnected.
   handler->state (ACE_TS_Clerk_Handler::IDLE);
 
-  if (handler->remote_addr ().addr_to_string (buf, sizeof buf) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n",
-                      "can't obtain peer's address"), -1);
+  if (handler->remote_addr ().addr_to_string (buf, MAXHOSTNAMELEN) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
+                      ACE_TEXT ("can't obtain peer's address")), -1);
 
   // Establish connection with the server.
   if (this->connect (handler,
@@ -510,15 +523,17 @@ ACE_TS_Clerk_Processor::initiate_connection (ACE_TS_Clerk_Handler *handler,
       if (errno != EWOULDBLOCK)
         {
           handler->state (ACE_TS_Clerk_Handler::FAILED);
-          ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", "connect", buf));
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %p on address %s\n"),
+                      ACE_TEXT ("connect"), buf));
 
           // Reschedule ourselves to try and connect again.
           if (synch_options[ACE_Synch_Options::USE_REACTOR])
             {
               if (ACE_Reactor::instance ()->schedule_timer (handler,
-                                                                  0,
-                                                                  handler->timeout ()) == -1)
-                ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "schedule_timer"), -1);
+                                                            0,
+                                                            handler->timeout ()) == -1)
+                ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
+                                   ACE_TEXT ("schedule_timer")), -1);
             }
           else
             // Failures on synchronous connects are reported as errors
@@ -529,34 +544,29 @@ ACE_TS_Clerk_Processor::initiate_connection (ACE_TS_Clerk_Handler *handler,
         {
           handler->state (ACE_TS_Clerk_Handler::CONNECTING);
           ACE_DEBUG ((LM_DEBUG,
-                     "(%t) in the process of connecting %s to %s\n",
-                      synch_options[ACE_Synch_Options::USE_REACTOR]
-                      ? "asynchronously" : "synchronously", buf));
+                      ACE_TEXT ("(%t) in the process of connecting %s to %s\n"),
+                      synch_options[ACE_Synch_Options::USE_REACTOR] ?
+                       ACE_TEXT ("asynchronously") : ACE_TEXT ("synchronously"),
+                      buf));
         }
     }
   else
     {
       handler->state (ACE_TS_Clerk_Handler::ESTABLISHED);
-      ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n",
-                 buf, handler->get_handle ()));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) connected to %s on %d\n"),
+                  buf, handler->get_handle ()));
     }
   return 0;
 }
 
 int
-ACE_TS_Clerk_Processor::parse_args (int argc, char *argv[])
+ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRACE ("ACE_TS_Clerk_Processor::parse_args");
+  ACE_TRACE (ACE_TESXT ("ACE_TS_Clerk_Processor::parse_args"));
   ACE_INET_Addr server_addr;
   ACE_TS_Clerk_Handler *handler;
-  char server_host[BUFSIZ];
 
-  // Create a default entry
-  ACE_OS::sprintf (server_host, "%s:%d",
-                   ACE_DEFAULT_SERVER_HOST,
-                   ACE_DEFAULT_LOGGING_SERVER_PORT);
-
-  ACE_Get_Opt get_opt (argc, argv, "h:t:p:b", 0);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("h:t:p:b"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -581,7 +591,7 @@ ACE_TS_Clerk_Processor::parse_args (int argc, char *argv[])
         case 'p':
           // Get the poolname
           ACE_OS::strncpy (this->poolname_,
-                           ACE_TEXT_CHAR_TO_TCHAR (get_opt.opt_arg ()),
+                           get_opt.opt_arg (),
                            sizeof this->poolname_ / sizeof (ACE_TCHAR));
           break;
         case 'b':
@@ -590,7 +600,7 @@ ACE_TS_Clerk_Processor::parse_args (int argc, char *argv[])
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "%n:\n[-h hostname:port] [-t timeout] [-p poolname]\n%a", 1),
+                             ACE_TEXT ("%n:\n[-h hostname:port] [-t timeout] [-p poolname]\n")),
                             -1);
         }
     }
@@ -600,14 +610,14 @@ ACE_TS_Clerk_Processor::parse_args (int argc, char *argv[])
 int
 ACE_TS_Clerk_Processor::suspend (void)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Processor::suspend");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::suspend"));
   return 0;
 }
 
 int
 ACE_TS_Clerk_Processor::resume (void)
 {
-  ACE_TRACE ("ACE_TS_Clerk_Processor::resume");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Clerk_Processor::resume"));
   return 0;
 }
 
diff --git a/netsvcs/lib/TS_Clerk_Handler.h b/netsvcs/lib/TS_Clerk_Handler.h
index 8e44d8cb2e3..efad8fac6e1 100644
--- a/netsvcs/lib/TS_Clerk_Handler.h
+++ b/netsvcs/lib/TS_Clerk_Handler.h
@@ -190,13 +190,13 @@ public:
 
 protected:
   // = Dynamic linking hooks.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Called when service is linked.
 
   virtual int fini (void);
   // Called when service is unlinked.
 
-  virtual int info (char **strp, size_t length) const;
+  virtual int info (ACE_TCHAR **strp, size_t length) const;
   // Called to determine info about the service.
 
   // = Scheduling hooks.
@@ -204,7 +204,7 @@ protected:
   virtual int resume (void);
 
 private:
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse svc.conf arguments.
 
   void alloc (void);
diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp
index 74745f9d362..d0a87fd4c84 100644
--- a/netsvcs/lib/TS_Server_Handler.cpp
+++ b/netsvcs/lib/TS_Server_Handler.cpp
@@ -38,15 +38,15 @@ template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 int
-ACE_TS_Server_Acceptor::parse_args (int argc, char *argv[])
+ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRACE ("ACE_TS_Server_Acceptor::parse_args");
 
   int service_port = ACE_DEFAULT_SERVER_PORT;
 
-  ACE_LOG_MSG->open ("Time Service");
+  ACE_LOG_MSG->open (ACE_TEXT ("Time Service"));
 
-  ACE_Get_Opt get_opt (argc, argv, "p:", 0);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -57,7 +57,7 @@ ACE_TS_Server_Acceptor::parse_args (int argc, char *argv[])
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                            "%n:\n[-p server-port]\n%a", 1),
+                            ACE_TEXT ("%n:\n[-p server-port]\n"), 1),
                            -1);
         }
     }
@@ -66,9 +66,9 @@ ACE_TS_Server_Acceptor::parse_args (int argc, char *argv[])
 }
 
 int
-ACE_TS_Server_Acceptor::init (int argc, char *argv[])
+ACE_TS_Server_Acceptor::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRACE ("ACE_TS_Server_Acceptor::init");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Acceptor::init"));
 
   // Use the options hook to parse the command line arguments and set
   // options.
@@ -79,10 +79,11 @@ ACE_TS_Server_Acceptor::init (int argc, char *argv[])
   if (this->open (this->service_addr_, ACE_Reactor::instance (),
                   0, 0, 0,
                   &this->scheduling_strategy_,
-                  "Time Server", "ACE time service") == -1)
+                  ACE_TEXT ("Time Server"),
+                  ACE_TEXT ("ACE time service")) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%n: %p on port %d\n",
-                       "acceptor::open failed",
+                       ACE_TEXT ("%n: %p on port %d\n"),
+                       ACE_TEXT ("acceptor::open failed"),
                        this->service_addr_.get_port_number ()),
                       -1);
 
@@ -96,14 +97,14 @@ ACE_TS_Server_Acceptor::init (int argc, char *argv[])
   // Figure out what port we're really bound to.
   if (this->acceptor ().get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_local_addr"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_local_addr")),
                       -1);
 
   ACE_DEBUG ((LM_DEBUG,
-              "starting up Time Server at port %d on handle %d\n",
-             server_addr.get_port_number (),
-             this->acceptor ().get_handle ()));
+              ACE_TEXT ("starting up Time Server at port %d on handle %d\n"),
+              server_addr.get_port_number (),
+              this->acceptor ().get_handle ()));
   return 0;
 }
 
@@ -116,7 +117,7 @@ ACE_SVC_FACTORY_DEFINE (ACE_TS_Server_Acceptor)
 ACE_TS_Server_Handler::ACE_TS_Server_Handler (ACE_Thread_Manager *tm)
   : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (tm)
 {
-  ACE_TRACE ("ACE_TS_Server_Handler::ACE_TS_Server_Handler");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::ACE_TS_Server_Handler"));
 }
 
 // Activate this instance of the ACE_TS_Server_Handler (called by the
@@ -125,27 +126,27 @@ ACE_TS_Server_Handler::ACE_TS_Server_Handler (ACE_Thread_Manager *tm)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::open (void *)
 {
-  ACE_TRACE ("ACE_TS_Server_Handler::open");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::open"));
 
   ACE_INET_Addr client_addr;
 
   // Determine the address of the client and display it.
   if (this->peer ().get_remote_addr (client_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_remote_addr"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("get_remote_addr")),
                       -1);
   
   ACE_DEBUG ((LM_DEBUG,
-              "(%t) accepted connection from host %s on fd %d\n",
+              ACE_TEXT ("(%t) accepted connection from host %s on fd %d\n"),
               client_addr.get_host_name (),
               this->peer ().get_handle ()));
 
   // Call down to our parent to register ourselves with the Reactor.
   if (ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::open (0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("open")),
                       -1);
   return 0;
 }
@@ -153,22 +154,22 @@ ACE_TS_Server_Handler::open (void *)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::send_request (ACE_Time_Request &request)
 {
-  ACE_TRACE ("ACE_TS_Server_Handler::send_request");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::send_request"));
   void *buffer;
   ssize_t length = request.encode (buffer);
 
   if (length == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "encode failed"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("encode failed")),
                       -1);
 
   // Transmit request via a blocking send.
 
   if (this->peer ().send_n (buffer, length) != length)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "send_n failed"),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("send_n failed")),
                       -1);
   return 0;
 }
@@ -179,7 +180,7 @@ ACE_TS_Server_Handler::send_request (ACE_Time_Request &request)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::abandon (void)
 {
-  ACE_TRACE ("ACE_TS_Server_Handler::abandon");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::abandon"));
 
   // Note we are using the time field to report the errno in case of
   // failure.
@@ -191,7 +192,7 @@ ACE_TS_Server_Handler::abandon (void)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::handle_timeout (const ACE_Time_Value &, const void *)
 {
-  ACE_TRACE ("ACE_TS_Server_Handler::handle_timeout");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::handle_timeout"));
   return this->abandon ();
 }
 
@@ -200,7 +201,7 @@ ACE_TS_Server_Handler::handle_timeout (const ACE_Time_Value &, const void *)
 /* VIRTUAL */ ACE_HANDLE
 ACE_TS_Server_Handler::get_handle (void) const
 {
-  ACE_TRACE ("ACE_TS_Server_Handler::get_handle");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::get_handle"));
   return this->peer ().get_handle ();
 }
 
@@ -209,7 +210,7 @@ ACE_TS_Server_Handler::get_handle (void) const
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::dispatch (void)
 {
-  ACE_TRACE ("ACE_TS_Server_Handler::dispatch");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::dispatch"));
   // Get the system time and then create an ACE_Time_Request
   time_t t = ACE_OS::time (0);
   ACE_Time_Request rq (ACE_Time_Request::TIME_UPDATE, t);
@@ -222,7 +223,7 @@ ACE_TS_Server_Handler::dispatch (void)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::recv_request (void)
 {
-  ACE_TRACE ("ACE_TS_Server_Handler::recv_request");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::recv_request"));
   ssize_t bytes_expected = this->time_request_.size ();
 
   // Since Time_Request messages are fixed size, read the entire
@@ -234,11 +235,12 @@ ACE_TS_Server_Handler::recv_request (void)
         {
         case -1:
           /* FALLTHROUGH */
-          ACE_DEBUG ((LM_DEBUG, "****************** recv_request returned -1\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("****************** recv_request returned -1\n")));
         default:
           ACE_ERROR ((LM_ERROR,
-                      "%p got %d bytes, expected %d bytes\n",
-                      "recv failed",
+                      ACE_TEXT ("%p got %d bytes, expected %d bytes\n"),
+                      ACE_TEXT ("recv failed"),
                       n,
                       bytes_expected));
           /* FALLTHROUGH */
@@ -255,7 +257,9 @@ ACE_TS_Server_Handler::recv_request (void)
       // Decode the request into host byte order.
       if (this->time_request_.decode () == -1)
         {
-          ACE_ERROR ((LM_ERROR, "%p\n", "decode failed"));
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("%p\n"),
+                      ACE_TEXT ("decode failed")));
           return this->abandon ();
         }
     }
@@ -268,7 +272,7 @@ ACE_TS_Server_Handler::recv_request (void)
 /* VIRTUAL */ int
 ACE_TS_Server_Handler::handle_input (ACE_HANDLE)
 {
-  ACE_TRACE ("ACE_TS_Server_Handler::handle_input");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::handle_input"));
 
   if (this->recv_request () == -1)
     return -1;
@@ -278,8 +282,8 @@ ACE_TS_Server_Handler::handle_input (ACE_HANDLE)
 
 ACE_TS_Server_Handler::~ACE_TS_Server_Handler (void)
 {
-  ACE_TRACE ("ACE_TS_Server_Handler::~ACE_TS_Server_Handler");
+  ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::~ACE_TS_Server_Handler"));
   ACE_DEBUG ((LM_DEBUG,
-              "closing down Handle %d\n",
+              ACE_TEXT ("closing down Handle %d\n"),
               this->get_handle ()));
 }
diff --git a/netsvcs/lib/TS_Server_Handler.h b/netsvcs/lib/TS_Server_Handler.h
index 3ab5e51427a..4aee2da517e 100644
--- a/netsvcs/lib/TS_Server_Handler.h
+++ b/netsvcs/lib/TS_Server_Handler.h
@@ -100,10 +100,10 @@ class ACE_TS_Server_Acceptor : public ACE_Strategy_Acceptor<ACE_TS_Server_Handle
   //     easily be factored into the <ACE_Strategy_Acceptor>.
 
 public:
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   // Dynamic linking hook.
 
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse svc.conf arguments.
 
 private: