*** empty log message ***

26 files changed, 725 insertions, 214 deletions

diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index dc9115d9b50..a0861c66c16 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -470,9 +470,9 @@ DRV_get_orb_idl_includes (void)
 
   if (fd == 0) {
     ACE_ERROR ((LM_ERROR,
-		"%s%s",
-		orb_idl_path.fast_rep (),
-		": cannot open input file\n"));
+                "%s%s",
+                orb_idl_path.fast_rep (),
+                ": cannot open input file\n"));
 
     ACE_OS::exit (99);
   }
@@ -560,18 +560,6 @@ DRV_copy_input (FILE *fin,
   ACE_OS::fclose (f);
 }
 
-#ifdef ACE_LACKS_MKSTEMP
-static void
-DRV_copy_input (FILE *fin,
-                const char *fn,
-                const char *orig_filename)
-{
-  FILE *f = ACE_OS::fopen (fn, "w");
-
-  ::DRV_copy_input (fin, f, fn, orig_filename);
-}
-#endif  /* ACE_LACKS_MKSTEMP */
-
 // Strip down a name to the last component,
 // i.e. everything after the last '/' or '\' character.
 static char *
@@ -614,28 +602,11 @@ DRV_pre_proc (const char *myfile)
   const char* tmpdir = idl_global->temp_dir ();
   static const char temp_file_extension[] = ".cpp";
 
-  // If ACE_LACKS_MKSTEMP is defined, we use ACE's uuid generator
-  // to create a unique id to append to tao_idl*_template to get
-  // unique temporary file names.
-  size_t uuid_len = 0;
-
-#ifdef ACE_LACKS_MKSTEMP
-
-  static const char tao_idlf_template[] = "tao-idlf_";
-  static const char tao_idli_template[] = "tao-idli_";
-
-  // The generated string format has 32 characters and 4 dashes.
-  uuid_len = 36;
-
-#else
-
-  static const char tao_idlf_template[] = "tao-idlf_XXXXXX";
-  static const char tao_idli_template[] = "tao-idli_XXXXXX";
-
-#endif  /* ACE_LACKS_MKSTEMP */
+  static char const tao_idlf_template[] = "tao-idlf_XXXXXX";
+  static char const tao_idli_template[] = "tao-idli_XXXXXX";
 
-  size_t tlen =
-    ACE_OS::strlen (tmpdir) + sizeof (temp_file_extension) + uuid_len;
+  size_t const tlen =
+    ACE_OS::strlen (tmpdir) + sizeof (temp_file_extension);
 
   // Prevent a buffer overrun.
   if (tlen + sizeof (tao_idlf_template) > sizeof (tmp_file)
@@ -652,37 +623,14 @@ DRV_pre_proc (const char *myfile)
   ACE_OS::strcpy (tmp_file,  tmpdir);
   ACE_OS::strcpy (tmp_ifile, tmpdir);
 
-#ifdef ACE_LACKS_MKSTEMP
-
-  ACE_CString ftmpl (tao_idlf_template);
-  ACE_CString itmpl (tao_idli_template);
-
-  // Append temporary filename template to temporary directory.
-  ACE_OS::strcat (tmp_file,  ftmpl.substr (0, 9).c_str ());
-  ACE_OS::strcat (tmp_ifile, itmpl.substr (0, 9).c_str ());
-
-  ACE_CString uuid = FE_generate_UUID ();
-
-  const char *suffix = uuid.c_str ();
-
-  ACE_OS::strcat (tmp_file, suffix);
-  ACE_OS::strcat (tmp_ifile, suffix);
-  ACE_OS::strcat (tmp_file,  temp_file_extension);
-  ACE_OS::strcat (tmp_ifile, temp_file_extension);
-
-  char * t_file  = tmp_file;
-  char * t_ifile = tmp_ifile;
-
-#else
-
   // Append temporary filename template to temporary directory.
   ACE_OS::strcat (tmp_file,  tao_idlf_template);
   ACE_OS::strcat (tmp_ifile, tao_idli_template);
 
-  int ti_fd = ACE_OS::mkstemp (tmp_ifile);
-  int tf_fd = ACE_OS::mkstemp (tmp_file);
+  ACE_HANDLE const ti_fd = ACE_OS::mkstemp (tmp_ifile);
+  ACE_HANDLE const tf_fd = ACE_OS::mkstemp (tmp_file);
 
-  if (ti_fd == -1 || tf_fd == -1)
+  if (ti_fd == ACE_INVALID_HANDLE || tf_fd == ACE_INVALID_HANDLE)
     {
       ACE_ERROR ((LM_ERROR,
                   "%s: Unable to create temporary file: %m\n",
@@ -691,8 +639,8 @@ DRV_pre_proc (const char *myfile)
       return;
     }
 
-  static char tmp_cpp_file [MAXPATHLEN + 1] = { 0 };
-  static char tmp_cpp_ifile[MAXPATHLEN + 1] = { 0 };
+  char tmp_cpp_file [MAXPATHLEN + 1] = { 0 };
+  char tmp_cpp_ifile[MAXPATHLEN + 1] = { 0 };
 
   // Append C++ source file extension.  Temporary files will be renamed
   // to these filenames.
@@ -701,27 +649,22 @@ DRV_pre_proc (const char *myfile)
   ACE_OS::strcat (tmp_cpp_file,  temp_file_extension);
   ACE_OS::strcat (tmp_cpp_ifile, temp_file_extension);
 
-  char * t_file  = tmp_cpp_file;
-  char * t_ifile = tmp_cpp_ifile;
+  char * const t_file  = tmp_cpp_file;
+  char * const t_ifile = tmp_cpp_ifile;
 
   ACE_OS::close (tf_fd);
 
-#endif  /* ACE_LACKS_MKSTEMP */
-
   // Rename temporary files so that they have extensions accepted
   // by the preprocessor.
 
-  UTL_String *tmp = 0;
-
-  FILE *file = ACE_OS::fopen (myfile, "r");
+  FILE * const file = ACE_OS::fopen (myfile, "r");
   DRV_copy_input (file,
-#ifndef ACE_LACKS_MKSTEMP
                   ACE_OS::fdopen (ti_fd, "w"),
-#endif  /* !ACE_LACKS_MKSTEMP */
                   tmp_ifile,
                   myfile);
   ACE_OS::fclose (file);
 
+  UTL_String *tmp = 0;
   ACE_NEW (tmp,
            UTL_String (myfile));
   idl_global->set_main_filename (tmp);
@@ -750,7 +693,6 @@ DRV_pre_proc (const char *myfile)
 
   cpp_options.command_line (arglist);
 
-#ifndef ACE_LACKS_MKSTEMP
   // Rename temporary files so that they have extensions accepted
   // by the preprocessor.  Renaming is (supposed to be) an atomic
   // operation so we shouldn't be susceptible to attack.
@@ -763,7 +705,6 @@ DRV_pre_proc (const char *myfile)
 
       return;
     }
-#endif  /* !ACE_LACKS_MKSTEMP */
 
   // Remove any existing output file.
   (void) ACE_OS::unlink (t_file);
@@ -862,7 +803,7 @@ DRV_pre_proc (const char *myfile)
   // version the current process would exit if the pre-processor
   // returned with error.
 
-  FILE *yyin = ACE_OS::fopen (t_file, "r");
+  FILE * const yyin = ACE_OS::fopen (t_file, "r");
 
   if (yyin == NULL)
     {
diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp
index 0814e98e19f..7c1b28ad66c 100644
--- a/TAO/TAO_IDL/fe/fe_extern.cpp
+++ b/TAO/TAO_IDL/fe/fe_extern.cpp
@@ -125,20 +125,3 @@ FE_new_UTL_Indenter (void)
 
   return retval;
 }
-
-// Utility method.
-
-ACE_CString
-FE_generate_UUID (void)
-{
-  ACE_Utils::UUID uuid;
-  
-  // The 0xc0 arg triggers use of the thread id in creating the UUID,
-  // useful when the IDL compiler is run by multiple threads in the
-  // same process.
-  ACE_Utils::UUID_GENERATOR::instance ()->generateUUID (uuid, 
-                                                        0x0001,
-                                                        0xc0);
-    
-  return *uuid.to_string ();
-}
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index 42073e638c0..e0128cb30cd 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -632,11 +632,6 @@ FE_init (void)
 
   // Put an empty prefix on the stack for the global scope.
   idl_global->pragma_prefixes ().push (ACE::strnew (""));
-
-#ifdef ACE_LACKS_MKSTEMP
-  /// Initialise the UUID Generator
-  ACE_Utils::UUID_GENERATOR::instance ()->init ();
-#endif  /* ACE_LACKS_MKSTEMP */
 }
 
 void
diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h
index 579762255c4..dfb6b597111 100644
--- a/TAO/TAO_IDL/include/fe_extern.h
+++ b/TAO/TAO_IDL/include/fe_extern.h
@@ -97,8 +97,4 @@ FE_new_UTL_Error (void);
 TAO_IDL_FE_Export UTL_Indenter *
 FE_new_UTL_Indenter (void);
 
-// Utility method to generate a UUID.
-TAO_IDL_FE_Export ACE_CString
-FE_generate_UUID (void);
-
 #endif           // _FE_EXTERN_FE_EXTERN_HH
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 07371f4c7ed..24eae7bc23d 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -40,7 +40,7 @@ project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
 }
 
 
-project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile {
+project(TAO_IDL_BE) : acelib, aceprocesslib, aceprocesslib_for_tao, conv_lib, tao_output, crosscompile {
   sharedname   = TAO_IDL_BE
   libs        += TAO_IDL_FE
   includes    += include be_include fe
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
index b97f3469164..a524d5e39ac 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -20,7 +20,8 @@
 #include "nsconf.h"
 #include "tao/PortableServer/PortableServer.h"
 
-#include "ace/Malloc.h"
+#include "ace/Malloc_T.h"
+#include "ace/MMAP_Memory_Pool.h"
 
 /**
  * @class TAO_Persistent_Context_Index
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index ee9d7a9558c..04ca1c07c60 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -18,15 +18,19 @@
 #include "ace/TP_Reactor.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Malloc.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_strings.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Reactor.h"
+#include "ace/Malloc_T.h"
+#include "ace/Local_Memory_Pool.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_strings.h"
+
 
 ACE_RCSID (tao,
            default_resource,
            "$Id$")
 
+
 TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
   : use_locked_data_blocks_ (1)
   , parser_names_count_ (0)
diff --git a/ace/Array_Map.h b/ace/Array_Map.h
index 96150582a69..5952397aa2e 100644
--- a/ace/Array_Map.h
+++ b/ace/Array_Map.h
@@ -104,9 +104,10 @@ public:
 #if ((defined (_MSC_VER) && (_MSC_VER <= 1200)) || \
      (defined (_MSC_VER) && !defined (_CPPLIB_VER)))
   // MSVC++ 6 doesn't define a standard's compliant reverse_iterator,
-  // also the latest Platform SDK's don't do this. It seems when there
-  // is no _CPPLIB_VER defined, then we can assume also that the SDK is
-  // old
+  // also the latest Platform SDK's don't do this.
+  //
+  // It seems when there is no _CPPLIB_VER defined, then we can assume
+  // also that the SDK is old.
   typedef std::reverse_iterator<iterator, value_type> reverse_iterator;
   typedef std::reverse_iterator<const_iterator,
                                 value_type const>     const_reverse_iterator;
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 194143b097b..6312e0538b2 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -9,7 +9,7 @@
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //==========================================================================
-
+2
 #ifndef ACE_HIGH_RES_TIMER_H
 #define ACE_HIGH_RES_TIMER_H
 #include /**/ "ace/pre.h"
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 9985ec74849..6ef923634ba 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -1,8 +1,5 @@
 // $Id$
 
-#if !defined (ACE_MALLOC_CPP)
-#define ACE_MALLOC_CPP
-
 #include "ace/Malloc.h"
 
 #if !defined (__ACE_INLINE__)
@@ -10,9 +7,14 @@
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Object_Manager.h"
+#include "ace/Malloc_Base.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(ace, Malloc, "$Id$")
+
+ACE_RCSID (ace,
+           Malloc,
+           "$Id$")
+
 
 // Process-wide ACE_Allocator.
 ACE_Allocator *ACE_Allocator::allocator_ = 0;
@@ -203,4 +205,3 @@ template class ACE_Atomic_Op_Ex<ACE_PROCESS_MUTEX, int>;
 #pragma instantiate ACE_Atomic_Op_Ex<ACE_PROCESS_MUTEX, int>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /*ACE_HAS_MALLOC_STATS*/
-#endif /* ACE_MALLOC_CPP */
diff --git a/ace/Malloc.h b/ace/Malloc.h
index b3acb49667d..d19a5f12ebb 100644
--- a/ace/Malloc.h
+++ b/ace/Malloc.h
@@ -384,10 +384,6 @@ public:
 #include "ace/Malloc.inl"
 #endif /* __ACE_INLINE__ */
 
-// Include the ACE_Malloc templates and ACE_Memory_Pool classes at this point.
-#include "ace/Malloc_T.h"
-#include "ace/Memory_Pool.h"
-
 #include /**/ "ace/post.h"
 
 #endif /* ACE_MALLOC_H */
diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl
index eb3bd954454..aafee24e95b 100644
--- a/ace/OS_NS_Thread.inl
+++ b/ace/OS_NS_Thread.inl
@@ -3717,8 +3717,8 @@ ACE_Thread_ID::ACE_Thread_ID (const ACE_Thread_ID &id)
 
 ACE_INLINE
 ACE_Thread_ID::ACE_Thread_ID (void)
+  : thread_id_ (ACE_OS::thr_self ())
 {
-  thread_id_ = ACE_OS::thr_self ();
   ACE_OS::thr_self (thread_handle_);
 }
 
diff --git a/ace/Obstack_T.cpp b/ace/Obstack_T.cpp
index 4fdeeae1c26..e6baeb61e41 100644
--- a/ace/Obstack_T.cpp
+++ b/ace/Obstack_T.cpp
@@ -1,9 +1,10 @@
 // $Id$
 
-#ifndef ACE_OBSTACK_T_C
-#define ACE_OBSTACK_T_C
+#ifndef ACE_OBSTACK_T_CPP
+#define ACE_OBSTACK_T_CPP
 
 #include "ace/Obstack_T.h"
+#include "ace/Malloc_Base.h"
 #include "ace/OS_NS_string.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -14,8 +15,6 @@
 #include "ace/Obstack_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Obstack_T, "$Id$")
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Obstack_T)
 
 template <class CHAR> void
@@ -202,4 +201,4 @@ ACE_Obstack_T<CHAR>::release (void)
   this->curr_->block_ = this->curr_->cur_ = this->curr_->contents_;
 }
 
-#endif /* ACE_OBSTACK_T_C */
+#endif /* ACE_OBSTACK_T_CPP */
diff --git a/ace/Obstack_T.h b/ace/Obstack_T.h
index 942dd1a1cc0..2d76a819e16 100644
--- a/ace/Obstack_T.h
+++ b/ace/Obstack_T.h
@@ -1,16 +1,19 @@
-/* -*- C++ -*- */
+/* -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file    Obstack_T.h
  *
  *  $Id$
  *
- *  @author Doug Schmidt <schmidt@cs.wustl.edu> and Nanbor Wang <nanbor@cs.wustl.edu>
+ *  @author Doug Schmidt <schmidt@cs.wustl.edu>
+ *  @author Nanbor Wang <nanbor@cs.wustl.edu>
  */
 //=============================================================================
 
 #ifndef ACE_OBSTACK_T_H
 #define ACE_OBSTACK_T_H
+
 #include /**/ "ace/pre.h"
 
 #include "ace/Obchunk.h"
@@ -19,6 +22,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+// #include "ace/Basic_Types.h"
+
+class ACE_Allocator;
+
 /**
  * @class ACE_Obstack
  *
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
index 0435ab86790..7d820243d36 100644
--- a/ace/Svc_Conf_l.cpp
+++ b/ace/Svc_Conf_l.cpp
@@ -3,6 +3,7 @@
 #include "ace/Object_Manager.h"
 #include "ace/Guard_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
+#include "ace/Synch_Traits.h"
 #include "ace/OS_NS_ctype.h"
 #include "ace/OS_NS_string.h"
 /* A lexical scanner generated by flex */
@@ -899,7 +900,7 @@ case 25:
 ACE_YY_RULE_SETUP
 {
                          ACE_ERROR ((LM_ERROR,
-                                     ACE_LIB_TEXT ("unknown character = (%d"), 
+                                     ACE_LIB_TEXT ("unknown character = (%d"),
                                                    *ace_yytext));
                         if (ACE_OS::ace_isprint (*ace_yytext))
                           ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *ace_yytext));
diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp
index f7fa4cf734e..92dc421dd6a 100644
--- a/ace/Timer_Hash_T.cpp
+++ b/ace/Timer_Hash_T.cpp
@@ -11,7 +11,6 @@
 
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Guard_T.h"
-#include "ace/High_Res_Timer.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID(ace,
diff --git a/ace/ace.mpc b/ace/ace.mpc
index 9454be236d7..a28db2192bb 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache, pkgconfig {
+  avoids       = ace_for_tao
   libout       = $(ACE_ROOT)/lib
   sharedname   = ACE
   dynamicflags = ACE_BUILD_DLL
@@ -458,84 +459,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
     ../VERSION
   }
 
-  verbatim(gnuace, local) {
-    "Svc_Conf_y.cpp: Svc_Conf.y"
-    "ifeq ($(notdir $(YACC)), bison)"
-    "	$(YACC) -l -d Svc_Conf.y"
-    "	sed -e 's/char \\*getenv/char *ace_foo/g' \\"
-    "       -e 's/= getenv/= ACE_OS::getenv/g' \\"
-    "       -e 's/fprintf/ACE_OS::fprintf/g' \\"
-    "       -e 's/yy/ace_yy/g' \\"
-    "       -e 's/->ace_yyerrno/->yyerrno/g' \\"
-    "       -e 's/->ace_yylineno/->yylineno/g' \\"
-    "       -e 's/YY/ACE_YY/g' \\"
-    "       -e 's/^char /ACE_TCHAR /g' \\"
-    "       -e 's/ char / ACE_TCHAR /g' \\"
-    "       -e 's/(char/(ACE_TCHAR/g' \\"
-    "       -e 's/ NULL/ 0/g' \\"
-    "       -e 's/ace_yyerror[ ]*(\"/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, \"/g' \\"
-    "       -e 's/ace_yyerror[ ]*(ace_yymsg/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ace_yymsg/g' \\"
-    "       -e 's/ace_yyerror (int ace_yyerrno, int ace_yylineno, const ACE_TCHAR/ace_yyerror (int ace_yyerrno, int ace_yylineno, const char/' \\"
-    "       -e 's@#include <stdio\.h>@@' \\"
-    "       -e 's/Svc_Conf\\.tab\\.c/Svc_Conf_y.cpp/g' < Svc_Conf.tab.c > /tmp/$@"
-    "	cp /tmp/$@ $@"
-    "	echo \/\/ '$$I''d$$' > Svc_Conf_Tokens.h"
-    "	cat Svc_Conf.tab.h >> Svc_Conf_Tokens.h"
-    "	$(RM) -f /tmp/$@ Svc_Conf.tab.c Svc_Conf.tab.h Svc_Conf_y.cpp.orig"
-    "else"
-    "	@echo 'ERROR: You must use bison 1.35 or higher to process this file'"
-    "	@/bin/false"
-    "endif"
-
-    "Svc_Conf_l.cpp: Svc_Conf.l"
-    "ifeq ($(notdir $(LEX)), flex)"
-    "	echo '#define YY_NO_UNPUT' > $@"
-    "	echo >> $@"
-    "	echo '#include \"ace/Object_Manager.h\"' >> $@"
-    "	echo '#include \"ace/Guard_T.h\"' >> $@"
-    "	echo '#include \"ace/Recursive_Thread_Mutex.h\"' >> $@"
-    "	echo '#include \"ace/OS_NS_ctype.h\"' >> $@"
-    "	echo '#include \"ace/OS_NS_string.h\"' >> $@"
-    "	$(LEX) -L -t -I Svc_Conf.l >> $@"
-    "	echo '#endif /* ACE_USES_CLASSIC_SVC_CONF = 1 */' >> $@"
-    "	sed -e 's/yy/ace_yy/g' \\"
-    "       -e 's/YY/ACE_YY/g' \\"
-    "       -e 's@#define unput.*@#if (ACE_USES_CLASSIC_SVC_CONF == 1)@' \\"
-    "       -e 's/typedef unsigned char/typedef char/g' \\"
-    "       -e 's/	/        /g' \\"
-    "       -e 's/^char /ACE_TCHAR /g' \\"
-    "       -e 's/ char / ACE_TCHAR /g' \\"
-    "       -e 's/(char/(ACE_TCHAR/g' \\"
-    "       -e 's/ NULL/ 0/g' \\"
-    "       -e 's/->ace_yyerrno/->yyerrno/g' \\"
-    "       -e 's/->ace_yylineno/->yylineno/g' \\"
-    "       -e 's/free( ptr );/free( ACE_MALLOC_T (ptr) );/g' \\"
-    "       -e 's/exit(/ACE_OS::exit(/g' \\"
-    "       -e 's/isatty( fileno(file)/ACE_OS::isatty( fileno (file)/g' \\"
-    "       -e 's/int isatty/int nop_isatty/g' \\"
-    "       -e 's/realloc( (ACE_TCHAR \\*) ptr/realloc( (char *) ptr/g' \\"
-    "       -e 's/unsigned ACE_TCHAR/unsigned char/g' \\"
-    "       -e 's/ACE_TCHAR msg\\[\\]/char msg[]/g' \\"
-    "       -e 's/fprintf/ACE_OS::fprintf/g' \\"
-    "       -e 's/if[ ]*([ ]*num_to_read/if ( num_to_read * sizeof (ACE_TCHAR)/g' \\"
-    "       -e 's/b->ace_yy_buf_size + 2/(&) * sizeof (ACE_TCHAR)/g' \\"
-    "       -e 's@= ACE_YY_READ_BUF_SIZE@& / sizeof (ACE_TCHAR)@g' \\"
-    "       -e 's/ace_yy_flex_alloc( n /&* sizeof (ACE_TCHAR)/g' \\"
-    "       -e 's@#include <stdio\.h>@#include \"ace/OS_NS_stdio.h\"@' \\"
-    "       -e 's@#include <unistd\.h>@#include \"ace/OS_NS_unistd.h\"@' \\"
-    "       -e 's@#include <stdlib\.h>@#include \"ace/OS_NS_stdlib.h\"@' \\"
-    "       -e 's@#include <@#include /**/ <@' \\"
-    "       -e 's@ECHO@ACE_SVC_CONF_ECHO@' < $@ > /tmp/$@"
-    "	cp /tmp/$@ $@"
-    "	patch < ../etc/Svc_Conf_l.cpp.diff"
-    "	$(RM) -f /tmp/$@ Svc_Conf_l.cpp.orig"
-    "else"
-    "	@echo 'ERROR: You must use flex 2.5.4 or higher to process this file'"
-    "	@/bin/false"
-    "endif"
-
-  }
-
   Pkgconfig_Files {
      ACE.pc.in
   }
diff --git a/ace/ace.mwc b/ace/ace.mwc
index fc541981260..79c26bbcc69 100644
--- a/ace/ace.mwc
+++ b/ace/ace.mwc
@@ -3,6 +3,7 @@
 
 workspace {
   ace.mpc
+  ace_for_tao.mpc
   ace_flreactor.mpc
   ace_qtreactor.mpc
   ace_tkreactor.mpc
diff --git a/ace/ace_for_tao.mpc b/ace/ace_for_tao.mpc
new file mode 100644
index 00000000000..f3cb6a437d4
--- /dev/null
+++ b/ace/ace_for_tao.mpc
@@ -0,0 +1,338 @@
+]//  -*- MPC -*-
+//
+// $Id$
+
+project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig {
+  requires     = ace_for_tao
+  libout       = $(ACE_ROOT)/lib
+  sharedname   = ACE_FOR_TAO
+  dynamicflags = ACE_BUILD_DLL
+
+  Source_Files(ACE_COMPONENTS) {
+    ACE.cpp
+    Active_Map_Manager.cpp
+    Addr.cpp
+    Arg_Shifter.cpp
+    ARGV.cpp
+    Argv_Type_Converter.cpp
+    Atomic_Op.cpp
+    Auto_Event.cpp
+    Base_Thread_Adapter.cpp
+    Basic_Types.cpp
+    CDR_Base.cpp
+    CDR_Stream.cpp
+    CDR_Size.cpp
+    Cleanup.cpp
+    Codeset_IBM1047.cpp
+    Codeset_Registry.cpp
+    Codeset_Registry_db.cpp
+    Condition_Recursive_Thread_Mutex.cpp
+    Condition_Thread_Mutex.cpp
+    Countdown_Time.cpp
+    Copy_Disabled.cpp
+    Dump.cpp
+    Dynamic.cpp
+    Event.cpp
+    Event_Handler.cpp
+    Flag_Manip.cpp
+    Framework_Component.cpp
+    Functor.cpp
+    Functor_String.cpp
+    Get_Opt.cpp
+    Handle_Ops.cpp
+    Handle_Set.cpp
+    Hashable.cpp
+    INET_Addr.cpp
+    Init_ACE.cpp
+    IO_SAP.cpp
+    IO_Cntl_Msg.cpp
+    IOStream.cpp
+    IPC_SAP.cpp
+    Lib_Find.cpp
+    Local_Memory_Pool.cpp
+    Lock.cpp
+    Log_Msg.cpp
+    Log_Msg_Backend.cpp
+    Log_Msg_Callback.cpp
+    Log_Msg_IPC.cpp
+    Log_Msg_NT_Event_Log.cpp
+    Log_Msg_UNIX_Syslog.cpp
+    Log_Record.cpp
+    Logging_Strategy.cpp
+    Malloc.cpp
+    Malloc_Allocator.cpp
+    Manual_Event.cpp
+    Message_Block.cpp
+    Message_Queue.cpp
+    Mutex.cpp
+    Notification_Strategy.cpp
+    Obchunk.cpp
+    Object_Manager.cpp
+    Object_Manager_Base.cpp
+    Obstack.cpp
+    OS_Errno.cpp
+    OS_Log_Msg_Attributes.cpp
+    OS_main.cpp
+    OS_NS_arpa_inet.cpp
+    OS_NS_ctype.cpp
+    OS_NS_dirent.cpp
+    OS_NS_dlfcn.cpp
+    OS_NS_errno.cpp
+    OS_NS_fcntl.cpp
+    OS_NS_math.cpp
+    OS_NS_netdb.cpp
+    OS_NS_poll.cpp
+    OS_NS_pwd.cpp
+    OS_NS_regex.cpp
+    OS_NS_signal.cpp
+    OS_NS_stdio.cpp
+    OS_NS_stdlib.cpp
+    OS_NS_string.cpp
+    OS_NS_strings.cpp
+    OS_NS_stropts.cpp
+    OS_NS_sys_mman.cpp
+    OS_NS_sys_msg.cpp
+    OS_NS_sys_resource.cpp
+    OS_NS_sys_select.cpp
+    OS_NS_sys_shm.cpp
+    OS_NS_sys_socket.cpp
+    OS_NS_sys_stat.cpp
+    OS_NS_sys_time.cpp
+    OS_NS_sys_uio.cpp
+    OS_NS_sys_utsname.cpp
+    OS_NS_sys_wait.cpp
+    OS_NS_Thread.cpp
+    OS_NS_time.cpp
+    OS_NS_unistd.cpp
+    OS_NS_wchar.cpp
+    OS_QoS.cpp
+    OS_Thread_Adapter.cpp
+    OS_TLI.cpp
+    Parse_Node.cpp
+    Pipe.cpp
+    Reactor.cpp
+    Reactor_Impl.cpp
+    Reactor_Notification_Strategy.cpp
+    Reactor_Timer_Interface.cpp
+    Read_Buffer.cpp
+    Recursive_Thread_Mutex.cpp
+    Refcountable.cpp
+    RW_Mutex.cpp
+    RW_Thread_Mutex.cpp
+    Sched_Params.cpp
+    Select_Reactor.cpp
+    Select_Reactor_Base.cpp
+    Signal.cpp
+    SOCK.cpp
+    SOCK_Acceptor.cpp
+    Sock_Connect.cpp
+    SOCK_Connector.cpp
+    SOCK_Dgram.cpp
+    SOCK_IO.cpp
+    SOCK_Stream.cpp
+    SString.cpp
+    String_Base_Const.cpp
+    Synch_Options.cpp
+    Task.cpp
+    Thread.cpp
+    Thread_Adapter.cpp
+    Thread_Control.cpp
+    Thread_Exit.cpp
+    Thread_Hook.cpp
+    Thread_Manager.cpp
+    Thread_Mutex.cpp
+    Time_Value.cpp
+    Timeprobe.cpp
+    Timer_Hash.cpp
+    Timer_Heap.cpp
+    Timer_List.cpp
+    Timer_Queue.cpp
+    Timer_Wheel.cpp
+    Token.cpp
+    TP_Reactor.cpp
+    Trace.cpp
+    TSS_Adapter.cpp
+
+    // Dev_Poll_Reactor isn't available on Windows.
+    conditional(automake, make) {
+      Dev_Poll_Reactor.cpp
+    }
+
+    // ACE_Token implementation uses semaphores on Windows and VxWorks.
+    conditional(vc6,vc71,vc8,bmake) {
+      Semaphore.cpp
+      Process_Mutex.cpp
+      WFMO_Reactor.cpp
+    }
+  }
+
+  Template_Files {
+    Acceptor.cpp
+    Active_Map_Manager_T.cpp
+    Array_Base.cpp
+    Array_Map.cpp
+    Atomic_Op_T.cpp
+    Auto_Functor.cpp
+    Auto_IncDec_T.cpp
+    Auto_Ptr.cpp
+    Based_Pointer_T.cpp
+    Cache_Map_Manager_T.cpp
+    Cached_Connect_Strategy_T.cpp
+    Caching_Strategies_T.cpp
+    Caching_Utility_T.cpp
+    Cleanup_Strategies_T.cpp
+    Condition_T.cpp
+    Connector.cpp
+    Containers_T.cpp
+    Dump_T.cpp
+    Dynamic_Service.cpp
+    Env_Value_T.cpp
+    Event_Handler_T.cpp
+    Framework_Component_T.cpp
+    Free_List.cpp
+    Functor_T.cpp
+    Guard_T.cpp
+    Hash_Cache_Map_Manager_T.cpp
+    Hash_Map_Manager_T.cpp
+    Hash_Map_With_Allocator_T.cpp
+    IOStream_T.cpp
+    Intrusive_List.cpp
+    Intrusive_List_Node.cpp
+    Lock_Adapter_T.cpp
+    Malloc_T.cpp
+    Managed_Object.cpp
+    Map_Manager.cpp
+    Map_T.cpp
+    Message_Block_T.cpp
+    Message_Queue_T.cpp
+    Module.cpp
+    Node.cpp
+    Obstack_T.cpp
+    Pair_T.cpp
+    RB_Tree.cpp
+    Reactor_Token_T.cpp
+    Refcounted_Auto_Ptr.cpp
+    Reverse_Lock_T.cpp
+    Select_Reactor_T.cpp
+    Singleton.cpp
+    Strategies_T.cpp
+    Stream.cpp
+    Stream_Modules.cpp
+    String_Base.cpp
+    Svc_Handler.cpp
+    Synch_T.cpp
+    TSS_T.cpp
+    Task_Ex_T.cpp
+    Task_T.cpp
+    Timeprobe_T.cpp
+    Timer_Hash_T.cpp
+    Timer_Heap_T.cpp
+    Timer_List_T.cpp
+    Timer_Queue_Adapters.cpp
+    Timer_Queue_T.cpp
+    Timer_Wheel_T.cpp
+    Typed_SV_Message.cpp
+    Typed_SV_Message_Queue.cpp
+    Unbounded_Queue.cpp
+    Unbounded_Set.cpp
+    Vector_T.cpp
+  }
+
+  Inline_Files {
+    Bound_Ptr.inl
+    Condition_T.inl
+    Guard_T.inl
+    Handle_Gobbler.inl
+    Lock_Adapter_T.inl
+    OS.inl
+    OS_Memory.inl
+    OS_String.inl
+    Refcounted_Auto_Ptr.inl
+    Reverse_Lock_T.inl
+    Swap.inl
+    TSS_T.inl
+    ace_wchar.inl
+  }
+
+  Header_Files {
+    ACE_export.h
+    Array.h
+    Bound_Ptr.h
+    CORBA_macros.h
+    Condition_T.h
+    Default_Constants.h
+    Exception_Macros.h
+    Global_Macros.h
+    Guard_T.h
+    Handle_Gobbler.h
+    If_Then_Else.h
+    IO_Cntl_Msg.h
+    Lock_Adapter_T.h
+    Log_Priority.h
+    Malloc_Base.h
+    Memory_Pool.h
+    Min_Max.h
+    Null_Barrier.h
+    Null_Condition.h
+    Null_Mutex.h
+    Null_Semaphore.h
+    OS.h
+    OS_Dirent.h
+    OS_Memory.h
+    OS_NS_macros.h
+    OS_String.h
+    OS_Thread_Adapter.h
+    Object_Manager_Base.h
+    Pair.h
+    Reactor_Impl.h
+    Reactor_Timer_Interface.h
+    Refcounted_Auto_Ptr.h
+    Reverse_Lock_T.h
+    SStringfwd.h
+    Static_Object_Lock.h
+    Strategies.h
+    Svc_Conf.h
+    Svc_Conf_Tokens.h
+    Swap.h
+    Synch.h
+    Synch_Traits.h
+    TSS_T.h
+    Timer_Queuefwd.h
+    Value_Ptr.h
+    Version.h
+    ace_wchar.h
+    config-WinCE.h
+    config-all.h
+    config-borland-common.h
+    config-lite.h
+    config-minimal.h
+    config-win32-borland.h
+    config-win32-common.h
+    config-win32-ghs.h
+    config-win32-msvc-6.h
+    config-win32-msvc-7.h
+    config-win32-msvc.h
+    config-win32-visualage.h
+    config-win32.h
+    config.h
+    iosfwd.h
+    os_include
+    os_include/arpa
+    os_include/net
+    os_include/netinet
+    os_include/sys
+    post.h
+    pre.h
+    streams.h
+    svc_export.h
+  }
+
+  Documentation_Files {
+    README
+    ../VERSION
+  }
+
+  Pkgconfig_Files {
+     ACE_FOR_TAO.pc.in
+  }
+}
diff --git a/ace/ace_os.mpc b/ace/ace_os.mpc
new file mode 100644
index 00000000000..71b871b9ca3
--- /dev/null
+++ b/ace/ace_os.mpc
@@ -0,0 +1,237 @@
+]//  -*- MPC -*-
+//
+// $Id$
+
+project(ACE_OS) : acedefaults, core, pkgconfig {
+  requires     = ace_subsets
+  libout       = $(ACE_ROOT)/lib
+  sharedname   = ACE_OS
+  dynamicflags = ACE_BUILD_DLL
+
+  Source_Files(ACE_COMPONENTS) {
+    Base_Thread_Adapter.cpp
+    Basic_Types.cpp
+    OS_Errno.cpp
+    OS_Log_Msg_Attributes.cpp
+    OS_main.cpp
+    OS_NS_arpa_inet.cpp
+    OS_NS_ctype.cpp
+    OS_NS_dirent.cpp
+    OS_NS_dlfcn.cpp
+    OS_NS_errno.cpp
+    OS_NS_fcntl.cpp
+    OS_NS_math.cpp
+    OS_NS_netdb.cpp
+    OS_NS_poll.cpp
+    OS_NS_pwd.cpp
+    OS_NS_regex.cpp
+    OS_NS_signal.cpp
+    OS_NS_stdio.cpp
+    OS_NS_stdlib.cpp
+    OS_NS_string.cpp
+    OS_NS_strings.cpp
+    OS_NS_stropts.cpp
+    OS_NS_sys_mman.cpp
+    OS_NS_sys_msg.cpp
+    OS_NS_sys_resource.cpp
+    OS_NS_sys_select.cpp
+    OS_NS_sys_shm.cpp
+    OS_NS_sys_socket.cpp
+    OS_NS_sys_stat.cpp
+    OS_NS_sys_time.cpp
+    OS_NS_sys_uio.cpp
+    OS_NS_sys_utsname.cpp
+    OS_NS_sys_wait.cpp
+    OS_NS_Thread.cpp
+    OS_NS_time.cpp
+    OS_NS_unistd.cpp
+    OS_NS_wchar.cpp
+    OS_QoS.cpp
+    OS_Thread_Adapter.cpp
+    OS_TLI.cpp
+    Sched_Params.cpp
+    Thread_Hook.cpp
+
+    // Dev_Poll_Reactor isn't available on Windows.
+    conditional(automake, make) {
+      Dev_Poll_Reactor.cpp
+    }
+
+    // ACE_Token implementation uses semaphores on Windows and VxWorks.
+    conditional(vc6,vc71,vc8,bmake) {
+      Semaphore.cpp
+      Process_Mutex.cpp
+      WFMO_Reactor.cpp
+    }
+  }
+
+  Template_Files {
+    Acceptor.cpp
+    Active_Map_Manager_T.cpp
+    Array_Base.cpp
+    Array_Map.cpp
+    Atomic_Op_T.cpp
+    Auto_Functor.cpp
+    Auto_IncDec_T.cpp
+    Auto_Ptr.cpp
+    Based_Pointer_T.cpp
+    Cache_Map_Manager_T.cpp
+    Cached_Connect_Strategy_T.cpp
+    Caching_Strategies_T.cpp
+    Caching_Utility_T.cpp
+    Cleanup_Strategies_T.cpp
+    Condition_T.cpp
+    Connector.cpp
+    Containers_T.cpp
+    Dump_T.cpp
+    Dynamic_Service.cpp
+    Env_Value_T.cpp
+    Event_Handler_T.cpp
+    Framework_Component_T.cpp
+    Free_List.cpp
+    Functor_T.cpp
+    Guard_T.cpp
+    Hash_Cache_Map_Manager_T.cpp
+    Hash_Map_Manager_T.cpp
+    Hash_Map_With_Allocator_T.cpp
+    IOStream_T.cpp
+    Intrusive_List.cpp
+    Intrusive_List_Node.cpp
+    Lock_Adapter_T.cpp
+    Malloc_T.cpp
+    Managed_Object.cpp
+    Map_Manager.cpp
+    Map_T.cpp
+    Message_Block_T.cpp
+    Message_Queue_T.cpp
+    Module.cpp
+    Node.cpp
+    Obstack_T.cpp
+    Pair_T.cpp
+    RB_Tree.cpp
+    Reactor_Token_T.cpp
+    Refcounted_Auto_Ptr.cpp
+    Reverse_Lock_T.cpp
+    Select_Reactor_T.cpp
+    Singleton.cpp
+    Strategies_T.cpp
+    Stream.cpp
+    Stream_Modules.cpp
+    String_Base.cpp
+    Svc_Handler.cpp
+    Synch_T.cpp
+    TSS_T.cpp
+    Task_Ex_T.cpp
+    Task_T.cpp
+    Timeprobe_T.cpp
+    Timer_Hash_T.cpp
+    Timer_Heap_T.cpp
+    Timer_List_T.cpp
+    Timer_Queue_Adapters.cpp
+    Timer_Queue_T.cpp
+    Timer_Wheel_T.cpp
+    Typed_SV_Message.cpp
+    Typed_SV_Message_Queue.cpp
+    Unbounded_Queue.cpp
+    Unbounded_Set.cpp
+    Vector_T.cpp
+  }
+
+  Inline_Files {
+    Bound_Ptr.inl
+    Condition_T.inl
+    Guard_T.inl
+    Handle_Gobbler.inl
+    Lock_Adapter_T.inl
+    OS.inl
+    OS_Memory.inl
+    OS_String.inl
+    Refcounted_Auto_Ptr.inl
+    Reverse_Lock_T.inl
+    Swap.inl
+    TSS_T.inl
+    ace_wchar.inl
+  }
+
+  Header_Files {
+    ACE_export.h
+    Array.h
+    Bound_Ptr.h
+    CORBA_macros.h
+    Condition_T.h
+    Default_Constants.h
+    Exception_Macros.h
+    Global_Macros.h
+    Guard_T.h
+    Handle_Gobbler.h
+    If_Then_Else.h
+    IO_Cntl_Msg.h
+    Lock_Adapter_T.h
+    Log_Priority.h
+    Malloc_Base.h
+    Memory_Pool.h
+    Min_Max.h
+    Null_Barrier.h
+    Null_Condition.h
+    Null_Mutex.h
+    Null_Semaphore.h
+    OS.h
+    OS_Dirent.h
+    OS_Memory.h
+    OS_NS_macros.h
+    OS_String.h
+    OS_Thread_Adapter.h
+    Object_Manager_Base.h
+    Pair.h
+    Reactor_Impl.h
+    Reactor_Timer_Interface.h
+    Refcounted_Auto_Ptr.h
+    Reverse_Lock_T.h
+    SStringfwd.h
+    Static_Object_Lock.h
+    Strategies.h
+    Svc_Conf.h
+    Svc_Conf_Tokens.h
+    Swap.h
+    Synch.h
+    Synch_Traits.h
+    TSS_T.h
+    Timer_Queuefwd.h
+    Value_Ptr.h
+    Version.h
+    ace_wchar.h
+    config-WinCE.h
+    config-all.h
+    config-borland-common.h
+    config-lite.h
+    config-minimal.h
+    config-win32-borland.h
+    config-win32-common.h
+    config-win32-ghs.h
+    config-win32-msvc-6.h
+    config-win32-msvc-7.h
+    config-win32-msvc.h
+    config-win32-visualage.h
+    config-win32.h
+    config.h
+    iosfwd.h
+    os_include
+    os_include/arpa
+    os_include/net
+    os_include/netinet
+    os_include/sys
+    post.h
+    pre.h
+    streams.h
+    svc_export.h
+  }
+
+  Documentation_Files {
+    README
+    ../VERSION
+  }
+
+  Pkgconfig_Files {
+     ACE_FOR_TAO.pc.in
+  }
+}
diff --git a/ace/svcconf.mpb b/ace/svcconf.mpb
index c05fd56ce09..908371e3ae1 100644
--- a/ace/svcconf.mpb
+++ b/ace/svcconf.mpb
@@ -21,4 +21,84 @@ feature(ace_svcconf) {
     Svc_Conf_Lexer_Guard.cpp
     XML_Svc_Conf.cpp
   }
+
+  verbatim(gnuace, local) {
+    "Svc_Conf_y.cpp: Svc_Conf.y"
+    "ifeq ($(notdir $(YACC)), bison)"
+    "	$(YACC) -l -d Svc_Conf.y"
+    "	sed -e 's/char \\*getenv/char *ace_foo/g' \\"
+    "       -e 's/= getenv/= ACE_OS::getenv/g' \\"
+    "       -e 's/fprintf/ACE_OS::fprintf/g' \\"
+    "       -e 's/yy/ace_yy/g' \\"
+    "       -e 's/->ace_yyerrno/->yyerrno/g' \\"
+    "       -e 's/->ace_yylineno/->yylineno/g' \\"
+    "       -e 's/YY/ACE_YY/g' \\"
+    "       -e 's/^char /ACE_TCHAR /g' \\"
+    "       -e 's/ char / ACE_TCHAR /g' \\"
+    "       -e 's/(char/(ACE_TCHAR/g' \\"
+    "       -e 's/ NULL/ 0/g' \\"
+    "       -e 's/ace_yyerror[ ]*(\"/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, \"/g' \\"
+    "       -e 's/ace_yyerror[ ]*(ace_yymsg/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ace_yymsg/g' \\"
+    "       -e 's/ace_yyerror (int ace_yyerrno, int ace_yylineno, const ACE_TCHAR/ace_yyerror (int ace_yyerrno, int ace_yylineno, const char/' \\"
+    "       -e 's@#include <stdio\.h>@@' \\"
+    "       -e 's/Svc_Conf\\.tab\\.c/Svc_Conf_y.cpp/g' < Svc_Conf.tab.c > /tmp/$@"
+    "	cp /tmp/$@ $@"
+    "	echo \/\/ '$$I''d$$' > Svc_Conf_Tokens.h"
+    "	cat Svc_Conf.tab.h >> Svc_Conf_Tokens.h"
+    "	$(RM) -f /tmp/$@ Svc_Conf.tab.c Svc_Conf.tab.h Svc_Conf_y.cpp.orig"
+    "else"
+    "	@echo 'ERROR: You must use bison 1.35 or higher to process this file'"
+    "	@/bin/false"
+    "endif"
+
+    "Svc_Conf_l.cpp: Svc_Conf.l"
+    "ifeq ($(notdir $(LEX)), flex)"
+    "	echo '#define YY_NO_UNPUT' > $@"
+    "	echo >> $@"
+    "	echo '#include \"ace/Object_Manager.h\"' >> $@"
+    "	echo '#include \"ace/Guard_T.h\"' >> $@"
+    "	echo '#include \"ace/Recursive_Thread_Mutex.h\"' >> $@"
+    "   echo '#include \"ace/Synch_Traits.h\"' >> $@"
+    "	echo '#include \"ace/OS_NS_ctype.h\"' >> $@"
+    "	echo '#include \"ace/OS_NS_string.h\"' >> $@"
+    "	$(LEX) -L -t -I Svc_Conf.l >> $@"
+    "	echo '#endif /* ACE_USES_CLASSIC_SVC_CONF = 1 */' >> $@"
+    "	sed -e 's/yy/ace_yy/g' \\"
+    "       -e 's/YY/ACE_YY/g' \\"
+    "       -e 's@#define unput.*@#if (ACE_USES_CLASSIC_SVC_CONF == 1)@' \\"
+    "       -e 's/typedef unsigned char/typedef char/g' \\"
+    "       -e 's/	/        /g' \\"
+    "       -e 's/^char /ACE_TCHAR /g' \\"
+    "       -e 's/ char / ACE_TCHAR /g' \\"
+    "       -e 's/(char/(ACE_TCHAR/g' \\"
+    "       -e 's/ NULL/ 0/g' \\"
+    "       -e 's/->ace_yyerrno/->yyerrno/g' \\"
+    "       -e 's/->ace_yylineno/->yylineno/g' \\"
+    "       -e 's/free( ptr );/free( ACE_MALLOC_T (ptr) );/g' \\"
+    "       -e 's/exit(/ACE_OS::exit(/g' \\"
+    "       -e 's/isatty( fileno(file)/ACE_OS::isatty( fileno (file)/g' \\"
+    "       -e 's/int isatty/int nop_isatty/g' \\"
+    "       -e 's/realloc( (ACE_TCHAR \\*) ptr/realloc( (char *) ptr/g' \\"
+    "       -e 's/unsigned ACE_TCHAR/unsigned char/g' \\"
+    "       -e 's/ACE_TCHAR msg\\[\\]/char msg[]/g' \\"
+    "       -e 's/fprintf/ACE_OS::fprintf/g' \\"
+    "       -e 's/if[ ]*([ ]*num_to_read/if ( num_to_read * sizeof (ACE_TCHAR)/g' \\"
+    "       -e 's/b->ace_yy_buf_size + 2/(&) * sizeof (ACE_TCHAR)/g' \\"
+    "       -e 's@= ACE_YY_READ_BUF_SIZE@& / sizeof (ACE_TCHAR)@g' \\"
+    "       -e 's/ace_yy_flex_alloc( n /&* sizeof (ACE_TCHAR)/g' \\"
+    "       -e 's@#include <stdio\.h>@#include \"ace/OS_NS_stdio.h\"@' \\"
+    "       -e 's@#include <unistd\.h>@#include \"ace/OS_NS_unistd.h\"@' \\"
+    "       -e 's@#include <stdlib\.h>@#include \"ace/OS_NS_stdlib.h\"@' \\"
+    "       -e 's@#include <@#include /**/ <@' \\"
+    "       -e 's@ECHO@ACE_SVC_CONF_ECHO@' < $@ > /tmp/$@"
+    "	cp /tmp/$@ $@"
+    "	patch < ../etc/Svc_Conf_l.cpp.diff"
+    "	$(RM) -f /tmp/$@ Svc_Conf_l.cpp.orig"
+    "else"
+    "	@echo 'ERROR: You must use flex 2.5.4 or higher to process this file'"
+    "	@/bin/false"
+    "endif"
+
+  }
+
 }
diff --git a/bin/MakeProjectCreator/config/ace_for_tao.mpb b/bin/MakeProjectCreator/config/ace_for_tao.mpb
new file mode 100644
index 00000000000..179dcad7ab8
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ace_for_tao.mpb
@@ -0,0 +1,10 @@
+// -*- MPC -*-
+//
+// $Id$
+
+feature(ace_for_tao) {
+
+  after    += ACE_FOR_TAO
+  libs     += ACE_FOR_TAO
+
+}
diff --git a/bin/MakeProjectCreator/config/aceexe.mpb b/bin/MakeProjectCreator/config/aceexe.mpb
index f4d01056653..0e75bbcf3a1 100644
--- a/bin/MakeProjectCreator/config/aceexe.mpb
+++ b/bin/MakeProjectCreator/config/aceexe.mpb
@@ -1,7 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: acedefaults {
-  after    += ACE
-  libs     += ACE
+project: acedefaults, acenosubsets, ace_for_tao {
+
 }
diff --git a/bin/MakeProjectCreator/config/acelib.mpb b/bin/MakeProjectCreator/config/acelib.mpb
index c7b18701fd1..aba02c877ca 100644
--- a/bin/MakeProjectCreator/config/acelib.mpb
+++ b/bin/MakeProjectCreator/config/acelib.mpb
@@ -1,9 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: acedefaults, pkgconfig {
-  after    += ACE
-  libs     += ACE
+project: acedefaults, acenosubsets, ace_for_tao, pkgconfig {
   libout    = $(ACE_ROOT)/lib
 
   specific(automake) {
diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features
index d0efb2d4e6d..8dec860188a 100644
--- a/bin/MakeProjectCreator/config/global.features
+++ b/bin/MakeProjectCreator/config/global.features
@@ -21,6 +21,7 @@
 acexml        = 1
 
 // By default we disable these.
+ace_for_tao   = 0
 ssl           = 0
 qos           = 0
 rapi          = 0
diff --git a/bin/MakeProjectCreator/config/taolib.mpb b/bin/MakeProjectCreator/config/taolib.mpb
index 39facefbe5e..611f21e7b06 100644
--- a/bin/MakeProjectCreator/config/taolib.mpb
+++ b/bin/MakeProjectCreator/config/taolib.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : acelib, tao_output, taodefaults, pidl {
+project : acelib, ace_for_tao, tao_output, taodefaults, pidl {
   after += TAO Codeset
   libs  += TAO
 }