RTCCM tests

author: nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2006-11-09 06:39:56 +0000
committer: nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2006-11-09 06:39:56 +0000
commit: 63c18831b86e2e2f25d19af7337c0c00104498ab (patch)
tree: a9cf17108e998f7493fe8e82bc1ac37590f5100a
parent: db48568784542918671bac04874ab4daa971ee46 (diff)
download: ATCD-63c18831b86e2e2f25d19af7337c0c00104498ab.tar.gz
133 files changed, 768 insertions, 3244 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 401ba7d674f..258b25fd12e 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,160 +1,7 @@
-Wed Nov  8 22:22:27 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * bin/make_release: Re-applied this:
-          Sat Oct 28 20:10:42 UTC 2006  Steve Huston  <shuston@riverace.com>
-        
-Wed Nov  8 22:12:46 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.cpp:
-        * ace/Service_Gestalt.cpp:
-
-        This resolves a problem with shutting down the Service
-        Configurator via the static ACE_Service_Config::close () method,
-        where the registered services' fini() methods were not being
-        called. For full details, see bugzilla# 2701. Thanks to Aaron
-        Scamehorn <Aaron dot Scamehorn at cogcap dot com> for discovering
-        it an providing a test case.
-
-Wed Nov  8 19:21:17 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/make_release:
-
-          Updates to the release script to work with Subversion.
-
-Mon Nov  6 16:07:43 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/SOCK_IO.h (ACE_SOCK_IO): Clarified the behavior of
-          non-blocking I/O.  Thanks to Robert Neumann <robert dot neumann
-          at gmail dot com> for motivating this change.
-
-Tue Nov 08 15:40:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/INET_Addr.inl:
-
-          Enhanced operator <() to support IPv6 addresses as well.
-          Thanks to Andre Kostur (akostur at incognito dot com) for
-          submitting a patch for this.
-
-Wed Nov  8 14:24:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Change ACE_LACKS_NET_IF_H feature test to #include <sys/types.h>
-          (if present).
-
-Wed Nov  8 13:45:07 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * examples/C++NPv2/C++NPv2.mpc:
-
-          The AC_CLD project requires threads in order to build and run
-          correctly.
-
-Tue Nov 07 15:49:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/OS_NS_netdb.inl:
-
-          Changes to accomodate VxWorks 6.x versions of gethostbyname and
-          gethostbyaddr. These are threadsafe as the x_r versions are but
-          require deallocating the returned hostent structure.
-
-Tue Nov  7 15:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          With VxWorks 6.3 in rtp mode with IPv6 enabled declare the
-          in6addr_ constants explicitly, these are exported by the
-          VxWorks 6.3 rtp header files but not implemented
-
-Tue Nov 07 13:31:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_vxworks6.3.GNU:
-
-          Fixed build settings for PPC32 builds with softfloat.
-
-Tue Nov  7 10:38:25 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * tests/Naming_Test.cpp:
-
-          Moved an ::open out of an ACE_ASSERT. It wasn't getting performed on
-          some builds.
-
-Tue Nov  7 09:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Misc/basic_func.{h,cpp}:
-          Renamed B to BB to resolve compile problems on rtems where we
-          have also a typedef B
-
-Tue Nov  7 07:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ACE.h:
-          Also rtems defines log2, use the same workaround as with cygwin
-
-        * include/makeinclude/platform_rtems.x_g++.GNU:
-          Removed -ansi
-
-Tue Nov  7 01:47:46 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.cpp (count_interfaces):
-          Another scoreboard fix.
-
-Mon Nov  6 20:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/Gateway/Gateway/Config_Files.{h,cpp}:
-        * apps/Gateway/Gateway/File_Parser.{h,cpp}:
-        * apps/Gateway/Gateway/Gateway.cpp:
-          Renamed class FP to FPRT. This resolves the compile errors on
-          rtems where a struct FP does exist
-
-Mon Nov  6 16:52:14 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.cpp:
-          My fix for Solaris x86 broke HPUX. The trouble is that the
-          method ACE::count_interfaces() is only used by the "generic"
-          implementation of get_ip_interfaces(). Probably a better
-          solution is to remove count_interfaces() and move its
-          functionality into the get_ip_interfaces() implementation, but
-          that is a bigger change than I care to make at the moment. I
-          think it should be possible to do so in a way that also reduces
-          the footprint and improves performance by eliminating the
-          effectively duplicated code in count_interfaces().
-
-Mon Nov 06 14:14:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-vxworks6.3.h:
-
-          Fixed incorrect definition of IOV_MAX.
-
-Mon Nov  6 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-sunos5.5.h:
-          Added ACE_HAS_GETRUSAGE, thanks to Michael Klein
-          <michael dot klein at fazi dot de> for reporting that SunOS has
-          this method, fixes bugzilla 2694.
-
-Mon Nov  6 12:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Service_Configurator/Misc/main.cpp:
-        * examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc:
-        * examples/Service_Configurator/Misc/svc.conf1
-          Fixed shared library name, make working for embedded platforms.
-          Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com>
-          for reporting this, fixes bugzilla bug 2698
-
-Mon Nov 06 11:17:10 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/Service_Config.cpp:
-
-          Implemented a fix for runtime problems in case
-          ACE_HAS_NONSTATIC_OBJECT_MANAGER is defined (seen on VxWorks 6.3 RTP).
-
-Sun Nov  5 14:14:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Sock_Connect.cpp:
-          Fix for Solaris x86.
-
 Sat Nov  4 12:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-sunos4*.h:
-          Removed these files, these are ancient and not supported anymore
+	* ace/config-sunos4*.h:
+	  Removed these files, these are ancient and not supported anymore
 
 Fri Nov  3 18:12:36 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
diff --git a/ACE/THANKS b/ACE/THANKS
index 4936d09d3ab..7d41df8df6f 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2157,9 +2157,7 @@ Artur DeEsperanto <DrEsperanto at gmx dot net>
 Scott Mitchell <rsm at progress dot com>
 Thomas Vanier <thomas dot vanier at gmail dot com>
 N Johnson <nj at artesys dot info>
-Adam Nagel <nagelar at isis dot vanderbilt dot edu>
-Robert Neumann <robert dot neumann at gmail dot com>
-Venkat <swara101 at yahoo dot com>
+Adam Nagel <nagelar@isis.vanderbilt.edu>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h
index 7caaadbdaa2..fe48ac4803b 100644
--- a/ACE/ace/ACE.h
+++ b/ACE/ace/ACE.h
@@ -35,9 +35,9 @@
 #include "ace/Sock_Connect.h"
 #include "ace/Default_Constants.h"
 
-#if defined (CYGWIN32) || defined (ACE_HAS_RTEMS)
+#if defined (CYGWIN32)
 // Include math.h. math.h defines a macro log2 that conflicts with ACE::log2()
-// which seems to only cause a problem on cygwin and rtems.  Insuring that math.h is
+// which seems to only cause a problem on cygwin.  Insuring that math.h is
 // included first solves it since we define acelog2 as log2, then
 // undefines log2.
 # include "ace/os_include/os_math.h"
diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl
index 15af6fe0a42..d87974675d8 100644
--- a/ACE/ace/INET_Addr.inl
+++ b/ACE/ace/INET_Addr.inl
@@ -117,27 +117,6 @@ ACE_INET_Addr::get_addr_size (void) const
 ACE_INLINE bool
 ACE_INET_Addr::operator < (const ACE_INET_Addr &rhs) const
 {
-#if defined (ACE_HAS_IPV6)
-  if (this->get_type() != rhs.get_type())
-  {
-    return this->get_type() < rhs.get_type();
-  }
-
-  if (this->get_type() == PF_INET6)
-  {
-    int memval = ACE_OS::memcmp (this->ip_addr_pointer(),
-                                 rhs.ip_addr_pointer(),
-                                 this->ip_addr_size());
-
-    return memval < 0
-            || (memval == 0
-                && (this->get_port_number() < rhs.get_port_number()
-                    || (this->get_port_number() == rhs.get_port_number()
-                        && this->inet_addr_.in6_.sin6_scope_id <
-                            rhs.inet_addr_.in6_.sin6_scope_id)));
-  }
-#endif
-
   return this->get_ip_address () < rhs.get_ip_address ()
     || (this->get_ip_address () == rhs.get_ip_address ()
         && this->get_port_number () < rhs.get_port_number ());
diff --git a/ACE/ace/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl
index c6a079c4fda..38a992b2d9f 100644
--- a/ACE/ace/OS_NS_netdb.inl
+++ b/ACE/ace/OS_NS_netdb.inl
@@ -58,15 +58,7 @@ ACE_OS::gethostbyaddr (const char *addr, int length, int type)
   if (0 == addr || '\0' == addr[0])
       return 0;
 
-#   if defined (ACE_VXWORKS)
-  // VxWorks 6.x has a gethostbyaddr() that is threadsafe and
-  // returns an heap-allocated hostentry structure.
-  // just call ACE_OS::gethostbyaddr_r () which knows how to handle this.
-  struct hostent hentry;
-  ACE_HOSTENT_DATA buf;
-  int h_error;  // Not the same as errno!
-  return ACE_OS::gethostbyaddr_r (addr, length, type, &hentry, buf, &h_error);
-#   elif defined (ACE_HAS_NONCONST_GETBY)
+#   if defined (ACE_HAS_NONCONST_GETBY)
   ACE_SOCKCALL_RETURN (::gethostbyaddr (const_cast<char *> (addr),
                                         (ACE_SOCKET_LEN) length,
                                         type),
@@ -119,7 +111,7 @@ ACE_OS::gethostbyaddr_r (const char *addr,
       *h_errnop = h_errno;
       return (struct hostent *) 0;
     }
-#   elif defined (__GLIBC__)
+# elif defined (__GLIBC__)
   // GNU C library has a different signature
   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
 
@@ -134,50 +126,6 @@ ACE_OS::gethostbyaddr_r (const char *addr,
     return result;
   else
     return (struct hostent *) 0;
-#   elif defined (ACE_VXWORKS)
-  // VxWorks 6.x has a threadsafe gethostbyaddr() which returns a heap-allocated
-  // data structure which needs to be freed with hostentFree()
-  struct hostent* hp = ::gethostbyaddr (addr, length, type);
-  if (hp)
-  {
-    result->h_addrtype = hp->h_addrtype;
-    result->h_length = hp->h_length;
-
-    // buffer layout:
-    // buffer[0-3]: h_addr_list[0], pointer to the addr.
-    // buffer[4-7]: h_addr_list[1], null terminator for the h_addr_list.
-    // buffer[8..(8+h_length)]: the first (and only) addr.
-    // buffer[(8+h_length)...]: hostname
-
-    // Store the address list in buffer.
-    result->h_addr_list = (char **) buffer;
-    // Store the actual address _after_ the address list.
-    result->h_addr_list[0] = (char *) &result->h_addr_list[2];
-    ACE_OS::memcpy (result->h_addr_list[0], hp->h_addr_list[0], hp->h_length);
-    // Null-terminate the list of addresses.
-    result->h_addr_list[1] = 0;
-    // And no aliases, so null-terminate h_aliases.
-    result->h_aliases = &result->h_addr_list[1];
-
-    if (((2*sizeof(char*))+hp->h_length+ACE_OS::strlen (hp->h_name)+1) > sizeof (ACE_HOSTENT_DATA))
-    {
-      result->h_name = (char *) result->h_addr_list[0] + hp->h_length;
-      ACE_OS::strcpy (result->h_name, hp->h_name);
-    }
-    else
-    {
-      result->h_name = (char *)0;
-    }
-
-    // free hostent memory
-    ::hostentFree (hp);
-
-    return result;
-  }
-  else
-  {
-    return (struct hostent *) 0;
-  }
 #   else
 #     if defined(ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
   ACE_UNUSED_ARG (result);
@@ -230,15 +178,7 @@ ACE_OS::gethostbyname (const char *name)
   if (0 == name || '\0' == name[0])
       return 0;
 
-#   if defined (ACE_VXWORKS)
-  // VxWorks 6.x has a gethostbyname() that is threadsafe and
-  // returns an heap-allocated hostentry structure.
-  // just call ACE_OS::gethostbyname_r () which knows how to handle this.
-  struct hostent hentry;
-  ACE_HOSTENT_DATA buf;
-  int h_error;  // Not the same as errno!
-  return ACE_OS::gethostbyname_r (name, &hentry, buf, &h_error);
-#   elif defined (ACE_HAS_NONCONST_GETBY)
+#   if defined (ACE_HAS_NONCONST_GETBY)
   ACE_SOCKCALL_RETURN (::gethostbyname (const_cast<char *> (name)),
                        struct hostent *,
                        0);
@@ -291,7 +231,7 @@ ACE_OS::gethostbyname_r (const char *name,
       *h_errnop = h_errno;
       return (struct hostent *) 0;
     }
-#   elif defined (__GLIBC__)
+# elif defined (__GLIBC__)
   // GNU C library has a different signature
   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
 
@@ -304,49 +244,6 @@ ACE_OS::gethostbyname_r (const char *name,
     return result;
   else
     return (struct hostent *) 0;
-#   elif defined (ACE_VXWORKS)
-  // VxWorks 6.x has a threadsafe gethostbyname() which returns a heap-allocated
-  // data structure which needs to be freed with hostentFree()
-  struct hostent* hp = ::gethostbyname (name);
-  if (hp)
-  {
-    result->h_addrtype = hp->h_addrtype;
-    result->h_length = hp->h_length;
-
-    // buffer layout:
-    // buffer[0-3]: h_addr_list[0], pointer to the addr.
-    // buffer[4-7]: h_addr_list[1], null terminator for the h_addr_list.
-    // buffer[8...]: the first (and only) addr.
-
-    // Store the address list in buffer.
-    result->h_addr_list = (char **) buffer;
-    // Store the actual address _after_ the address list.
-    result->h_addr_list[0] = (char *) &result->h_addr_list[2];
-    ACE_OS::memcpy (result->h_addr_list[0], hp->h_addr_list[0], hp->h_length);
-    // Null-terminate the list of addresses.
-    result->h_addr_list[1] = 0;
-    // And no aliases, so null-terminate h_aliases.
-    result->h_aliases = &result->h_addr_list[1];
-
-    if (((2*sizeof(char*))+hp->h_length+ACE_OS::strlen (hp->h_name)+1) > sizeof (ACE_HOSTENT_DATA))
-    {
-      result->h_name = (char *) result->h_addr_list[0] + hp->h_length;
-      ACE_OS::strcpy (result->h_name, hp->h_name);
-    }
-    else
-    {
-      result->h_name = (char *)0;
-    }
-
-    // free hostent memory
-    ::hostentFree (hp);
-
-    return result;
-  }
-  else
-  {
-    return (struct hostent *) 0;
-  }
 #   else
 #     if defined(ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
   ACE_UNUSED_ARG (result);
diff --git a/ACE/ace/SOCK_IO.h b/ACE/ace/SOCK_IO.h
index b59421602ac..746a414f6a2 100644
--- a/ACE/ace/SOCK_IO.h
+++ b/ACE/ace/SOCK_IO.h
@@ -35,8 +35,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * If <timeout> == 0, then the call behaves as a normal
  * send/recv call, i.e., for blocking sockets, the call will
  * block until action is possible; for non-blocking sockets,
- * -1 will be returned with errno == EWOULDBLOCK if no action is
- * immediately possible.
+ * EWOULDBLOCK will be returned if no action is immediately
+ * possible.
  * If <timeout> != 0, the call will wait until the relative time
  * specified in *<timeout> elapses.
  * Errors are reported by -1 and 0 return values.  If the
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp
index 3ceb1ebd9f7..cae4ad4058a 100644
--- a/ACE/ace/Service_Config.cpp
+++ b/ACE/ace/Service_Config.cpp
@@ -89,10 +89,10 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRACE ("ACE_Service_Config::parse_args_i");
 
-  // Using PERMUTE_ARGS (default) in order to have all
-  // unrecognized options and their value arguments moved
-  // to the end of the argument vector. We'll pick them up
-  // after processing our options and pass them on to the
+  // Using PERMUTE_ARGS (default) in order to have all 
+  // unrecognized options and their value arguments moved 
+  // to the end of the argument vector. We'll pick them up 
+  // after processing our options and pass them on to the 
   // base class for further parsing.
   ACE_Get_Opt getopt (argc,
                       argv,
@@ -101,7 +101,7 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[])
                       0,                       // Do not report errors
                       ACE_Get_Opt::RETURN_IN_ORDER);
 
-  // Keep a list of all unknown arguments, begin with the
+  // Keep a list of all unknown arguments, begin with the 
   // executable's name
   ACE_ARGV superargv;
   superargv.add (argv[0]);
@@ -140,7 +140,7 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[])
   for (int c = getopt.opt_ind (); c < argc; c++)
       superargv.add (argv[c-1]);
 
-  return ACE_Service_Gestalt::parse_args_i (superargv.argc (),
+  return ACE_Service_Gestalt::parse_args_i (superargv.argc (), 
                                             superargv.argv ());
 
 } /* parse_args_i () */
@@ -338,7 +338,7 @@ ACE_Service_Config::impl_ (void)
                         TSS_Service_Gestalt_Ptr,
                         0);
     }
-
+  
   return instance_;
 }
 
@@ -450,8 +450,8 @@ ACE_Service_Config::ACE_Service_Config (int ignore_static_svcs,
 
   ACE_Service_Config::signum_ = signum;
 
-  // Make sure ACE_OS_Object_Manager is initialized.
-  (void)ACE_OS_Object_Manager::instance ();
+  // Initialize the Service Repository.
+  //  ACE_Service_Repository::instance (static_cast<int> (size));
 
   // Initialize the ACE_Reactor (the ACE_Reactor should be the same
   // size as the ACE_Service_Repository).
@@ -579,13 +579,7 @@ ACE_Service_Config::reconfigure (void)
 int
 ACE_Service_Config::close (void)
 {
-  int result1 = ACE_Service_Config::current ()->close ();
-
-  // Delete the service repository.  All the objects inside the
-  // service repository should already have been finalized.
-  int result2 = ACE_Service_Config::close_svcs ();
-
-  return (result1 | result2);
+  return ACE_Service_Config::current ()->close ();
 }
 
 int
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index eeae45e785d..0c110a162ef 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -1251,6 +1251,10 @@ ACE_Service_Gestalt::close (void)
   if (this->is_opened_ > 0)
     return 0;
 
+  // Delete the service repository.  All the objects inside the
+  // service repository should already have been finalized.
+  //  ACE_Service_Config::close_svcs ();
+
   // Delete the list fo svc.conf files
   delete this->svc_conf_file_queue_;
   this->svc_conf_file_queue_ = 0;
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 5737aff7f2e..920a4dcc64e 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -49,13 +49,6 @@ extern "C" {
 #include "ace/OS_NS_stdio.h"
 #endif /* ACE_VXWORKS < 0x600 */
 
-#if defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x630) && defined (__RTP__) && defined (ACE_HAS_IPV6)
-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-const struct in6_addr in6addr_nodelocal_allnodes = IN6ADDR_NODELOCAL_ALLNODES_INIT;
-const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;
-const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;
-#endif /* ACE_VXWORKS == 0x630 && __RTP__ && ACE_HAS_IPV6 */
-
 #if defined (ACE_HAS_WINCE)
 #include /**/ <Iphlpapi.h>
 // The following code is suggested by microsoft as a workaround to the fact
@@ -1612,7 +1605,6 @@ ACE::get_ip_interfaces (size_t &count,
                        ACE_LIB_TEXT ("%p\n"),
                        ACE_LIB_TEXT ("ACE::get_ip_interfaces:open")),
                       -1);
-
   if (ACE::count_interfaces (handle, num_ifs))
     {
       ACE_OS::close (handle);
@@ -1808,19 +1800,17 @@ int
 ACE::count_interfaces (ACE_HANDLE handle,
                        size_t &how_many)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_GETIFADDRS) || defined (__hpux) || defined (_AIX) || (defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600))
-  // none of these platforms make use of count_interfaces
-  ACE_UNUSED_ARG (handle);
-  ACE_UNUSED_ARG (how_many);
-  ACE_NOTSUP_RETURN (-1); // no implementation
 
-#elif defined (SIOCGIFNUM)
+#if defined (SIOCGIFNUM)
 # if defined (SIOCGLIFNUM)
   int cmd = SIOCGLIFNUM;
+#  if defined (sparc)  // what is a better way of limiting this to solaris? what about x86 solaris?
   struct lifnum if_num = {AF_UNSPEC,0,0};
+#  else
+  int if_num;
+#  endif /* sparc */
 # else
   int cmd = SIOCGIFNUM;
-  int if_num = 0;
 # endif /* SIOCGLIFNUM */
   if (ACE_OS::ioctl (handle, cmd, (caddr_t)&if_num) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -1828,12 +1818,12 @@ ACE::count_interfaces (ACE_HANDLE handle,
                        ACE_LIB_TEXT ("ACE::count_interfaces:")
                        ACE_LIB_TEXT ("ioctl - SIOCGLIFNUM failed")),
                       -1);
-# if defined (SIOCGLIFNUM)
+# if defined (SIOCGLIFNUM) && defined (sparc) // see previous comment
   how_many = if_num.lifn_count;
 # else
   how_many = if_num;
-# endif /* SIOCGLIFNUM */
-return 0;
+# endif /* sparc */
+  return 0;
 
 #elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS)
   // Note: DEC CXX doesn't define "unix".  BSD compatible OS: HP UX,
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index 9379c2ffc19..657e7b771d8 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -48,6 +48,7 @@
 #define ACE_LACKS_SYS_IPC_H
 #define ACE_LACKS_SYS_SEM_H
 #define ACE_LACKS_SUSECONDS_T
+#define ACE_LACKS_CUSERID
 #define ACE_LACKS_STRINGS_H
 #define ACE_LACKS_SYS_SHM_H
 #define ACE_LACKS_SETEGID
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index 3323074f951..1276d00ba66 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -237,7 +237,6 @@
 
 // Platform supports the prusage_t struct.
 #define ACE_HAS_PRUSAGE_T
-#define ACE_HAS_GETRUSAGE
 
 // Compiler/platform defines the sig_atomic_t typedef.
 #define ACE_HAS_SIG_ATOMIC_T
diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h
index 0cd0d9fa800..c31701231a9 100644
--- a/ACE/ace/config-vxworks6.3.h
+++ b/ACE/ace/config-vxworks6.3.h
@@ -176,10 +176,6 @@
   #define ACE_SIZEOF_WCHAR 2
   #define ACE_HAS_SHM_OPEN
   #define ACE_HAS_AIO_CALLS
-  // VxWorks seems to either not define this or define as zero up till now
-  #if !defined (IOV_MAX) || (IOV_MAX == 0)
-    #define ACE_IOV_MAX 16
-  #endif
 #else
   // We are building for kernel mode
   #define ACE_LACKS_SUSECONDS_T
diff --git a/ACE/apps/Gateway/Gateway/Config_Files.cpp b/ACE/apps/Gateway/Gateway/Config_Files.cpp
index 9ead4611696..f1b9e96dd23 100644
--- a/ACE/apps/Gateway/Gateway/Config_Files.cpp
+++ b/ACE/apps/Gateway/Gateway/Config_Files.cpp
@@ -5,15 +5,11 @@
 #include "Config_Files.h"
 #include "Options.h"
 
-#if defined (GATEWAY_DEBUGGING)
-#include "ace/Log_Msg.h"
-#endif /* GATEWAY_DEBUGGING */
-
 ACE_RCSID(Gateway, Config_Files, "$Id$")
 
 // This fixes a nasty bug with cfront-based compilers (like
 // Centerline).
-typedef FPRT::Return_Type FP_RETURN_TYPE;
+typedef FP::Return_Type FP_RETURN_TYPE;
 
 FP_RETURN_TYPE
 Consumer_Config_File_Parser::read_entry (Consumer_Config_Info &entry,
@@ -27,27 +23,27 @@ Consumer_Config_File_Parser::read_entry (Consumer_Config_Info &entry,
   // Ignore comments, check for EOF and EOLINE if this succeeds, we
   // have our connection id.
 
-  while ((result = this->getint (entry.connection_id_)) != FPRT::RT_SUCCESS)
-    if (result == FPRT::RT_EOFILE)
-      return FPRT::RT_EOFILE;
-    else if (result == FPRT::RT_EOLINE
-             || result == FPRT::RT_COMMENT)
+  while ((result = this->getint (entry.connection_id_)) != FP::RT_SUCCESS)
+    if (result == FP::RT_EOFILE)
+      return FP::RT_EOFILE;
+    else if (result == FP::RT_EOLINE
+             || result == FP::RT_COMMENT)
       line_number++;
 
   // Get the payload type.
   result = this->getint (entry.type_);
-  if (result != FPRT::RT_SUCCESS)
+  if (result != FP::RT_SUCCESS)
     return result;
 
   // get all the consumers.
   entry.total_consumers_ = 0;
 
   while ((result = this->getint
-          (entry.consumers_[entry.total_consumers_])) == FPRT::RT_SUCCESS)
+          (entry.consumers_[entry.total_consumers_])) == FP::RT_SUCCESS)
     ++entry.total_consumers_; // do nothing (should check against max...)
 
-  if (result == FPRT::RT_EOLINE || result == FPRT::RT_EOFILE)
-    return FPRT::RT_SUCCESS;
+  if (result == FP::RT_EOLINE || result == FP::RT_EOFILE)
+    return FP::RT_SUCCESS;
   else
     return result;
 }
@@ -60,32 +56,32 @@ Connection_Config_File_Parser::read_entry (Connection_Config_Info &entry,
   FP_RETURN_TYPE result;
 
   // Increment the line count.
-  ++line_number;
+  line_number++;
 
   // Ignore comments, check for EOF and EOLINE if this succeeds, we
   // have our connection id
 
-  while ((result = this->getint (entry.connection_id_)) != FPRT::RT_SUCCESS)
-    if (result == FPRT::RT_EOFILE)
-      return FPRT::RT_EOFILE;
-    else if (result == FPRT::RT_EOLINE
-             || result == FPRT::RT_COMMENT)
-      ++line_number;
+  while ((result = this->getint (entry.connection_id_)) != FP::RT_SUCCESS)
+    if (result == FP::RT_EOFILE)
+      return FP::RT_EOFILE;
+    else if (result == FP::RT_EOLINE
+             || result == FP::RT_COMMENT)
+      line_number++;
 
   // Get the hostname.
   result = this->getword (entry.host_);
-  if (result != FPRT::RT_SUCCESS)
+  if (result != FP::RT_SUCCESS)
     return result;
 
   ACE_INT32 port;
 
   // Get the port number.
   result = this->getint (port);
-  if (result == FPRT::RT_DEFAULT)
+  if (result == FP::RT_DEFAULT)
     {
       // Get the proxy role, i.e., 'C' (Consumer) or 'S' (Supplier).
       result = this->getword (buf);
-      if (result != FPRT::RT_SUCCESS)
+      if (result != FP::RT_SUCCESS)
         return result;
       else
         entry.connection_role_ = buf[0];
@@ -98,7 +94,7 @@ Connection_Config_File_Parser::read_entry (Connection_Config_Info &entry,
         // Yikes, this is a *weird* error!
         entry.remote_port_ = 0;
     }
-  else if (result != FPRT::RT_SUCCESS)
+  else if (result != FP::RT_SUCCESS)
     return result;
   else
     {
@@ -106,7 +102,7 @@ Connection_Config_File_Parser::read_entry (Connection_Config_Info &entry,
 
       // Get the proxy role, i.e., 'C' (Consumer) or 'S' (Supplier).
       result = this->getword (buf);
-      if (result != FPRT::RT_SUCCESS)
+      if (result != FP::RT_SUCCESS)
         return result;
       else
         entry.connection_role_ = buf[0];
@@ -114,16 +110,16 @@ Connection_Config_File_Parser::read_entry (Connection_Config_Info &entry,
 
   // Get the max retry delay.
   result = this->getint (entry.max_retry_timeout_);
-  if (result == FPRT::RT_DEFAULT)
+  if (result == FP::RT_DEFAULT)
     entry.max_retry_timeout_ = Options::instance ()->max_timeout ();
-  else if (result != FPRT::RT_SUCCESS)
+  else if (result != FP::RT_SUCCESS)
     return result;
 
   // Get the local port number.
   result = this->getint (port);
-  if (result == FPRT::RT_DEFAULT)
+  if (result == FP::RT_DEFAULT)
     entry.local_port_ = 0; // @@ Should make this an option.
-  else if (result != FPRT::RT_SUCCESS)
+  else if (result != FP::RT_SUCCESS)
     return result;
   else
     entry.local_port_ = (unsigned short) port;
@@ -132,15 +128,15 @@ Connection_Config_File_Parser::read_entry (Connection_Config_Info &entry,
 
   // Get the priority.
   result = this->getint (priority);
-  if (result != FPRT::RT_SUCCESS)
+  if (result != FP::RT_SUCCESS)
     return result;
   else
     entry.priority_ = priority;
 
-  return FPRT::RT_SUCCESS;
+  return FP::RT_SUCCESS;
 }
 
-#if defined (GATEWAY_DEBUGGING)
+#if defined (DEBUGGING)
 int
 main (int argc, char *argv[])
 {
@@ -159,8 +155,8 @@ main (int argc, char *argv[])
                 "ConnID\tHost\t\tRPort\tRole\tRetry\tLPort\tPriority\n"));
 
     // Read config file line at a time.
-    while ((result = connection_config_file.read_entry (entry, line_number)) != FPRT::RT_EOFILE)
-      if (result == FPRT::RT_PARSE_ERROR)
+    while ((result = connection_config_file.read_entry (entry, line_number)) != FP::RT_EOFILE)
+      if (result == FP::RT_PARSE_ERROR)
         ACE_DEBUG ((LM_DEBUG,
                     "Error line %d.\n",
                     line_number));
@@ -190,8 +186,8 @@ main (int argc, char *argv[])
                 "\nConnID\tLogic\tPayload\tDestinations\n"));
 
     // Read config file line at a time.
-    while ((result = consumer_config_file.read_entry (entry, line_number)) != FPRT::RT_EOFILE)
-      if (result == FPRT::RT_PARSE_ERROR)
+    while ((result = consumer_config_file.read_entry (entry, line_number)) != FP::RT_EOFILE)
+      if (result == FP::RT_PARSE_ERROR)
         ACE_DEBUG ((LM_DEBUG,
                     "Error line %d.\n",
                     line_number));
@@ -215,5 +211,5 @@ main (int argc, char *argv[])
 
   return 0;
 }
-#endif /* GATEWAY_DEBUGGING */
+#endif /* DEBUGGING */
 
diff --git a/ACE/apps/Gateway/Gateway/Config_Files.h b/ACE/apps/Gateway/Gateway/Config_Files.h
index aff3b22c472..9fd96b687f6 100644
--- a/ACE/apps/Gateway/Gateway/Config_Files.h
+++ b/ACE/apps/Gateway/Gateway/Config_Files.h
@@ -60,8 +60,8 @@ class Connection_Config_File_Parser : public File_Parser<Connection_Config_Info>
   //     Parser for the Connection_Handler Connection file.
 {
 public:
-  virtual FPRT::Return_Type read_entry (Connection_Config_Info &entry,
-                                        int &line_number);
+  virtual FP::Return_Type read_entry (Connection_Config_Info &entry,
+                                      int &line_number);
   // Read in a <Connection_Config_Info> entry.
 
 };
@@ -90,8 +90,8 @@ class Consumer_Config_File_Parser : public File_Parser<Consumer_Config_Info>
   //     Parser for the Consumer Map file.
 {
 public:
-  virtual FPRT::Return_Type read_entry (Consumer_Config_Info &entry,
-                                        int &line_number);
+  virtual FP::Return_Type read_entry (Consumer_Config_Info &entry,
+                                      int &line_number);
   // Read in a <Consumer_Config_Info> entry.
 };
 
diff --git a/ACE/apps/Gateway/Gateway/File_Parser.cpp b/ACE/apps/Gateway/Gateway/File_Parser.cpp
index 51d0e0d6c67..3270f3cdd03 100644
--- a/ACE/apps/Gateway/Gateway/File_Parser.cpp
+++ b/ACE/apps/Gateway/Gateway/File_Parser.cpp
@@ -10,7 +10,7 @@
 
 // This fixes a nasty bug with cfront-based compilers (like
 // Centerline).
-typedef FPRT::Return_Type FP_RETURN_TYPE;
+typedef FP::Return_Type FP_RETURN_TYPE;
 
 // File_Parser stuff.
 
@@ -50,24 +50,24 @@ File_Parser<ENTRY>::getint (ACE_INT32 &value)
   char buf[BUFSIZ];
   FP_RETURN_TYPE read_result = this->readword (buf);
 
-  if (read_result == FPRT::RT_SUCCESS)
+  if (read_result == FP::RT_SUCCESS)
     {
       // Check to see if this is the "use the default value" symbol?
       if (buf[0] == '*')
-        return FPRT::RT_DEFAULT;
+        return FP::RT_DEFAULT;
       else
         {
           // ptr is used for error checking with ACE_OS::strtol.
-          char *ptr = 0;
+          char *ptr;
 
           // try to convert the buf to a decimal number
           value = ACE_OS::strtol (buf, &ptr, 10);
 
           // check if the buf is a decimal or not
           if (value == 0 && ptr == buf)
-            return FPRT::RT_PARSE_ERROR;
+            return FP::RT_PARSE_ERROR;
           else
-            return FPRT::RT_SUCCESS;
+            return FP::RT_SUCCESS;
         }
     }
   else
@@ -101,11 +101,11 @@ File_Parser<ENTRY>::readword (char buf[])
     if (wordlength > 0)
       {
         ungetc (c, this->infile_);
-        return FPRT::RT_SUCCESS;
+        return FP::RT_SUCCESS;
       }
     else
       // else return EOF so that read loops stop
-      return FPRT::RT_EOFILE;
+      return FP::RT_EOFILE;
   }
   else if (c == '\n')
     {
@@ -114,19 +114,19 @@ File_Parser<ENTRY>::readword (char buf[])
       if (wordlength > 0)
         ungetc (c, this->infile_);
       else
-        return FPRT::RT_EOLINE;
+        return FP::RT_EOLINE;
     }
 
   // Skip comments.
   if (this->comments (buf[0]))
     {
       if (this->skipline () == EOF)
-        return FPRT::RT_EOFILE;
+        return FP::RT_EOFILE;
       else
-        return FPRT::RT_COMMENT;
+        return FP::RT_COMMENT;
     }
   else
-    return FPRT::RT_SUCCESS;
+    return FP::RT_SUCCESS;
 }
 
 template <class ENTRY> int
diff --git a/ACE/apps/Gateway/Gateway/File_Parser.h b/ACE/apps/Gateway/Gateway/File_Parser.h
index bbe3e1be348..6e971090ad8 100644
--- a/ACE/apps/Gateway/Gateway/File_Parser.h
+++ b/ACE/apps/Gateway/Gateway/File_Parser.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class FPRT
+class FP
 {
   // = TITLE
   //     This class serves as a namespace for the <Return_Type>.
@@ -54,19 +54,19 @@ public:
   int open (const ACE_TCHAR filename[]);
   int close (void);
 
-  virtual FPRT::Return_Type read_entry (ENTRY &entry,
-                                        int &line_number) = 0;
+  virtual FP::Return_Type read_entry (ENTRY &entry,
+                                      int &line_number) = 0;
   // Pure virtual hook that subclasses override and use the protected
   // methods to fill in the <entry>.
 
 protected:
-  FPRT::Return_Type getword (char buf[]);
+  FP::Return_Type getword (char buf[]);
   // Read the next ASCII word.
 
-  FPRT::Return_Type getint (ACE_INT32 &value);
+  FP::Return_Type getint (ACE_INT32 &value);
   // Read the next integer.
 
-  FPRT::Return_Type readword (char buf[]);
+  FP::Return_Type readword (char buf[]);
   // Read the next "word," which is demarcated by <delimiter>s.
   //
   // @@ This function is inherently flawed since it doesn't take a
diff --git a/ACE/apps/Gateway/Gateway/Gateway.cpp b/ACE/apps/Gateway/Gateway/Gateway.cpp
index ec5b1184c1c..b756b5d9642 100644
--- a/ACE/apps/Gateway/Gateway/Gateway.cpp
+++ b/ACE/apps/Gateway/Gateway/Gateway.cpp
@@ -197,7 +197,7 @@ Gateway::parse_connection_config_file (void)
   // Read config file one line at a time.
 
   for (Connection_Config_Info pci;
-       connection_file.read_entry (pci, line_number) != FPRT::RT_EOFILE;
+       connection_file.read_entry (pci, line_number) != FP::RT_EOFILE;
        )
     {
       file_empty = 0;
@@ -278,7 +278,7 @@ Gateway::parse_consumer_config_file (void)
 
   // Read config file line at a time.
   for (Consumer_Config_Info cci_entry;
-       consumer_file.read_entry (cci_entry, line_number) != FPRT::RT_EOFILE;
+       consumer_file.read_entry (cci_entry, line_number) != FP::RT_EOFILE;
        )
     {
       file_empty = 0;
diff --git a/ACE/bin/generate_rel_manpages b/ACE/bin/generate_rel_manpages
index ce81980cce3..446ecfba768 100755
--- a/ACE/bin/generate_rel_manpages
+++ b/ACE/bin/generate_rel_manpages
@@ -30,7 +30,7 @@ my $dot_path = '/usr/bin';
 
 my  $doxy_path = '/usr/bin';
 
-my $doxy_version = '1.4.7-1';
+my $doxy_version = '1.5.0-1';
 
 &can_run($doxy_path.'/doxygen --version | grep '.$doxy_version.' >/dev/null') ||
   die "$0: doxygen path or version incorrect, please fix the script\n";
diff --git a/ACE/bin/make_release b/ACE/bin/make_release
index 17fd6602c9f..ed25f7b1db5 100755
--- a/ACE/bin/make_release
+++ b/ACE/bin/make_release
@@ -23,10 +23,9 @@ my $long_usage="   -? option prints this message\n" .
     "   -n option prints what would be done, but doesn't do it\n" .
     "   -v <version>, where <version> is major, minor, or beta (default)\n" .
     "   -t Specifies the tag from which to pull components during release." .
-    " Uses working copy for exports if not present." .
+    " Uses working copy for exports if not present.";
     "   -u to update versions\n" .
-    "   -r to specify alternate repository root\n" .
-    "   -d to specify destination for generated packages\n";
+    "   -r to specify alternate repository root\n";
 
 ########
 ######## Sanity checks.
@@ -83,7 +82,7 @@ my $gnu2 = '/usr/local/bin:/usr/bin';
 ####### Add the path to /usr/bin unconditionally..
 $ENV{'PATH'} = "$gnu2" . ':' . $ENV{'PATH'};
 
-my $repo_root = 'https://svn.dre.vanderbilt.edu/DOC';
+my $repo_root = 'svn+ssh://abbarach.dre.vanderbilt.edu/build/wotte/ACE-svn/DOC';
 my $export_dir = '/export/doc/latest';
 my $old_versions_dir = '/export/doc/previous-versions';
 my $diffs_dir = "$export_dir/diffs";
@@ -99,7 +98,7 @@ my $release_filter = '-iname build -prune -o ' .
     '! -name \'*.MAK\' ! -name \'.cvsignore\' -print';
 my $update_versions = 0;
 my $create_zips = 1;
-my $package_dest = ".";
+
 ########
 ######## Process command line args.
 ########
@@ -141,8 +140,6 @@ while ($#ARGV >= $[  &&  $ARGV[0] =~ /^-/) {
     } elsif ($ARGV[0] eq '-?') {
         print "$usage$long_usage";
         exit;
-    } elsif ($ARGV[0] eq '-d') {
-        $package_dest = $ARGV[1]; shift;
     } else {
         print STDERR "$0:  unknown option $ARGV[0]\n";
         die "$usage$long_usage";
@@ -274,13 +271,14 @@ if ($update_versions) {
 
     #### If a tag was specified, export using the tag from a staging area.
     #### If not, create a kit from the current directory.
-    my $stage_dir = "../ACE_wrappers_stage-$$";
+    my $stage_dir = "/export/wotte/tmp/ACE_wrappers_stage-$$";
     unless ("$exec_prefix") {
 	mkdir "$stage_dir", 0755  ||
 	    die "$0: unable to mkdir $stage_dir\n";
     }
 
     # Root for all tags.
+    
     if ($kit =~ /ace/) {
 	if ("$kit_tag") {
 	    # Export ACE
@@ -408,13 +406,13 @@ sub check_workspace () {
 sub get_and_update_versions () {
     # Update the version numbers for the various components.
     my $retval = 
-	get_version ("ACE", 1) ||
+	get_version ("ACE") ||
 	update_version_files ("ACE") ||
 	update_changelog ("ACE") ||
-	get_version ("TAO", 1) ||
+	get_version ("TAO") ||
 	update_version_files ("TAO") ||
 	update_changelog ("TAO") ||
-	get_version ("CIAO", 1) ||
+	get_version ("CIAO") ||
 	update_version_files ("CIAO") ||
 	update_changelog ("CIAO");
     
@@ -427,7 +425,6 @@ sub get_and_update_versions () {
 
 sub get_version {
     my $component = shift;
-    my $update_version = shift;
     print "Getting version information for $component\n";
     
     open (VERSION, "< $component/VERSION") ||
@@ -454,20 +451,19 @@ sub get_version {
     }
     close VERSION;
     
-    if ($update_version) {
-        # Increment the version count
-        if ($release_type eq 'beta') {
-            ++$comp_versions{"$component" . "_beta"};
-        } elsif ($release_type eq 'minor' ) {
-            $comp_versions{"$component" . "_beta"} = 0;
-            ++$comp_versions{"$component" . "_minor"};
-        } elsif ($release_type eq 'major' ) {
-            $comp_versions{"$component" . "_beta"} = 
-                $comp_versions{"$component" . "_minor"} = 0;
-            ++$comp_versions{"$component" . "_major"};
-        }
+    # Increment the version count
+    if ($release_type eq 'beta') {
+        ++$comp_versions{"$component" . "_beta"};
+    } elsif ($release_type eq 'minor' ) {
+	$comp_versions{"$component" . "_beta"} = 0;
+	++$comp_versions{"$component" . "_minor"};
+    } elsif ($release_type eq 'major' ) {
+	$comp_versions{"$component" . "_beta"} = 
+	    $comp_versions{"$component" . "_minor"} = 0;
+	++$comp_versions{"$component" . "_major"};
     }
     
+    
     if ($release_type eq 'beta') {
 	$comp_versions{"$component" . "_version"} =
 	    $comp_versions{"$component" . "_major"} . '.' .
@@ -703,13 +699,6 @@ sub bootstrap_autotools () {
 ########
 sub create_kit {
     my $src_only = shift;
-
-    get_version ("ACE_wrappers", 0);
-
-
-    # Get version but don't udpate version count
-    (my $local_ace_tag = $comp_versions{"ACE_wrappers_version"}) =~ s|_|.|g;
-
     my $suffix = "";
     
     if ($src_only) {
@@ -728,9 +717,9 @@ sub create_kit {
     my $redirect = $install  ?  '>'  :  '\>';
     my $shell_cd = $install  ?  'cd'  :  'echo cd';
 
-    
-#    (my $local_tao_tag = $kit_tag) =~ s|_|.|g;
-#    (my $local_ciao_tag = $kit_tag) =~ s|_|.|g;
+    (my $local_ace_tag = $kit_tag) =~ s|_|.|g;
+    (my $local_tao_tag = $kit_tag) =~ s|_|.|g;
+    (my $local_ciao_tag = $kit_tag) =~ s|_|.|g;
 
     # These files don't get LF->CRLF conversions done when making the zip.
     my $bin_files =
@@ -757,22 +746,22 @@ sub create_kit {
         print "RELEASE FILES from CIAO are $release_files \n";
 
         $build_command =
-            "$rm $package_dest/ACE+TAO+CIAO$suffix.zip; " .
+            "$rm ACE+TAO+CIAO$suffix.zip; " .
             "$find $release_files $release_filter | $egrep $bin_files | " .
-            "zip $package_dest/ACE+TAO+CIAO$suffix.zip -q9@ &&" .
+            "zip ACE+TAO+CIAO$suffix.zip -q9@ &&" .
             "$find $release_files $release_filter | $egrep -v $bin_files | " .
-            "zip $package_dest/ACE+TAO+CIAO$suffix.zip -qlg9@ &&" .
+            "zip ACE+TAO+CIAO$suffix.zip -qlg9@ &&" .
             "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$gzip -9 > $package_dest/ACE+TAO+CIAO$suffix.tar.gz && " .
+            "$gzip -9 > ACE+TAO+CIAO$suffix.tar.gz && " .
             "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$bzip2 > $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 && " .
-            "$chmod 664 $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 && " .
-            "$chgrp doc $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 && " .
-            "$dispose $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 $dest &&" .
+            "$bzip2 > ACE+TAO+CIAO$suffix.tar.bz2 && " .
+            "$chmod 664 ACE+TAO+CIAO$suffix.tar.gz ACE+TAO+CIAO$suffix.zip ACE+TAO+CIAO$suffix.tar.bz2 && " .
+            "$chgrp doc ACE+TAO+CIAO$suffix.tar.gz ACE+TAO+CIAO$suffix.zip ACE+TAO+CIAO$suffix.tar.bz2 && " .
+            "$dispose ACE+TAO+CIAO$suffix.tar.gz ACE+TAO+CIAO$suffix.zip ACE+TAO+CIAO$suffix.tar.bz2 $dest &&" .
             "$cp $dest/ACE+TAO+CIAO$suffix.zip $old_versions_dir/ACE+TAO+CIAO$suffix-$local_ace_tag.zip &&".
             "$cp $dest/ACE+TAO+CIAO$suffix.tar.gz $old_versions_dir/ACE+TAO+CIAO$suffix-$local_ace_tag.tar.gz &&".
             "$cp $dest/ACE+TAO+CIAO$suffix.tar.bz2 $old_versions_dir/ACE+TAO+CIAO$suffix-$local_ace_tag.tar.bz2; ";
-        $archives = " $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 ";
+        $archives = " ACE+TAO+CIAO$suffix.tar.gz ACE+TAO+CIAO$suffix.zip ACE+TAO+CIAO$suffix.tar.bz2 ";
     }
 
     # First dispose of ACE+TAO+CIAO.
@@ -806,22 +795,22 @@ sub create_kit {
         print "RELEASE FILES for TAO are $release_files \n";
 
         $build_command =
-            "$rm $package_dest/ACE+TAO$suffix.zip; " .
+            "$rm ACE+TAO$suffix.zip; " .
             "$find $release_files $release_filter | $egrep $bin_files | " .
-            "zip $package_dest/ACE+TAO$suffix.zip -q9@ &&" .
+            "zip ACE+TAO$suffix.zip -q9@ &&" .
             "$find $release_files $release_filter | $egrep -v $bin_files | " .
-            "zip $package_dest/ACE+TAO$suffix.zip -qlg9@ &&" .
+            "zip ACE+TAO$suffix.zip -qlg9@ &&" .
             "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$gzip -9 > $package_dest/ACE+TAO$suffix.tar.gz && " .
+            "$gzip -9 > ACE+TAO$suffix.tar.gz && " .
             "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$bzip2 > $package_dest/ACE+TAO$suffix.tar.bz2 && " .
-            "$chmod 664 $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 && " .
-            "$chgrp doc $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 && " .
-            "$dispose $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 $dest &&" .
+            "$bzip2 > ACE+TAO$suffix.tar.bz2 && " .
+            "$chmod 664 ACE+TAO$suffix.tar.gz ACE+TAO$suffix.zip ACE+TAO$suffix.tar.bz2 && " .
+            "$chgrp doc ACE+TAO$suffix.tar.gz ACE+TAO$suffix.zip ACE+TAO$suffix.tar.bz2 && " .
+            "$dispose ACE+TAO$suffix.tar.gz ACE+TAO$suffix.zip ACE+TAO$suffix.tar.bz2 $dest &&" .
             "$cp $dest/ACE+TAO$suffix.zip $old_versions_dir/ACE+TAO$suffix-$local_ace_tag.zip &&".
             "$cp $dest/ACE+TAO$suffix.tar.gz $old_versions_dir/ACE+TAO$suffix-$local_ace_tag.tar.gz &&".
             "$cp $dest/ACE+TAO$suffix.tar.bz2 $old_versions_dir/ACE+TAO$suffix-$local_ace_tag.tar.bz2; ";
-        $archives = " $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 ";
+        $archives = " ACE+TAO$suffix.tar.gz ACE+TAO$suffix.zip ACE+TAO$suffix.tar.bz2 ";
     }
 
     # Dispose of ACE+TAO now
@@ -850,37 +839,37 @@ sub create_kit {
         chomp ($release_files = `$regmake -f $ace_root/Release show_release_files`);
 
         $build_command =
-            "$rm $package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip; " .
+            "$rm ACE$suffix.zip ACE$suffix-lib.zip; " .
             "$find $release_files $release_filter | $egrep $bin_files | " .
-            "zip $package_dest/ACE$suffix.zip -q9@ &&" .
+            "zip ACE$suffix.zip -q9@ &&" .
             "$find $release_files $release_filter | $egrep -v $bin_files | " .
-            "zip $package_dest/ACE$suffix.zip -qlg9@ &&" .
+            "zip ACE$suffix.zip -qlg9@ &&" .
             "$find $release_lib_files $release_filter | $egrep $bin_files | " .
-            "zip $package_dest/ACE$suffix-lib.zip -q9@ &&" .
+            "zip ACE$suffix-lib.zip -q9@ &&" .
             "$find $release_lib_files $release_filter | $egrep -v $bin_files | " .
-            "zip $package_dest/ACE$suffix-lib.zip -qlg9@ &&" .
+            "zip ACE$suffix-lib.zip -qlg9@ &&" .
             "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$gzip -9 > $package_dest/ACE$suffix.tar.gz && " .
+            "$gzip -9 > ACE$suffix.tar.gz && " .
             "$find $release_files $release_filter | $cpio -o -H ustar | " .
-            "$bzip2 > $package_dest/ACE$suffix.tar.bz2 && " .
+            "$bzip2 > ACE$suffix.tar.bz2 && " .
             "$find $release_lib_files $release_filter | $cpio -o -H ustar | " .
-            "$gzip -9 > $package_dest/ACE$suffix-lib.tar.gz && " .
+            "$gzip -9 > ACE$suffix-lib.tar.gz && " .
             "$find $release_lib_files $release_filter | $cpio -o -H ustar | " .
-            "$bzip2 > $package_dest/ACE$suffix-lib.tar.bz2 && " .
-            "$chmod 664 $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 ".
-            "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip && " .
-            "$chgrp doc $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 ".
-            "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip && " .
-            "$dispose $package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip $dest && " .
-            "$dispose $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 $dest && " .
+            "$bzip2 > ACE$suffix-lib.tar.bz2 && " .
+            "$chmod 664 ACE$suffix.tar.gz ACE$suffix-lib.tar.gz ACE$suffix.tar.bz2 ACE$suffix-lib.tar.bz2 ".
+            "ACE$suffix.zip ACE$suffix-lib.zip && " .
+            "$chgrp doc ACE$suffix.tar.gz ACE$suffix-lib.tar.gz ACE$suffix.tar.bz2 ACE$suffix-lib.tar.bz2 ".
+            "ACE$suffix.zip ACE$suffix-lib.zip && " .
+            "$dispose ACE$suffix.zip ACE$suffix-lib.zip $dest && " .
+            "$dispose ACE$suffix.tar.gz ACE$suffix-lib.tar.gz ACE$suffix.tar.bz2 ACE$suffix-lib.tar.bz2 $dest && " .
             "$cp $dest/ACE$suffix.zip $old_versions_dir/$local_ace_tag.zip &&".
             "$cp $dest/ACE$suffix-lib.zip $old_versions_dir/$local_ace_tag-lib.zip &&".
             "$cp $dest/ACE$suffix.tar.gz $old_versions_dir/$local_ace_tag.tar.gz &&".
             "$cp $dest/ACE$suffix-lib.tar.gz $old_versions_dir/$local_ace_tag-lib.tar.gz &&".
             "$cp $dest/ACE$suffix.tar.bz2 $old_versions_dir/$local_ace_tag.tar.bz2 &&".
             "$cp $dest/ACE$suffix-lib.tar.bz2 $old_versions_dir/$local_ace_tag-lib.tar.bz2;";
-        $archives = " $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz ".
-            "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 ";
+        $archives = " ACE$suffix.tar.gz ACE$suffix-lib.tar.gz ".
+            "ACE$suffix.zip ACE$suffix-lib.zip ACE$suffix.tar.bz2 ACE$suffix-lib.tar.bz2 ";
     }
 
     # Now dispose of ACE in all its glory
@@ -896,7 +885,6 @@ sub create_kit {
 }
 
 
-
 ########
 ######## Execute a command, unless -n had been specified.  Return value
 ######## of 0 indicates success.
diff --git a/ACE/configure.ac b/ACE/configure.ac
index 8d95e990321..3f16fba10ea 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -627,11 +627,7 @@ ACE_CHECK_LACKS_HEADERS(netinet/tcp.h)
 ACE_CHECK_LACKS_HEADERS(sys/socket.h)
 
 ACE_CHECK_LACKS_HEADERS(net/if.h, [], [],
-[
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifndef ACE_LACKS_SYS_SOCKET_H
+[#ifndef ACE_LACKS_SYS_SOCKET_H
 # include <sys/socket.h>
 # endif
 ])
diff --git a/ACE/examples/C++NPv2/C++NPv2.mpc b/ACE/examples/C++NPv2/C++NPv2.mpc
index 690fede986e..675db6f9929 100644
--- a/ACE/examples/C++NPv2/C++NPv2.mpc
+++ b/ACE/examples/C++NPv2/C++NPv2.mpc
@@ -8,7 +8,6 @@
 // without setting a build dependency within vc6 and the like.
 
 project(*AC_CLD) : acelib, ssl {
-  requires += threads
   avoids += uses_wchar
   sharedname = AC_CLD
   dynamicflags = AC_CLD_BUILD_DLL
diff --git a/ACE/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc b/ACE/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc
index c95de022c3f..9c9744fd601 100644
--- a/ACE/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc
+++ b/ACE/examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 project(*Timer) : acelib {
-  sharedname = Timer
+  sharedname = timer
   dynamicflags += ACE_BUILD_SVC_DLL
   Source_Files {
     Timer_Service.cpp
@@ -11,7 +11,7 @@ project(*Timer) : acelib {
 project(*Main) : aceexe {
   exename = main
   after += Service_Configurator_Misc_Timer
-  libs  += Timer
+  libs  += timer
   Source_Files {
     main.cpp
   }
diff --git a/ACE/examples/Service_Configurator/Misc/main.cpp b/ACE/examples/Service_Configurator/Misc/main.cpp
index 11db456fed4..a7ff6c9da26 100644
--- a/ACE/examples/Service_Configurator/Misc/main.cpp
+++ b/ACE/examples/Service_Configurator/Misc/main.cpp
@@ -46,7 +46,7 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
   args.add (ACE_TEXT ("-S"));
   args.add (ACE_TEXT ("\"static Timer_Service_1 'timer 1 10 $TRACE'\""));
   args.add (ACE_TEXT ("-S"));
-  args.add (ACE_TEXT ("\"dynamic Timer_Service_2 Service_Object * Timer:_make_Timer_Service_2() 'timer 2 10 $TRACE'\""));
+  args.add (ACE_TEXT ("\"dynamic Timer_Service_2 Service_Object * ./Timer:_make_Timer_Service_2() 'timer 2 10 $TRACE'\""));
   // Test the -f option!
   args.add (ACE_TEXT ("-fsvc.conf1"));
   args.add (ACE_TEXT ("-fsvc.conf2"));
@@ -62,10 +62,10 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
                 i,
                 args.argv ()[i]));
 
-  int const result = ACE_Service_Config::open (args.argc (),
-                                               args.argv (),
-                                               ACE_DEFAULT_LOGGER_KEY,
-                                               0);
+  int result = ACE_Service_Config::open (args.argc (),
+                                         args.argv (),
+                                         ACE_DEFAULT_LOGGER_KEY,
+                                         0);
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
diff --git a/ACE/examples/Service_Configurator/Misc/svc.conf1 b/ACE/examples/Service_Configurator/Misc/svc.conf1
index 2995c61ebe9..d0f552caa6e 100644
--- a/ACE/examples/Service_Configurator/Misc/svc.conf1
+++ b/ACE/examples/Service_Configurator/Misc/svc.conf1
@@ -3,6 +3,6 @@
 # from environment variables, so they can be set by changing your
 # environment before running the main program.  If you don't have
 # these variables set they are ignored.
-dynamic Timer_Service_3 Service_Object *
-  Timer:_make_Timer_Service_3()
+dynamic Timer_Service_3 Service_Object * 
+  ./Timer:_make_Timer_Service_3() 
   "timer $INTERVAL $MAX_TIMEOUTS $TRACE"
diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
index be11cf52f83..2ee8a18efef 100644
--- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU
+++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
@@ -31,8 +31,8 @@ ifeq (no,$(RTEMS_HAS_NETWORKING))
  CCFLAGS += -DACE_LACKS_NETWORKING
 endif
 
-CFLAGS          += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
-CCFLAGS         += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
+CFLAGS          += -specs bsp_specs -qrtems -D_REENTRANT -fasm -ansi -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
+CCFLAGS         += -specs bsp_specs -qrtems -D_REENTRANT -fasm -ansi -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
 ifeq (,$(rtti))
   CCFLAGS += -fno-rtti -DACE_LACKS_RTTI
 endif # rtti
diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU
index 05568999af5..ec3b6ddc22c 100644
--- a/ACE/include/makeinclude/platform_vxworks6.3.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU
@@ -80,13 +80,7 @@ ifeq ($(TOOL),)
 else
   override TOOL := $(TOOL)
 endif
-ifeq ($(TOOL_FAMILY),)
-  ifeq ($(findstring gnu,$(TOOL)),gnu)
-    override TOOL_FAMILY := gnu
-  else
-    override TOOL_FAMILY := diab
-  endif
-endif
+override TOOL_FAMILY := $(TOOL)
 
 ifeq ("$(TOOL)","gnu")
   templates ?= automatic
@@ -176,11 +170,7 @@ ifeq ($(rtp),1)
   LDFLAGS := $(filter-out -N, $(LDFLAGS))
   LD := $(CPLUS)
   DLD := $(CPLUS)
-  ifeq ($(findstring *sf,*$(TOOL)),*sf)
-    LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/sfcommon
-  else
-    LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/common
-  endif
+  LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/common
   LDLIBS += -ldl
 else
   include $(TGT_DIR)/h/make/defs.default
diff --git a/ACE/performance-tests/Misc/basic_func.cpp b/ACE/performance-tests/Misc/basic_func.cpp
index a76565d74fb..84943e0b22a 100644
--- a/ACE/performance-tests/Misc/basic_func.cpp
+++ b/ACE/performance-tests/Misc/basic_func.cpp
@@ -4,7 +4,7 @@
 
 ACE_RCSID(Misc, basic_func, "$Id$")
 
-int A, BB, C, D, E, F;
+int A, B, C, D, E, F;
 
 void
 func ()
diff --git a/ACE/performance-tests/Misc/basic_func.h b/ACE/performance-tests/Misc/basic_func.h
index bbaf4d4cfb9..dcb70bae5da 100644
--- a/ACE/performance-tests/Misc/basic_func.h
+++ b/ACE/performance-tests/Misc/basic_func.h
@@ -25,7 +25,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-extern int A,BB,C,D,E,F;
+extern int A,B,C,D,E,F;
 
 // If your compiler optimizes away Empty_Iteration_Test::run (), then
 // #defining ACE_HAS_OPTIMIZED_NULL_FUNCTIONS may help produce more
@@ -36,8 +36,8 @@ extern int A,BB,C,D,E,F;
 #endif /* _MSC_VER */
 
 #if defined (ACE_HAS_OPTIMIZED_NULL_FUNCTIONS)
-# define EXPR(R,A,BB,C,D) (R=(A*BB + C*D))
-# define DO_SOMETHING EXPR(A,BB,EXPR(F,A,E,C,BB),EXPR(BB,F,A,D,E),EXPR(E,BB,F,A,C));
+# define EXPR(R,A,B,C,D) (R=(A*B + C*D))
+# define DO_SOMETHING EXPR(A,B,EXPR(F,A,E,C,B),EXPR(B,F,A,D,E),EXPR(E,B,F,A,C));
 #else  /* ACE_HAS_OPTIMIZED_NULL_FUNCTIONS */
 # define DO_SOMETHING
 #endif /* ACE_HAS_OPTIMIZED_NULL_FUNCTIONS */
diff --git a/ACE/tests/Naming_Test.cpp b/ACE/tests/Naming_Test.cpp
index 28db1fde02a..fc752dcac43 100644
--- a/ACE/tests/Naming_Test.cpp
+++ b/ACE/tests/Naming_Test.cpp
@@ -234,12 +234,7 @@ run_main (int argc, ACE_TCHAR *argv[])
       name_options->database (ACE_OS::mktemp (temp_file));
     }
 
-  if (ns_context->open (ACE_Naming_Context::PROC_LOCAL, 1) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                  "ERROR: Naming_Test - ns_context->open () failed.\n"),
-                  -1);
-    }
+  ACE_ASSERT (ns_context->open (ACE_Naming_Context::PROC_LOCAL, 1) != -1);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("time to test %d iterations using %s\n"),
               ACE_NS_MAX_ENTRIES, name_options->use_registry () ?
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index b71e1dc9284..7224d79f848 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,30 +1,3 @@
-Wed Nov  8 20:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Null_Component/*:
-          Added some modelling files I got also from Abdul and removed the .ccd file
-          I committed by accident
-
-Wed Nov  8 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
-          Fixed a small memory leaks and other problems. This fixes bugzilla
-          2692. Thanks to Sowayan Abdullah <abdullah dot sowayan at lmco dot com>
-          for reporting these issues.
-
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp:
-          A few small improvements
-
-Sun Nov  5 19:16:57 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-          Removed the use of STL iostream.
-          Use ACE DLL decorator, prefix, suffix for DLL file names.
-
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-        * DAnCE/RepositoryManager/RMadmin.cpp:
-          Removed the use of STL iostream.
-
 Fri Nov  3 03:03:24 UTC 2006  Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
 
         * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -51,7 +24,6 @@ Thu Nov  2 20:22:46 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
         * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
         * DAnCE/NodeManager/Node_Manager.cpp (main): Replaced exit() with
           ACE_OS::exit().  Thanks to Abdul Sowayan for reporting this.
-          This fixes bugid #2695.
 
 Mon Oct 30 19:13:03 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
diff --git a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
index edf62e1af0b..49419d9d94e 100644
--- a/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -12,8 +12,8 @@
 #include "ace/OS_NS_unistd.h"        //for close
 #include "ace/OS_NS_sys_stat.h"      //for filesize and mkdir
 #include "ace/OS_NS_string.h"        //for string functions
-#include "ace/streams.h"
 
+#include "iostream"   
 namespace CIAO
 {
   Containers_Info_Map::
@@ -501,18 +501,13 @@ is_shared_component (ACE_CString & name)
       return false;
     }
 
-#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-    ACE_TString decorator (ACE_LD_DECORATOR_STR);
-#endif
-    ACE_TString prefix (ACE_DLL_PREFIX);
-    ACE_TString suffix (ACE_DLL_SUFFIX);
-    
     ACE_CString new_name (name);
-    new_name = prefix + new_name;
-#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-    new_name += decorator;
-#endif
-    new_name += suffix;
+
+#if defined (ACE_WIN32)
+    new_name += "d.dll";
+#else
+    new_name = "lib" + new_name + ".so";
+#endif    
 
     path = HTTP_DOWNLOAD_PATH;
     path += "/";
@@ -566,20 +561,13 @@ is_shared_component (ACE_CString & name)
     ACE_CString name (name_);
     loc = loc.substr (0, loc.length() - name.length ());    
 
-#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-    ACE_TString decorator (ACE_LD_DECORATOR_STR);
-#endif
-    ACE_TString prefix (ACE_DLL_PREFIX);
-    ACE_TString suffix (ACE_DLL_SUFFIX);
-    
-    ACE_CString new_name (name);
-    new_name = prefix + new_name;
-#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)
-    new_name += decorator;
-#endif
-    new_name += suffix;
+#if defined (ACE_WIN32)
+    name += "d.dll";
+#else
+    name = "lib" + name + ".so";
+#endif    
 
-    loc = loc + new_name;
+    loc = loc + name;
 
     ACE_DEBUG ((LM_INFO,
                 "Attempting to download %s\n",
diff --git a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
index 5cd0eb8dad9..436715588c4 100644
--- a/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -30,9 +30,11 @@ CIAO::NodeImplementationInfoHandler::node_impl_info (void) const
 void
 CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
 {
-  CORBA::ULong const instance_len = plan_.instance.length ();
+  const CORBA::ULong instance_len = plan_.instance.length ();
   const char * target_resource_id = 0;
 
+  CORBA::ULong i;
+
   // Iterate over the instance list to find whether any server resource
   // has been specified
   // TODO: We shoud do some sanity check here, since all the component
@@ -46,7 +48,7 @@ CIAO::NodeImplementationInfoHandler::populate_server_resource_def (void)
   // ServerResource file will be deployed in the same NA.  However,
   // those using different ServerResource files should be deployed to
   // different NAs.  Something to be fixed later.
-  for (CORBA::ULong i = 0; i < instance_len; ++i)
+  for (i = 0; i < instance_len; ++i)
     {
       if (this->plan_.instance[i].deployedResource.length () != 0)
         {
diff --git a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
index c8a04d11484..8515f11479a 100644
--- a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
+++ b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
@@ -6,6 +6,10 @@
 #include "PC_Updater_T.h"
 #include "ace/Containers_T.h"        //for ACE_Double_Linked_List
 
+
+#include <iostream>
+using namespace std;
+
 namespace
 {
   const size_t TEMP_LEN = 1024;
diff --git a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
index aa6e182ddc1..03ebc62a370 100644
--- a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
@@ -18,10 +18,12 @@
 #include "ace/OS_NS_fcntl.h"      //for open
 #include "ace/OS_NS_unistd.h"        //for close
 #include "ace/OS_NS_sys_stat.h"        //for filesize and fstat and mkdir
-#include "ace/streams.h"
 
 #include "Config_Handlers/DnC_Dump.h"
 
+#include <iostream>
+using namespace std;
+
 #include "RM_Helper.h"          //to be able to externalize/internalize a PackageConfiguration
 #include "tao/CDR.h"          //for TAO CDR classes
 #include "ace/Message_Block.h"      //for ACE_Message_Block
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index f332b977078..02e31b897b0 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -48,6 +48,9 @@
 
 #include "ace/Configuration_Import_Export.h"
 
+#include <iostream>
+using namespace std;
+
 namespace
 {
   static const char* PC_EXTENSION = ".epc";
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
index 5af350d275c..a74f5ee377e 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
@@ -79,7 +79,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   NodeImplementationInfoHandler handler (plan, dummy);
 
-  Deployment::NodeImplementationInfo_var node_impl_info (handler.node_impl_info ());
+  Deployment::NodeImplementationInfo * node_impl_info =
+    handler.node_impl_info ();
 
   if (!node_impl_info)
     {
@@ -89,7 +90,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     }
 
-  Deployment::ContainerImplementationInfos& impl_infos = node_impl_info->impl_infos;
+  Deployment::ContainerImplementationInfos& impl_infos = node_impl_info[0].impl_infos;
 
   FILE* fp = ACE_OS::fopen ("plan.h", "w");
 
diff --git a/CIAO/examples/Null_Component/descriptors/Deployment.xsd b/CIAO/examples/Null_Component/descriptors/Deployment.xsd
deleted file mode 100644
index fd4ffe5bc7d..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Deployment.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-            <xsd:include schemaLocation="Basic_Deployment_Data.xsd"/>
-            <xsd:include schemaLocation="cpd.xsd"/>
-            <xsd:include schemaLocation="ccd.xsd"/>
-            <xsd:include schemaLocation="cdd.xsd"/>
-            <xsd:include schemaLocation="cdp.xsd"/>
-            <xsd:include schemaLocation="cid.xsd"/>
-            <xsd:include schemaLocation="iad.xsd"/>
-            <xsd:include schemaLocation="pcd.xsd"/>
-            <xsd:include schemaLocation="toplevel.xsd"/>
-
-
-<!-- Top-level elements. -->
-
-  <xsd:element name="domain" type="Deployment:Domain"/>
-  <xsd:element name="deploymentPlan" type="Deployment:DeploymentPlan"/>
-  <xsd:element name="implementationArtifactDescription" type="Deployment:ImplementationArtifactDescription" />
-  <xsd:element name="componentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/>
-  <xsd:element name="componentImplementationDescription" type="Deployment:ComponentImplementationDescription"/>
-  <xsd:element name="componentPackageDescription" type="Deployment:ComponentPackageDescription"/>
-  <xsd:element name="packageConfiguration" type="Deployment:PackageConfiguration"/>
-  <xsd:element name="topLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/>
-
-</xsd:schema>
diff --git a/CIAO/examples/Null_Component/descriptors/Domain.cdd b/CIAO/examples/Null_Component/descriptors/Domain.cdd
deleted file mode 100644
index a7fd42463fe..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Domain.cdd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:Domain xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_Null_Component_Targets_Domain</UUID>
-
-  <node>
-    <name>NodeA</name>
-  </node>
-
-</Deployment:Domain>
diff --git a/CIAO/examples/Null_Component/descriptors/NodeMap.dat b/CIAO/examples/Null_Component/descriptors/NodeMap.dat
deleted file mode 100644
index 556433b464e..00000000000
--- a/CIAO/examples/Null_Component/descriptors/NodeMap.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-NodeA corbaloc:iiop:localhost:10000/NodeManager
-
-
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid b/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid
deleted file mode 100644
index 6d19c2a050c..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_84CDF595-E42C-43D5-B3FD-C6C6524E068C</UUID>
-
-  <assemblyImpl>
-    <instance xmi:id="_B4BF176E-0386-49EE-B84F-3F2781F3C7BE">
-      <name>Null_Component.ComponentImplementations.Null_Assembly_Container.Null_Assembly.Null_Component</name>
-      <package href="Null_Component_Package.cpd"/>
-    </instance>
-  </assemblyImpl>
-
-</Deployment:ComponentImplementationDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd b/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd
deleted file mode 100644
index 0e4b281531a..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_AAC92636-57DD-4503-A616-CF75AD417E99</UUID>
-
-  <implementation>
-    <name>Null_Assembly</name>
-    <referencedImplementation href="Null_Assembly.cid"/>
-  </implementation>
-
-</Deployment:ComponentPackageDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component.ccd b/CIAO/examples/Null_Component/descriptors/Null_Component.ccd
deleted file mode 100644
index 1553f012e70..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Component.ccd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_FF1F1E30-2916-4A65-96C3-EF29124400A5</UUID>
-
-  <port>
-    <name>null_facet</name>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <provider>true</provider>
-    <kind>Facet</kind>
-  </port>
-
-</Deployment:ComponentInterfaceDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid b/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid
deleted file mode 100644
index 93393fca1c7..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_7B0A12C6-0490-4449-A8B3-9BF3CCDF58FA</UUID>
-
-  <implements href="Null_Component.ccd"/>
-
-  <monolithicImpl>
-    <primaryArtifact>
-      <name>Null_Component_stub</name>
-      <referencedArtifact href="Null_Component_stub.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>Null_Component_svnt</name>
-      <referencedArtifact href="Null_Component_svnt.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>Null_Component_exec</name>
-      <referencedArtifact href="Null_Component_exec.iad"/>
-    </primaryArtifact>
-  </monolithicImpl>
-
-  <configProperty>
-    <name>ComponentIOR</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component.ior</string>
-      </value>
-    </value>
-  </configProperty>
-
-</Deployment:ComponentImplementationDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd b/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd
deleted file mode 100644
index d9f06a4367f..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ComponentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_ABA51225-4A40-4B07-B4EB-467AEEA5BFEE</UUID>
-
-  <realizes href="Null_Component.ccd"/>
-
-  <implementation>
-    <name>Null_ComponentMonolithicImpl</name>
-    <referencedImplementation href="Null_ComponentMonolithicImpl.cid"/>
-  </implementation>
-
-</Deployment:ComponentPackageDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad
deleted file mode 100644
index 9a456b15b60..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_6BECFE2C-84AB-4B4A-B14C-DB8048563368</UUID>
-
-  <location>Null_Component_exec</location>
-
-  <dependsOn>
-    <name>Null_Component_svnt</name>
-    <referencedArtifact href="Null_Component_svnt.iad"/>
-  </dependsOn>
-
-  <dependsOn>
-    <name>Null_Component_stub</name>
-    <referencedArtifact href="Null_Component_stub.iad"/>
-  </dependsOn>
-
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_Component_Home_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad
deleted file mode 100644
index d74f84940fb..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_5249354B-25F0-459E-BC02-5EED8A0122A7</UUID>
-
-  <location>Null_Component_stub</location>
-
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad
deleted file mode 100644
index c6283a3a52c..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:ImplementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>_EBFD46AF-1AF1-4646-891C-5FDE9657AD83</UUID>
-
-  <location>Null_Component_svnt</location>
-
-  <dependsOn>
-    <name>Null_Component_stub</name>
-    <referencedArtifact href="Null_Component_stub.iad"/>
-  </dependsOn>
-
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_Component_Home_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-
-</Deployment:ImplementationArtifactDescription>
diff --git a/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd b/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd
deleted file mode 100644
index 0b09dd0c51e..00000000000
--- a/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:PackageConfiguration xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <basePackage href="Null_Assembly_Package.cpd"/>
-
-</Deployment:PackageConfiguration>
diff --git a/CIAO/examples/Null_Component/descriptors/Plan.cdp b/CIAO/examples/Null_Component/descriptors/Plan.cdp
deleted file mode 100644
index 903fd30bc44..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Plan.cdp
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:deploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <implementation id="Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl">
-    <name>Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl</name>
-    <source/>
-    <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub</artifact>
-    <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt</artifact>
-    <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec</artifact>
-  </implementation>
-
-  <instance id="Null_Component_ComponentImplementations_Null_Assembly_Container_Null_Assembly_Null_Component">
-    <name>Null_Component_ComponentImplementations_Null_Assembly_Container_Null_Assembly_Null_Component</name>
-    <node>NodeA</node>
-    <source/>
-    <implementation>Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Null_Component.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub">
-    <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub</name>
-    <source/>
-    <node/>
-    <location>Null_Component_stub</location>
-  </artifact>
-
-  <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt">
-    <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Null_Component_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Null_Component_Home_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec">
-    <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec</name>
-    <source/>
-    <node/>
-    <location>Null_Component_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Null_Component_Home_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-</Deployment:deploymentPlan>
diff --git a/CIAO/examples/Null_Component/descriptors/XMI.xsd b/CIAO/examples/Null_Component/descriptors/XMI.xsd
deleted file mode 100644
index f4adac91934..00000000000
--- a/CIAO/examples/Null_Component/descriptors/XMI.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?>
-<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'>
-	<xsd:attribute name="id" type="xsd:ID" />
-	<xsd:attributeGroup name="IdentityAttribs">
-		<xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" />
-		<xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" />
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="LinkAttribs">
-		<xsd:attribute name="href" type="xsd:string" use="optional" />
-		<xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" />
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="ObjectAttribs">
-		<xsd:attributeGroup ref="xmi:IdentityAttribs" />
-		<xsd:attributeGroup ref="xmi:LinkAttribs" />
-		<xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" />
-		<xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" />
-	</xsd:attributeGroup>
-	<xsd:complexType name="Extension">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:any processContents="lax" />
-		</xsd:choice>
-		<xsd:attribute ref="xmi:id" />
-		<xsd:attributeGroup ref="xmi:ObjectAttribs" />
-		<xsd:attribute name="extender" type="xsd:string" use="optional" />
-		<xsd:attribute name="extenderID" type="xsd:string" use="optional" />
-	</xsd:complexType>
-	<xsd:element name="Extension" type="xmi:Extension" />
-	<xsd:complexType name="Any">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:any processContents="skip" />
-		</xsd:choice>
-		<xsd:anyAttribute processContents="skip" />
-	</xsd:complexType>
-</xsd:schema>
diff --git a/CIAO/examples/Null_Component/descriptors/package.tpd b/CIAO/examples/Null_Component/descriptors/package.tpd
deleted file mode 100644
index b57255f3618..00000000000
--- a/CIAO/examples/Null_Component/descriptors/package.tpd
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:TopLevelPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <package href="PackageConfiguration.pcd"/>
-
-</Deployment:TopLevelPackageDescription>
diff --git a/CIAO/examples/Null_Component/model/Null_Component.mga b/CIAO/examples/Null_Component/model/Null_Component.mga
deleted file mode 100644
index 6fde9b4175a..00000000000
--- a/CIAO/examples/Null_Component/model/Null_Component.mga
+++ /dev/null
diff --git a/CIAO/examples/Null_Component/model/Null_Component.xme b/CIAO/examples/Null_Component/model/Null_Component.xme
deleted file mode 100644
index 3893827cb76..00000000000
--- a/CIAO/examples/Null_Component/model/Null_Component.xme
+++ /dev/null
@@ -1,843 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project SYSTEM "mga.dtd">
-
-<project guid="{CAA6F237-1527-4481-ADB7-764DB01170E8}" cdate="Tue Oct 10 12:57:50 2006" mdate="Tue Oct 10 12:57:50 2006" version="" metaguid="{1B0D2E44-51AC-4A14-BF57-FADB2F5F9C86}" metaversion="" metaname="PICML">
-	<name>Null_Component</name>
-	<comment></comment>
-	<author></author>
-	<folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x2" kind="RootFolder">
-		<name>Null_Component</name>
-		<folder id="id-006a-00000002" relid="0x2" childrelidcntr="0x2" kind="InterfaceDefinitions">
-			<name>InterfaceDefinitions</name>
-			<model id="id-0065-00000001" kind="File" relid="0x1" childrelidcntr="0x1">
-				<name>Null_Interface</name>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000002" kind="Object" role="Object" relid="0x1" childrelidcntr="0x1">
-					<name>Null_Interface</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>518,318</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="abstract" status="meta">
-						<value>false</value>
-					</attribute>
-					<attribute kind="local" status="meta">
-						<value>false</value>
-					</attribute>
-					<model id="id-0065-00000003" kind="TwowayOperation" role="TwowayOperation" relid="0x1" childrelidcntr="0x0">
-						<name>null_operation</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-					</model>
-				</model>
-			</model>
-			<model id="id-0065-00000004" kind="File" relid="0x2" childrelidcntr="0x4">
-				<name>Null_Component</name>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000005" kind="Component" role="Component" relid="0x2" childrelidcntr="0x1">
-					<name>Null_Component</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>518,318</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<reference id="id-0067-00000002" kind="ProvidedRequestPort" role="ProvidedRequestPort" relid="0x1" referred="id-0065-00000002">
-						<name>null_facet</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="exclusiveProvider" status="meta">
-							<value>false</value>
-						</attribute>
-						<attribute kind="exclusiveUser" status="meta">
-							<value>false</value>
-						</attribute>
-						<attribute kind="optional" status="meta">
-							<value>false</value>
-						</attribute>
-					</reference>
-				</model>
-				<model id="id-0065-00000006" kind="ComponentFactory" role="ComponentFactory" relid="0x3" childrelidcntr="0x0">
-					<name>Null_Component_Home</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>793,493</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-				</model>
-				<reference id="id-0067-00000001" kind="FileRef" role="FileRef" relid="0x1" referred="id-0065-00000001">
-					<name>FileRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>243,143</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000001" kind="ManagesComponent" role="ManagesComponent" relid="0x4">
-					<name>ManagesComponent</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ws</value>
-					</regnode>
-					<connpoint role="dst" target="id-0065-00000005"/>
-					<connpoint role="src" target="id-0065-00000006"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000003" relid="0x1" childrelidcntr="0xb" kind="PredefinedTypes">
-			<name>PredefinedTypes</name>
-			<atom id="id-0066-00000001" kind="TypeKind" relid="0xb">
-				<name>TypeKind</name>
-			</atom>
-			<atom id="id-0066-00000002" kind="TypeEncoding" relid="0xa">
-				<name>TypeEncoding</name>
-			</atom>
-			<atom id="id-0066-00000003" kind="String" relid="0x9">
-				<name>String</name>
-			</atom>
-			<atom id="id-0066-00000004" kind="Boolean" relid="0x8">
-				<name>Boolean</name>
-			</atom>
-			<atom id="id-0066-00000005" kind="ShortInteger" relid="0x7">
-				<name>ShortInteger</name>
-			</atom>
-			<atom id="id-0066-00000006" kind="RealNumber" relid="0x6">
-				<name>RealNumber</name>
-			</atom>
-			<atom id="id-0066-00000007" kind="LongInteger" relid="0x5">
-				<name>LongInteger</name>
-			</atom>
-			<atom id="id-0066-00000008" kind="GenericValueObject" relid="0x4">
-				<name>GenericValueObject</name>
-			</atom>
-			<atom id="id-0066-00000009" kind="GenericValue" relid="0x3">
-				<name>GenericValue</name>
-			</atom>
-			<atom id="id-0066-0000000a" kind="GenericObject" relid="0x2">
-				<name>GenericObject</name>
-			</atom>
-			<atom id="id-0066-0000000b" kind="Byte" relid="0x1">
-				<name>Byte</name>
-			</atom>
-		</folder>
-		<folder id="id-006a-00000004" relid="0x3" childrelidcntr="0x3" kind="ComponentImplementations">
-			<name>ComponentImplementations</name>
-			<model id="id-0065-00000007" kind="ComponentImplementationContainer" relid="0x1" childrelidcntr="0xb">
-				<name>Null_ComponentImplementation</name>
-				<model id="id-0065-00000008" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2">
-					<name>ComponentIOR</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>282,168</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>Null_Component.ior</value>
-					</attribute>
-					<reference id="id-0067-00000003" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<atom id="id-0066-0000000c" kind="MonolithicImplementation" role="MonolithicImplementation" relid="0x1">
-					<name>Null_ComponentMonolithicImpl</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>125,68</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000004" kind="ComponentRef" role="ComponentRef" relid="0x9" referred="id-0065-00000005">
-					<name>Null_ComponentRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>910,568</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000008" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x3" referred="id-0066-0000000d">
-					<name>Null_Component_stubRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>439,268</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000009" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x4" referred="id-0066-0000000e">
-					<name>Null_Component_svntRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>596,368</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000000a" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x5" referred="id-0066-0000000f">
-					<name>Null_Component_execRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>753,468</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000002" kind="ConfigProperty" role="ConfigProperty" relid="0xa">
-					<name>ConfigProperty</name>
-					<connpoint role="dst" target="id-0065-00000008"/>
-					<connpoint role="src" target="id-0066-0000000c"/>
-				</connection>
-				<connection id="id-0068-00000003" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x6">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-00000008"/>
-				</connection>
-				<connection id="id-0068-00000004" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x7">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-00000009"/>
-				</connection>
-				<connection id="id-0068-00000005" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x8">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-0000000a"/>
-				</connection>
-				<connection id="id-0068-00000006" kind="Implements" role="Implements" relid="0xb">
-					<name>Implements</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-00000004"/>
-				</connection>
-			</model>
-			<model id="id-0065-00000015" kind="ComponentImplementationContainer" relid="0x3" childrelidcntr="0x3">
-				<name>Null_Assembly_Container</name>
-				<model id="id-0065-00000018" kind="ComponentAssembly" role="ComponentAssembly" relid="0x3" childrelidcntr="0x1">
-					<name>Null_Assembly</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>212,114</value>
-							</regnode>
-						</regnode>
-						<regnode name="QoSModelAspect" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>212,114</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000019" kind="Component" role="Component" derivedfrom="id-0065-00000005" isinstance="yes" isprimary="yes" relid="0x1" childrelidcntr="0x0">
-						<name>Null_Component</name>
-						<regnode name="PartRegs">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>342,130</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="UUID" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-00000019" kind="ProvidedRequestPort" role="ProvidedRequestPort" derivedfrom="id-0067-00000002" isinstance="yes" isprimary="no" referred="id-0065-00000002" isbound="yes">
-							<name>null_facet</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="exclusiveProvider" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="exclusiveUser" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="optional" status="meta">
-								<value>false</value>
-							</attribute>
-						</reference>
-					</model>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-00000005" relid="0x4" childrelidcntr="0x0" kind="ImplementationArtifacts">
-			<name>ImplementationArtifacts</name>
-			<model id="id-0065-00000009" kind="ArtifactContainer" relid="0x1" childrelidcntr="0xa">
-				<name>Null_ComponentArtifacts</name>
-				<model id="id-0065-0000000a" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2">
-					<name>entryPoint</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>334,200</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>createNull_ComponentHome_Servant</value>
-					</attribute>
-					<reference id="id-0067-00000005" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<model id="id-0065-0000000b" kind="Property" role="Property" relid="0x4" childrelidcntr="0x2">
-					<name>entryPoint</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>700,432</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>createNull_ComponentHome_Impl</value>
-					</attribute>
-					<reference id="id-0067-00000006" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<atom id="id-0066-0000000d" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x1">
-					<name>Null_Component_stub</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>151,84</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Null_Component_stub</value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-0000000e" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x3">
-					<name>Null_Component_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>517,316</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Null_Component_svnt</value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-0000000f" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x5">
-					<name>Null_Component_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>883,548</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>Null_Component_exec</value>
-					</attribute>
-				</atom>
-				<connection id="id-0068-00000007" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x7">
-					<name>ArtifactExecParameter</name>
-					<connpoint role="dst" target="id-0065-0000000a"/>
-					<connpoint role="src" target="id-0066-0000000e"/>
-				</connection>
-				<connection id="id-0068-00000008" kind="ArtifactDependency" role="ArtifactDependency" relid="0x8">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-0000000d"/>
-					<connpoint role="src" target="id-0066-0000000e"/>
-				</connection>
-				<connection id="id-0068-00000009" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x8">
-					<name>ArtifactExecParameter</name>
-					<connpoint role="dst" target="id-0065-0000000b"/>
-					<connpoint role="src" target="id-0066-0000000f"/>
-				</connection>
-				<connection id="id-0068-0000000a" kind="ArtifactDependency" role="ArtifactDependency" relid="0x9">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-0000000e"/>
-					<connpoint role="src" target="id-0066-0000000f"/>
-				</connection>
-				<connection id="id-0068-0000000b" kind="ArtifactDependency" role="ArtifactDependency" relid="0xa">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-0000000d"/>
-					<connpoint role="src" target="id-0066-0000000f"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000006" relid="0x5" childrelidcntr="0x0" kind="ComponentTypes">
-			<name>ComponentTypes</name>
-			<model id="id-0065-0000000c" kind="ComponentContainer" relid="0x1" childrelidcntr="0x1">
-				<name>Null_ComponentContainer</name>
-				<reference id="id-0067-00000007" kind="ComponentRef" role="ComponentRef" relid="0x1" referred="id-0065-00000005">
-					<name>Null_ComponentRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>518,318</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-			</model>
-		</folder>
-		<folder id="id-006a-00000007" relid="0x6" childrelidcntr="0x1" kind="PackageConfigurations">
-			<name>PackageConfigurations</name>
-			<model id="id-0065-00000010" kind="PackageConfigurationContainer" relid="0x1" childrelidcntr="0x6">
-				<name>Default</name>
-				<atom id="id-0066-00000012" kind="PackageConfiguration" role="PackageConfiguration" relid="0x2">
-					<name>PackageConfiguration</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>373,149</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-0000001c" kind="ComponentPackageReference" role="ComponentPackageReference" relid="0x5" referred="id-0066-00000014">
-					<name>Null_Assembly_Package</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>573,146</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="requiredName" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="requiredType" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="requiredUUID" status="meta">
-						<value></value>
-					</attribute>
-				</reference>
-				<connection id="id-0068-00000016" kind="PackageConfReference" role="PackageConfReference" relid="0x6">
-					<name>PackageConfReference</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000012"/>
-					<connpoint role="dst" target="id-0067-0000001c"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000008" relid="0x7" childrelidcntr="0x2" kind="ComponentPackages">
-			<name>ComponentPackages</name>
-			<model id="id-0065-0000000d" kind="PackageContainer" relid="0x1" childrelidcntr="0xa">
-				<name>Null_Component_Package</name>
-				<atom id="id-0066-00000010" kind="ComponentPackage" role="ComponentPackage" relid="0x1">
-					<name>Null_Component_Package</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>366,163</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000010" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x5" referred="id-0066-0000000c">
-					<name>Null_ComponentMonolithicImpl</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>130,158</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000001a" kind="ComponentRef" role="ComponentRef" relid="0x9" referred="id-0065-00000019">
-					<name>Null_Component</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>545,137</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-0000000e" kind="Implementation" role="Implementation" relid="0x6">
-					<name>Implementation</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>We</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000010"/>
-					<connpoint role="dst" target="id-0067-00000010"/>
-				</connection>
-				<connection id="id-0068-00000014" kind="PackageInterface" role="PackageInterface" relid="0xa">
-					<name>PackageInterface</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000010"/>
-					<connpoint role="dst" target="id-0067-0000001a"/>
-				</connection>
-			</model>
-			<model id="id-0065-0000001a" kind="PackageContainer" relid="0x2" childrelidcntr="0x3">
-				<name>Null_Assembly_Package</name>
-				<atom id="id-0066-00000014" kind="ComponentPackage" role="ComponentPackage" relid="0x1">
-					<name>Null_Assembly_Package</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>282,135</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-0000001b" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x2" referred="id-0065-00000018">
-					<name>Null_Assembly</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>502,110</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000015" kind="Implementation" role="Implementation" relid="0x3">
-					<name>Implementation</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000014"/>
-					<connpoint role="dst" target="id-0067-0000001b"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000009" relid="0x8" childrelidcntr="0x1" kind="DeploymentPlans">
-			<name>DeploymentPlans</name>
-			<model id="id-0065-00000014" kind="DeploymentPlan" relid="0x1" childrelidcntr="0x7">
-				<name>Plan</name>
-				<attribute kind="label" status="meta">
-					<value></value>
-				</attribute>
-				<reference id="id-0067-00000013" kind="NodeReference" role="NodeReference" relid="0x2" referred="id-0065-00000013">
-					<name>NodeA</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>305,123</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000001d" kind="ComponentRef" role="ComponentRef" relid="0x7" referred="id-0065-00000019">
-					<name>Null_Component</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>475,102</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000013" kind="InstanceMapping" role="InstanceMapping" relid="0x4">
-					<name>InstanceMapping</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>w</value>
-					</regnode>
-					<connpoint role="dst" target="id-0067-00000013"/>
-					<connpoint role="src" target="id-0069-00000001"/>
-				</connection>
-				<set id="id-0069-00000001" kind="CollocationGroup" role="CollocationGroup" relid="0x1" members="id-0067-0000001d">
-					<name>CollocationGroup</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>114,128</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</set>
-			</model>
-		</folder>
-		<folder id="id-006a-0000000a" relid="0x9" childrelidcntr="0x1" kind="Targets">
-			<name>Targets</name>
-			<model id="id-0065-00000012" kind="Domain" relid="0x1" childrelidcntr="0x1">
-				<name>Domain</name>
-				<attribute kind="UUID" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="label" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000013" kind="Node" role="Node" relid="0x1" childrelidcntr="0x0">
-					<name>NodeA</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Target" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>198,170</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-0000000b" relid="0xa" childrelidcntr="0x1" kind="TopLevelPackages">
-			<name>TopLevelPackages</name>
-			<model id="id-0065-00000011" kind="TopLevelPackageContainer" relid="0x1" childrelidcntr="0x3">
-				<name>Default</name>
-				<atom id="id-0066-00000013" kind="TopLevelPackage" role="TopLevelPackage" relid="0x1">
-					<name>TopLevelPackage</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>240,184</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</atom>
-				<reference id="id-0067-00000012" kind="PackageConfigurationReference" role="PackageConfigurationReference" relid="0x2" referred="id-0066-00000012">
-					<name>PackageConfiguration</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>517,181</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000012" kind="package" role="package" relid="0x3">
-					<name>package</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>w</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000013"/>
-					<connpoint role="dst" target="id-0067-00000012"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-0000000c" relid="0xb" childrelidcntr="0x0" kind="ComponentBuild">
-			<name>ComponentBuild</name>
-		</folder>
-	</folder>
-</project>
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 23f0ed0c58f..34cf7ef2435 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,197 +1,3 @@
-Thu Nov  9 01:19:02 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be_include/be_decl.h:
-
-          Fixed bug where TIE class skeleton code is generated twice
-          when AMH code generation is enabled.
-
-Wed Nov  8 16:16:37 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * docs/releasenotes/index.html:
-        * docs/compiler.html:
-
-          Update IDL compiler documentation to reflect the changes in
-
-          Tue Nov  7 23:13:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Wed Nov  8 14:12:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/AMH_Exceptions/Test.idl:
-        * tests/AMH_Exceptions/server.cpp:
-        * tests/AMH_Exceptions/client.cpp:
-        * tests/AMH_Exceptions/run_test.pl:
-
-          Added clean shutdown option.
-
-Wed Nov  8 13:22:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Muxing/Test.idl:
-        * tests/Muxing/Receiver{.h .cpp}:
-        * tests/Muxing/server.cpp:
-        * tests/Muxing/client.cpp:
-        * tests/Muxing/run_test.pl:
-
-          Added clean shutdown option.
-
-Wed Nov  8 13:14:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Bug_2654_Regression/Hello.cpp:
-
-          Fixed typo causing compile error.
-
-Wed Nov  8 07:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/DSI_Gateway/client.cpp:
-        * tests/DSI_Gateway/test_i.{h,cpp,inl}:
-        * tests/DSI_Gateway/test.idl:
-          Extended this test to also test an attribute, this extension
-          exhibits a few bugs in the DII code. Thanks to Venkat
-          <swara101 at yahoo dot com> for extending this test.
-
-        * tao/DynamicInterface/Context.cpp:
-        * tao/DynamicInterface/DII_Arguments.cpp:
-        * tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp:
-          Const changes and small performance improvements
-
-        * tao/DynamicInterface/Request.cpp:
-          Fixed a few bugs related to the number of arguments, also
-          applied a few const and performance improvements.
-
-Tue Nov  7 23:13:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_operation/tie_si.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_si.cpp:
-        * TAO_IDL/be_include/be_visitor_interface/tie_si.h:
-        * TAO_IDL/be_include/be_visitor_operation/tie_si.h:
-
-          Removed these files.
-
-        * TAO_IDL/be/be_visitor_operation/tie_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_ss.cpp:
-        * TAO_IDL/be_include/be_visitor_interface/tie_ss.h:
-        * TAO_IDL/be_include/be_visitor_operation/tie_ss.h:
-
-          Added these files, in effect renaming the ones listed
-          as removed above.
-
-        * TAO_IDL/be/be_visitor_operation.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_si.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_root/root_si.cpp:
-        * TAO_IDL/be/be_visitor_root/root_sth.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ss.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_visitor_attribute/attribute.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be_include/be_visitor_interface.h:
-        * TAO_IDL/be_include/be_visitor_operation.h:
-
-          Uninlined the generated code for TIE classes, since much
-          of this code consists of virtual functions, and can thus
-          cause problems related to RTTI on some compilers. Thanks
-          to Ossama Othman <ossama@dre.vanderbilt.edu> for
-          reporting the problem. This fix closes [BUGID:2699].
-
-Tue Nov  7 19:45:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2654_Regression/Hello.cpp:
-          ACE_OS::exit() doesn't seem to work well when called from
-          non-main threads on windows. Switching to ORB::shutdown() may
-          improve the performance a bit.
-
-        * tests/Oneway_Timeouts/client.cpp:
-          Replaced cout/cerr with ACE_DEBUG/ACE_ERROR. Also reset the
-          timeout test value before issuing the shutdown invocation. I
-          believe this invocation was the major cause of failures because
-          it would cause a timeout after a delay in a scenaro that is
-          otherwise intended to be asynchronous and otherwise have no
-          delay at all. I also increased the TIME_THRESHOLD value to
-          better accomodate preemptively multitasking test hosts.
-
-Tue Nov  7 20:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * be/be_visitor_exception/exception_cs.cpp:
-          Generate the constructor taking all members as first method. The
-          gcc 3.2.3 based rtems compiler seems to get confused in the
-          generated tests/IDL_Test/anonymousC.cpp file when it is the last
-          method. For other compilers it doesn't make a difference but at
-          least with this change we have an error free compilation for
-          rtems
-
-        * be/be_visitor_valuetype/valuetype_cs.cpp:
-          Generate const for retval
-
-Tue Nov  7 19:06:12 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * tao/ORB_Core.cpp (orbinitializer_registry_i):
-
-          Temporarily reverted
-          "Thu Nov  2 23:23:16 UTC 2006  Ossama Othman  <ossama_othman at
-          symantec.com>" change.  It's not completely correct since it
-          prevents dynamic ORB unloading from working properly when
-          ORBInitializers have been registered.  The existing code isn't
-          correct either but go with it for now since it has been tested
-          more.
-
-Tue Nov  7 12:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Two_Objects/worker.{h,cpp}:
-        * tests/Two_Objects/server.cpp:
-          Renamed timeout to orb_timeout, resolves the warnings in the
-          rtems build where timeout is also something in the rtems
-          glue code.
-
-Tue Nov  7 09:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
-          Fixed warning abour variable not used in rtems build
-
-Tue Nov  7 06:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2654_Regression/client.cpp:
-          Fixed warning in vc7 builds
-
-Mon Nov  6 20:04:53 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2654_Regression/Hello.cpp:
-          Replace ::exit() with ACE_OS::exit() for portability.
-
-Mon Nov  6 19:33:15 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/Object.cpp (_set_policy_overrides):
-
-           When setting the policy overrides on an Object, we need to ensure
-           that when it is collocated it has a collocated servant.
-           Otherwise, narrowing the Object afterward will cause an exception
-           to be thrown.  Thanks to Artur DeEsperanto <DrEsperanto at gmx
-           dot net> for reporting this.
-
-        * tests/Bug_2134_Regression/Bug_2134_Regression.mpc:
-        * tests/Bug_2134_Regression/Hello.cpp:
-
-          Modified this test to utilize _set_policy_overrides() on the
-          collocated object to exercise the change above.
-
-Mon Nov  6 09:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/CollocationLockup/CollocationLockup.cpp:
-        * tests/CollocationLockup/AB.idl:
-          Renamed struct B to struct C to resolve compile problems with
-          rtems which seems to have a struct B.
-
-        * tests/Multiple_Inheritance/client.cpp:
-        * tests/Multiple_Inheritance/Multiple_Inheritance.idl:
-          Renamed B to intB to resolve compile problems with
-          rtems which seems to have a struct B.
-
 Fri Nov  3 22:16:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/ast/ast_sequence.cpp (in_recursion):
diff --git a/TAO/ChangeLog.rt8089 b/TAO/ChangeLog.rt8089
deleted file mode 100644
index 1dd68d97ff6..00000000000
--- a/TAO/ChangeLog.rt8089
+++ /dev/null
@@ -1,68 +0,0 @@
-Wed Nov  8 18:42:03 UTC 2006  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * docs/ec_options.html: Add documentation for TPC and
-          -ECDispatchingThreadFlags options.
-
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-
-          Added new option, -ECDispatchingThreadsFlags, that allows the
-          user to pass in a list of thread creation flags and priority for
-          dispatching threads.  These can be used for either the MT
-          dispatching strategy or the TPC dispatching strategy.
-
-          Also added -ECDebug option to enable debugging output from the
-          RTEC.  Only the option and variable was added, but no messages.
-          Therefore, at the moment, this does not generate much output.
-
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Factory.cpp:
-
-          Added support for RTEC's debug level.
-
-        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
-
-          (CTOR) Changed so that thread flags can be passed in just like
-          with the MT dispatching strategy.
-
-          (add_consumer) Modified so that it passes the thread flags set
-          in the CTOR to the dispatching task's activate call.
-
-        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp (create_dispatching):
-
-          Update to reflect new CTOR args for EC_TPC_Dispatching.
-
-        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp:
-        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl:
-        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp:
-
-          Change references to EC_TPC_debug_level to
-          TAO_EC_TPC_debug_level for proper scoping.
-
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.h:
-        * orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp:
-
-          Added new abstraction around thread flags.  This also handles
-          parsing of text representation of THR_* options.  Ideally this
-          is part of ACE, but such a low-level change is difficult to push
-          through in general, much less in a patch.
-
-        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
-
-          Updated with new files.
-
-        * orbsvcs/tests/Event/ThreadFlags/testflags.cpp:
-        * orbsvcs/tests/Event/ThreadFlags/tftest.mpc:
-
-          Added unit test for TAO_EC_Thread_Flags abstraction.
-          Unfortunately, due to the way that some of the thread flags
-          are encoded on some platforms, e.g., Linux, the test can
-          give false failing indications.  I've left this as-is for
-          now because I haven't decided if this is a flaw in the test,
-          a flaw in the TAO_EC_Thread_Flags abstraction, or a flaw in
-          the way ACE assigns values when a THR_ symbol is not provided
-          by the platform itself.
-
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index e5b567283fb..742e63a5870 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -43,6 +43,7 @@ TAO_CodeGen::TAO_CodeGen (void)
     server_skeletons_ (0),
     server_template_skeletons_ (0),
     server_inline_ (0),
+    server_template_inline_ (0),
     anyop_header_ (0),
     anyop_source_ (0),
     gperf_input_stream_ (0),
@@ -718,6 +719,15 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname)
       << be_global->be_get_server_template_hdr_fname (1)
       << "\"";
 
+  // Generate the code that includes the inline file if not included in the
+  // header file.
+  *this->server_template_skeletons_ << "\n\n#if !defined (__ACE_INLINE__)";
+  *this->server_template_skeletons_
+      << "\n#include \""
+      << be_global->be_get_server_template_inline_fname (1)
+      << "\"";
+  *this->server_template_skeletons_ << "\n#endif /* !defined INLINE */\n\n";
+
   // Begin versioned namespace support after initial headers have been
   // included, but before the inline file and post include
   // directives.
@@ -771,6 +781,47 @@ TAO_CodeGen::server_inline (void)
   return this->server_inline_;
 }
 
+// Set the server template inline stream.
+int
+TAO_CodeGen::start_server_template_inline (const char *fname)
+{
+  // Retrieve the singleton instance to the outstream factory.
+  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
+
+  // Clean up between multiple files.
+  delete this->server_template_inline_;
+  this->server_template_inline_ = factory->make_outstream ();
+
+  if (!this->server_template_inline_)
+    {
+      return -1;
+    }
+
+  if (this->server_template_inline_->open (fname,
+                                           TAO_OutStream::TAO_SVR_INL)
+       == -1)
+    {
+      return -1;
+    }
+
+  // Generate the ident string, if any.
+  this->gen_ident_string (this->server_template_inline_);
+
+  // Begin versioned namespace support after initial headers have been
+  // included, but before the inline file and post include
+  // directives.
+  *this->server_template_inline_ << be_global->versioning_begin ();
+
+  return 0;
+}
+
+// Get the server template inline stream.
+TAO_OutStream *
+TAO_CodeGen::server_template_inline (void)
+{
+  return this->server_template_inline_;
+}
+
 int
 TAO_CodeGen::start_anyop_header (const char *fname)
 {
@@ -1303,6 +1354,14 @@ TAO_CodeGen::end_server_template_header (void)
   // before this.
   *this->server_template_header_ << be_global->versioning_end ();
 
+  // Insert the code to include the inline file.
+  *this->server_template_header_ << "#if defined (__ACE_INLINE__)";
+  *this->server_template_header_
+      << "\n#include \""
+      << be_global->be_get_server_template_inline_fname (1)
+      << "\"";
+  *this->server_template_header_ << "\n#endif /* defined INLINE */";
+
   // Insert the code to include the template source file.
   *this->server_template_header_
       << "\n\n#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)";
@@ -1336,6 +1395,18 @@ TAO_CodeGen::end_server_template_header (void)
 }
 
 int
+TAO_CodeGen::end_server_template_inline (void)
+{
+  *this->server_template_inline_ << "\n";
+
+  // End versioned namespace support.  Do not place include directives
+  // before this.
+  *this->server_template_inline_ << be_global->versioning_end ();
+
+  return 0;
+}
+
+int
 TAO_CodeGen::end_server_template_skeletons (void)
 {
   // End versioned namespace support.  Do not place include directives
@@ -2394,6 +2465,7 @@ TAO_CodeGen::destroy (void)
   delete this->server_template_skeletons_;
   delete this->client_inline_;
   delete this->server_inline_;
+  delete this->server_template_inline_;
   delete this->anyop_source_;
   delete this->anyop_header_;
 #if !defined (linux) && !defined (__QNX__) && !defined (__GLIBC__)
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index f930a198fd7..9bdf24f9d94 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -60,7 +60,6 @@ be_decl::be_decl (void)
     srv_skel_gen_ (false),
     impl_skel_gen_ (false),
     srv_inline_gen_ (false),
-    tie_skel_gen_ (false),
     cli_hdr_any_op_gen_ (false),
     cli_stub_any_op_gen_ (false),
     cli_hdr_cdr_op_gen_ (false),
@@ -112,7 +111,6 @@ be_decl::be_decl (AST_Decl::NodeType type,
     srv_skel_gen_ (false),
     impl_skel_gen_ (false),
     srv_inline_gen_ (false),
-    tie_skel_gen_ (false),
     cli_hdr_any_op_gen_ (false),
     cli_stub_any_op_gen_ (false),
     cli_hdr_cdr_op_gen_ (false),
@@ -589,12 +587,6 @@ be_decl::srv_inline_gen (void)
 }
 
 bool
-be_decl::tie_skel_gen (void)
-{
-  return this->tie_skel_gen_;
-}
-
-bool
 be_decl::ccm_pre_proc_gen (void)
 {
   return this->ccm_pre_proc_gen_;
@@ -843,12 +835,6 @@ be_decl::srv_inline_gen (bool val)
 }
 
 void
-be_decl::tie_skel_gen (bool val)
-{
-  this->tie_skel_gen_ = val;
-}
-
-void
 be_decl::ccm_pre_proc_gen (bool val)
 {
   this->ccm_pre_proc_gen_ = val;
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 46b004d62ac..26c63266936 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -69,6 +69,7 @@ BE_GlobalData::BE_GlobalData (void)
     server_skeleton_ending_ (ACE::strnew ("S.cpp")),
     server_template_skeleton_ending_ (ACE::strnew ("S_T.cpp")),
     server_inline_ending_ (ACE::strnew ("S.inl")),
+    server_template_inline_ending_ (ACE::strnew ("S_T.inl")),
     anyop_hdr_ending_ (ACE::strnew ("A.h")),
     anyop_src_ending_ (ACE::strnew ("A.cpp")),
     output_dir_ (0),
@@ -358,6 +359,17 @@ BE_GlobalData::be_get_server_inline (UTL_String *idl_file_name,
 }
 
 const char *
+BE_GlobalData::be_get_server_template_inline (UTL_String *idl_file_name,
+                                              bool base_name_only)
+{
+  return be_change_idl_file_extension (idl_file_name,
+                                       be_global->server_template_inline_ending (),
+                                       base_name_only,
+                                       false,
+                                       true);
+}
+
+const char *
 BE_GlobalData::be_get_anyop_header (UTL_String *idl_file_name,
                                     bool base_name_only)
 {
@@ -452,6 +464,13 @@ BE_GlobalData::be_get_server_inline_fname (bool base_name_only)
 }
 
 const char *
+BE_GlobalData::be_get_server_template_inline_fname (bool base_name_only)
+{
+  return be_get_server_template_inline (idl_global->stripped_filename (),
+                                        base_name_only);
+}
+
+const char *
 BE_GlobalData::be_get_anyop_source_fname (bool base_name_only)
 {
   return be_get_anyop_source (idl_global->stripped_filename (),
@@ -832,6 +851,19 @@ BE_GlobalData::server_inline_ending (void) const
 }
 
 void
+BE_GlobalData::server_template_inline_ending (const char* s)
+{
+  delete [] this->server_template_inline_ending_;
+  this->server_template_inline_ending_ = ACE::strnew (s);
+}
+
+const char*
+BE_GlobalData::server_template_inline_ending (void) const
+{
+  return this->server_template_inline_ending_;
+}
+
+void
 BE_GlobalData::anyop_header_ending (const char* s)
 {
   delete [] this->anyop_hdr_ending_;
@@ -1217,6 +1249,9 @@ BE_GlobalData::destroy (void)
   delete [] this->server_inline_ending_;
   this->server_inline_ending_ = 0;
 
+  delete [] this->server_template_inline_ending_;
+  this->server_template_inline_ending_ = 0;
+
   delete [] this->anyop_hdr_ending_;
   this->anyop_hdr_ending_ = 0;
 
@@ -1629,7 +1664,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             be_global->use_clonable_in_args(true);
           }
         else
-          {
+          { 
             ACE_ERROR ((
                 LM_ERROR,
                 ACE_TEXT ("IDL: I don't understand")
@@ -1676,6 +1711,8 @@ BE_GlobalData::parse_args (long &i, char **av)
         //      Default is "S_T.cpp".
         // <-si Server's inline file name ending>
         //      Default is "S.inl".
+        // <-st Server's template inline file name ending>
+        //      Default is "S_T.inl".
         // <-sI Server's implementation skeleton file name ending>
         //      Default is "I.cpp".
 
@@ -1697,6 +1734,12 @@ BE_GlobalData::parse_args (long &i, char **av)
             be_global->server_inline_ending (av[i + 1]);
             ++i;
           }
+        else if (av[i][2] == 't')
+          {
+            idl_global->append_idl_flag (av[i + 1]);
+            be_global->server_template_inline_ending (av[i + 1]);
+            ++i;
+          }
         else if (av[i][2] == 'I')
           {
             idl_global->append_idl_flag (av[i + 1]);
@@ -2698,6 +2741,11 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -st\t\t\tServer's template inline file name ending.")
+      ACE_TEXT (" Default S_T.inl\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -sT\t\t\tServer's template skeleton file name ending.")
       ACE_TEXT (" Default is S_T.cpp\n")
     ));
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
index 43bda6159cc..93bcd6f9c2e 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
@@ -73,9 +73,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
 
   get_op.set_name ((UTL_IdList *) node->name ()->copy ());
   get_op.set_defined_in (node->defined_in ());
-
+  
   UTL_ExceptList *get_exceptions = node->get_get_exceptions ();
-
+  
   if (0 != get_exceptions)
     {
       get_op.be_add_exceptions (get_exceptions->copy ());
@@ -85,7 +85,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   // to the operation.
   be_operation_strategy *old_strategy =
     get_op.set_strategy (node->get_get_strategy ()->copy ());
-
+    
   if (0 != old_strategy)
     {
       old_strategy->destroy ();
@@ -160,9 +160,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
         status = get_op.accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_TIE_SS:
+    case TAO_CodeGen::TAO_ROOT_TIE_SI:
       {
-        be_visitor_operation_tie_ss visitor (&ctx);
+        be_visitor_operation_tie_si visitor (&ctx);
         status = get_op.accept (&visitor);
         break;
       }
@@ -224,7 +224,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
           visitor = 0;
         }
     }
-
+    
   get_op.destroy ();
 
   // Do nothing for readonly attributes.
@@ -243,13 +243,13 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   // The return type  is "void".
   be_predefined_type rt (AST_PredefinedType::PT_void,
                          &sn);
-
+ 
   // Argument type is the same as the attribute type.
   AST_Argument *arg =
     idl_global->gen ()->create_argument (AST_Argument::dir_IN,
                                          node->field_type (),
                                          node->name ());
-
+                                         
   arg->set_name ((UTL_IdList *) node->name ()->copy ());
   // Create the operation.
   be_operation set_op (&rt,
@@ -260,9 +260,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   set_op.set_name ((UTL_IdList *) node->name ()->copy ());
   set_op.set_defined_in (node->defined_in ());
   set_op.be_add_argument (arg);
-
+  
   UTL_ExceptList *set_exceptions = node->get_set_exceptions ();
-
+  
   if (0 != set_exceptions)
     {
       set_op.be_add_exceptions (set_exceptions->copy ());
@@ -347,9 +347,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
         status = set_op.accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_TIE_SS:
+    case TAO_CodeGen::TAO_ROOT_TIE_SI:
       {
-        be_visitor_operation_tie_ss visitor (&ctx);
+        be_visitor_operation_tie_si visitor (&ctx);
         status = set_op.accept (&visitor);
         break;
       }
@@ -424,7 +424,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
       delete visitor;
       visitor = 0;
     }
-
+    
   set_op.destroy ();
   rt.destroy ();
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 4c3d9d8a4af..376e6244a6a 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -49,7 +49,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   os->indent ();
 
-  // Generate stub code required of any anonymous types of members.
+  // Generate stub code  required of any anonymous types of members.
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,53 +59,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
                         -1);
     }
 
-  be_visitor_context ctx (*this->ctx_);
-
-  // Constructor taking all members. It exists only if there are any
-  // members.
-  if (node->member_count () > 0)
-    {
-      // Generate the signature.
-      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_CS);
-      be_visitor_exception_ctor ec_visitor (&ctx);
-
-      if (node->accept (&ec_visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception::"
-                             "visit_exception - "
-                             "codegen for ctor failed\n"),
-                            -1);
-        }
-
-      *os << be_idt_nl
-          << ": ::CORBA::UserException ("
-          << be_idt << be_idt << be_idt_nl
-          << "\"" << node->repoID () << "\"," << be_nl
-          << "\"" << node->local_name () << "\"" << be_uidt_nl
-          << ")" << be_uidt << be_uidt << be_uidt_nl;
-      *os << "{" << be_idt;
-
-      // Assign each individual member. We need yet another state.
-      ctx = *this->ctx_;
-
-      // Indicate that the special ctor is being generated.
-      ctx.exception (true);
-
-      be_visitor_exception_ctor_assign eca_visitor (&ctx);
-
-      if (node->accept (&eca_visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception_cs::"
-                             "visit_exception -"
-                             "codegen for scope failed\n"),
-                            -1);
-        }
-
-      *os << be_uidt_nl << "}" << be_nl << be_nl;
-    }
-
   *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
@@ -134,7 +87,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << ")" << be_uidt << be_uidt << be_uidt_nl;
   *os << "{";
 
-  ctx = *this->ctx_;
+  be_visitor_context ctx (*this->ctx_);
 
   if (node->nmembers () > 0)
     {
@@ -322,6 +275,52 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "}" << be_nl << be_nl;
     }
 
+  // Constructor taking all members. It exists only if there are any
+  // members.
+  if (node->member_count () > 0)
+    {
+      // Generate the signature.
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_EXCEPTION_CTOR_CS);
+      be_visitor_exception_ctor ec_visitor (&ctx);
+
+      if (node->accept (&ec_visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_exception::"
+                             "visit_exception - "
+                             "codegen for ctor failed\n"),
+                            -1);
+        }
+
+      *os << be_idt_nl
+          << ": ::CORBA::UserException ("
+          << be_idt << be_idt << be_idt_nl
+          << "\"" << node->repoID () << "\"," << be_nl
+          << "\"" << node->local_name () << "\"" << be_uidt_nl
+          << ")" << be_uidt << be_uidt << be_uidt_nl;
+      *os << "{" << be_idt;
+
+      // Assign each individual member. We need yet another state.
+      ctx = *this->ctx_;
+
+      // Indicate that the special ctor is being generated.
+      ctx.exception (1);
+
+      be_visitor_exception_ctor_assign eca_visitor (&ctx);
+
+      if (node->accept (&eca_visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_exception_cs::"
+                             "visit_exception -"
+                             "codegen for scope failed\n"),
+                            -1);
+        }
+
+      *os << be_uidt_nl << "}" << be_nl << be_nl;
+    }
+
   // Switch streams to the *A.cpp file if we are using this option.
   if (be_global->gen_anyop_files ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 2494d2755f3..bab1d145dd5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -66,7 +66,7 @@
 #include "be_visitor_interface/interface_ss.cpp"
 #include "be_visitor_interface/interface_is.cpp"
 #include "be_visitor_interface/tie_sh.cpp"
-#include "be_visitor_interface/tie_ss.cpp"
+#include "be_visitor_interface/tie_si.cpp"
 #include "be_visitor_interface/any_op_ch.cpp"
 #include "be_visitor_interface/any_op_cs.cpp"
 #include "be_visitor_interface/cdr_op_ch.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
index c8bef6a36d7..6619f38955d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -156,7 +156,7 @@ be_visitor_interface::add_abstract_op_args (AST_Operation *old_op,
     }
 
   UTL_ExceptList *excep_list = old_op->exceptions ();
-
+  
   if (0 != excep_list)
     {
       new_op.be_add_exceptions (excep_list->copy ());
@@ -443,9 +443,9 @@ be_visitor_interface::visit_operation (be_operation *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_TIE_SS:
+    case TAO_CodeGen::TAO_ROOT_TIE_SI:
       {
-        be_visitor_operation_tie_ss visitor (&ctx);
+        be_visitor_operation_tie_si visitor (&ctx);
         status = node->accept (&visitor);
         break;
       }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
index deacb66cb3d..1f140530861 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
@@ -100,6 +100,24 @@ be_visitor_interface_si::visit_interface (be_interface *node)
         }
     }
 
+  if (be_global->gen_tie_classes ())
+    {
+      // Generate the TIE class.
+      be_visitor_context ctx (*this->ctx_);
+      ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SI);
+      ctx.stream (tao_cg->server_template_inline ());
+      be_visitor_interface_tie_si visitor (&ctx);
+
+      if (node->accept (&visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_sh::"
+                             "visit_interface - "
+                             "codegen for TIE class failed\n"),
+                            -1);
+        }
+    }
+
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 640c696c99e..7b52627a051 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -285,7 +285,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
     *os << be_uidt_nl
         << "}";
-
+    
     is_a.destroy ();
     rt.destroy ();
     s.get ()->destroy ();
@@ -393,7 +393,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
     *os << be_uidt_nl
         << "}";
-
+        
     non_existent.destroy ();
     rt.destroy ();
   }
@@ -504,7 +504,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
     *os << be_uidt_nl
         << "}";
-
+    
     repository_id.destroy ();
     s.get ()->destroy ();
   }
@@ -666,7 +666,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
         << ");" << TAO_ACE_CHECK () << be_uidt_nl
         << "}";
-
+  
     get_component.destroy ();
     rt.destroy ();
   }
@@ -734,27 +734,6 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   this->this_method (node);
 
-  if (be_global->gen_tie_classes () && !node->tie_skel_gen ())
-    {
-      // Generate the TIE class.
-      be_visitor_context ctx (*this->ctx_);
-      ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SS);
-      ctx.stream (tao_cg->server_template_skeletons ());
-      be_visitor_interface_tie_ss visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_ss::"
-                             "visit_interface - "
-                             "codegen for TIE class failed\n"),
-                            -1);
-        }
-
-      // AMH generation reuses this visit_interface(), hence the flag.
-      node->tie_skel_gen (true);
-    }
-
   return 0;
 }
 
@@ -787,12 +766,12 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
                              "bad node in this scope\n"),
                             -1);
         }
-
+        
       AST_Decl::NodeType nt = d->node_type ();
-
+  
       UTL_ScopedName *item_new_name = 0;
       UTL_ScopedName *new_name = 0;
-
+      
       if (AST_Decl::NT_op == nt || AST_Decl::NT_attr == nt)
         {
           ACE_NEW_RETURN (item_new_name,
@@ -820,10 +799,10 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
           op->set_name (new_name);
           op->set_defined_in (node);
           op->is_abstract (node->is_abstract ());
-
+          
           be_visitor_operation_ss op_visitor (&ctx);
           op_visitor.visit_operation (op);
-
+          
           op->set_name (old_name);
           op->set_defined_in (base);
           op->is_abstract (base->is_abstract ());
@@ -838,21 +817,21 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
                                  attr->is_abstract ());
           new_attr.set_defined_in (node);
           new_attr.set_name (new_name);
-
+          
           UTL_ExceptList *get_exceptions = attr->get_get_exceptions ();
-
+          
           if (0 != get_exceptions)
             {
               new_attr.be_add_get_exceptions (get_exceptions->copy ());
             }
-
+            
           UTL_ExceptList *set_exceptions = attr->get_set_exceptions ();
-
+          
           if (0 != set_exceptions)
             {
               new_attr.be_add_set_exceptions (set_exceptions->copy ());
             }
-
+            
           be_visitor_attribute attr_visitor (&ctx);
           attr_visitor.visit_attribute (&new_attr);
           ctx.attribute (0);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index 28aa5d09be6..d5d3c41885a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -170,8 +170,8 @@ be_visitor_interface_tie_sh::method_helper (be_interface *,
     }
 
   be_visitor_context ctx;
-  ctx.stream (os);
   ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SH);
+  ctx.stream (os);
   be_visitor_interface_tie_sh visitor (&ctx);
 
   if (visitor.visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
index 9052c5271dc..b92c0a98860 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -8,7 +8,7 @@
 //    TAO IDL
 //
 // = FILENAME
-//    tie_ss.cpp
+//    tie_si.cpp
 //
 // = DESCRIPTION
 //    Visitor generating code for TIE classes for the Interface node in the
@@ -20,7 +20,7 @@
 // ============================================================================
 
 ACE_RCSID (be_visitor_interface,
-           tie_ss,
+           tie_si,
            "$Id$")
 
 
@@ -28,19 +28,19 @@ ACE_RCSID (be_visitor_interface,
 // Interface visitor for server inline
 // ************************************************************************
 
-be_visitor_interface_tie_ss::be_visitor_interface_tie_ss (
+be_visitor_interface_tie_si::be_visitor_interface_tie_si (
     be_visitor_context *ctx
   )
   : be_visitor_interface (ctx)
 {
 }
 
-be_visitor_interface_tie_ss::~be_visitor_interface_tie_ss (void)
+be_visitor_interface_tie_si::~be_visitor_interface_tie_si (void)
 {
 }
 
 int
-be_visitor_interface_tie_ss::visit_interface (be_interface *node)
+be_visitor_interface_tie_si::visit_interface (be_interface *node)
 {
   if (node->srv_inline_gen ()
       || node->imported ()
@@ -95,14 +95,14 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "template <class T>" << be_nl
+  *os << "template <class T> ACE_INLINE" << be_nl
       << fulltiename << "<T>::" << localtiename << " (T &t)" << be_nl
       << "\t: ptr_ (&t)," << be_nl
       << "\t  poa_ (PortableServer::POA::_nil ())," << be_nl
       << "\t  rel_ (0)" << be_nl
       << "{}" << be_nl << be_nl;
 
-  *os << "template <class T> " << be_nl
+  *os << "template <class T> ACE_INLINE" << be_nl
       << fulltiename << "<T>::" << localtiename
       << " (T &t, PortableServer::POA_ptr poa)" << be_nl
       << "\t: ptr_ (&t)," << be_nl
@@ -110,7 +110,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "\t  rel_ (0)" << be_nl
       << "{}" << be_nl << be_nl;
 
-  *os << "template <class T>" << be_nl
+  *os << "template <class T> ACE_INLINE" << be_nl
       << fulltiename << "<T>::" << localtiename
       << " (T *tp, ::CORBA::Boolean release)" << be_nl
       << "\t: ptr_ (tp)," << be_nl
@@ -118,7 +118,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "\t  rel_ (release)" << be_nl
       << "{}" << be_nl << be_nl;
 
-  *os << "template <class T>" << be_nl
+  *os << "template <class T> ACE_INLINE" << be_nl
       << fulltiename << "<T>::" << localtiename
       << " (T *tp, PortableServer::POA_ptr poa, ::CORBA::Boolean release)"
       << be_nl
@@ -127,7 +127,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "\t  rel_ (release)" << be_nl
       << "{}" << be_nl << be_nl;
 
-  *os << "template <class T>" << be_nl
+  *os << "template <class T> ACE_INLINE" << be_nl
       << fulltiename << "<T>::~" << localtiename << " (void)" << be_nl
       << "{" << be_idt_nl
       << "if (this->rel_)" << be_idt_nl
@@ -136,13 +136,13 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "}" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> T *" << be_nl
+  *os << "template <class T> ACE_INLINE T *" << be_nl
       << fulltiename << "<T>::_tied_object (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->ptr_;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> void" << be_nl
+  *os << "template <class T> ACE_INLINE void" << be_nl
       << fulltiename << "<T>::_tied_object (T &obj)" << be_nl
       << "{" << be_idt_nl
       << "if (this->rel_)" << be_idt_nl
@@ -153,7 +153,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "this->rel_ = 0;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> void" << be_nl
+  *os << "template <class T> ACE_INLINE void" << be_nl
       << fulltiename << "<T>::_tied_object (T *obj, "
       << "::CORBA::Boolean release)" << be_nl
       << "{" << be_idt_nl
@@ -165,19 +165,19 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "this->rel_ = release;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T>  ::CORBA::Boolean" << be_nl
+  *os << "template <class T> ACE_INLINE ::CORBA::Boolean" << be_nl
       << fulltiename << "<T>::_is_owner (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->rel_;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> void" << be_nl
+  *os << "template <class T> ACE_INLINE void" << be_nl
       << fulltiename << "<T>::_is_owner ( ::CORBA::Boolean b)" << be_nl
       << "{" << be_idt_nl
       << "this->rel_ = b;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> "
+  *os << "template <class T> ACE_INLINE "
       << "PortableServer::POA_ptr" << be_nl
       << fulltiename
       << "<T>::_default_POA ("
@@ -197,7 +197,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
 
   int status =
     node->traverse_inheritance_graph (
-              be_visitor_interface_tie_ss::method_helper,
+              be_visitor_interface_tie_si::method_helper,
               os
             );
 
@@ -214,13 +214,13 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
 }
 
 int
-be_visitor_interface_tie_ss::visit_component (be_component *node)
+be_visitor_interface_tie_si::visit_component (be_component *node)
 {
   return this->visit_interface (node);
 }
 
 int
-be_visitor_interface_tie_ss::method_helper (be_interface *derived,
+be_visitor_interface_tie_si::method_helper (be_interface *derived,
                                             be_interface *node,
                                             TAO_OutStream *os)
 {
@@ -234,16 +234,16 @@ be_visitor_interface_tie_ss::method_helper (be_interface *derived,
     }
 
   be_visitor_context ctx;
+  ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SI);
   ctx.interface (derived);
   ctx.stream (os);
-  ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SS);
-  be_visitor_interface_tie_ss visitor (&ctx);
+  be_visitor_interface_tie_si visitor (&ctx);
 
   if (visitor.visit_scope (node) == -1)
 
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_tie_ss::"
+                         "be_visitor_interface_tie_si::"
                          "method_helper\n"),
                         -1);
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp
index 11b3ed2635b..6b5b8e35f33 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp
@@ -70,7 +70,7 @@
 #include "be_visitor_operation/rettype.cpp"
 #include "be_visitor_operation/rettype_return_cs.cpp"
 #include "be_visitor_operation/tie_sh.cpp"
-#include "be_visitor_operation/tie_ss.cpp"
+#include "be_visitor_operation/tie_si.cpp"
 #include "be_visitor_operation/upcall_command_ss.cpp"
 
 // AMI
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
index 8675c7ecd8f..ffa3758d8c8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
@@ -8,7 +8,7 @@
 //    TAO IDL
 //
 // = FILENAME
-//    tie_ss.cpp
+//    tie_si.cpp
 //
 // = DESCRIPTION
 //    Visitor generating code for operations for the TIE class.
@@ -19,25 +19,25 @@
 // ============================================================================
 
 ACE_RCSID (be_visitor_operation,
-           tie_ss,
+           tie_si,
            "$Id$")
 
 // ************************************************************
 // Operation visitor for server inline for TIE class operations.
 // ************************************************************
 
-be_visitor_operation_tie_ss::be_visitor_operation_tie_ss (
+be_visitor_operation_tie_si::be_visitor_operation_tie_si (
     be_visitor_context *ctx
   )
   : be_visitor_scope (ctx)
 {
 }
 
-be_visitor_operation_tie_ss::~be_visitor_operation_tie_ss (void)
+be_visitor_operation_tie_si::~be_visitor_operation_tie_si (void)
 {
 }
 
-int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
+int be_visitor_operation_tie_si::visit_operation (be_operation *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -46,7 +46,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
   if (!intf)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_tie_ss::"
+                         "(%N:%l) be_visitor_operation_tie_si::"
                          "visit_operation - "
                          "bad interface scope\n"),
                         -1);
@@ -58,7 +58,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_tie_ss::"
+                         "(%N:%l) be_visitor_operation_tie_si::"
                          "visit_operation - "
                          "Bad return type\n"),
                         -1);
@@ -100,7 +100,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "template <class " << template_name.c_str () << ">" << be_nl;
+  *os << "template <class " << template_name.c_str () << "> ACE_INLINE\n";
 
   // Generate the return type mapping (same as in the header file).
   be_visitor_context ctx (*this->ctx_);
@@ -109,7 +109,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
   if (bt->accept (&oro_visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_tie_ss::"
+                         "(%N:%l) be_visitor_operation_tie_si::"
                          "visit_operation - "
                          "codegen for return type failed\n"),
                         -1);
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 44ae5a92566..9c3ce0b4462 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -476,6 +476,11 @@ int be_visitor_root::visit_root (be_root *node)
         );
       break;
     case TAO_CodeGen::TAO_ROOT_SI:
+      if (be_global->gen_tie_classes ())
+        {
+          (void) tao_cg->end_server_template_inline ();
+        }
+
       tao_cg->end_server_inline ();
       break;
     case TAO_CodeGen::TAO_ROOT_SS:
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
index 86c0b7e6e71..77cd9ceb807 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_root,
-           root_si,
+ACE_RCSID (be_visitor_root, 
+           root_si, 
            "$Id$")
 
 // ***********************************************
@@ -44,10 +44,24 @@ be_visitor_root_si::init (void)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root_si::init - "
-                         "server inline open failed\n"),
+                         "server inline open failed\n"), 
                         -1);
     }
 
+  if (be_global->gen_tie_classes ())
+    {
+      if (tao_cg->start_server_template_inline (
+              be_global->be_get_server_template_inline_fname ()
+            )
+          == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_root_si::init - "
+                             "Error opening server template inline file\n"),
+                            -1);
+        }
+    }
+
   // init stream
   this->ctx_->stream (tao_cg->server_inline ());
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
index dbc1581678b..fcaf4307fac 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_root,
-           root_ss,
+ACE_RCSID (be_visitor_root, 
+           root_ss, 
            "$Id$")
 
 // ******************************************************
@@ -46,7 +46,7 @@ be_visitor_root_ss::init (void)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root_ss::init - "
-                         "Error opening server skeletons file\n"),
+                         "Error opening server skeletons file\n"), 
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
index a79c5025119..c0d397965d0 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_root,
-           root_sth,
+ACE_RCSID (be_visitor_root, 
+           root_sth, 
            "$Id$")
 
 // ****************************************
@@ -156,7 +156,9 @@ be_visitor_root_sth::visit_interface (be_interface *node)
 
   // Generate the TIE class.
 
+  this->ctx_->state (TAO_CodeGen::TAO_ROOT_TIE_SH);
   this->ctx_->node (node);
+
   be_visitor_interface_tie_sh visitor (this->ctx_);
 
   if (node->accept (&visitor) == -1)
@@ -168,6 +170,8 @@ be_visitor_root_sth::visit_interface (be_interface *node)
                         -1);
     }
 
+  this->ctx_->state (TAO_CodeGen::TAO_ROOT_TIE_SH);
+
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 121fe9b64f1..8e577ec39bf 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -279,7 +279,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "::CORBA::ValueBase *base = 0;" << be_nl
-      << "::CORBA::Boolean const retval =" << be_idt_nl
+      << "::CORBA::Boolean retval =" << be_idt_nl
       << "::CORBA::ValueBase::_tao_unmarshal_pre (" << be_idt << be_idt_nl
       << "strm," << be_nl
       << "base," << be_nl
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 0c512c36374..a6e2aa20c89 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -141,7 +141,7 @@ public:
       TAO_ROOT_SI,
       TAO_ROOT_SS,
       TAO_ROOT_TIE_SH,
-      TAO_ROOT_TIE_SS,
+      TAO_ROOT_TIE_SI,
       TAO_ROOT_IH,
       TAO_ROOT_IS,
       TAO_ROOT_ANY_OP_CH,
@@ -256,6 +256,9 @@ public:
   int start_server_inline (const char *fname);
   // Set the server inline stream.
 
+  int start_server_template_inline (const char *fname);
+  // Set the server template inline stream.
+
   int start_server_skeletons (const char *fname);
   // Set the server skeletons stream.
 
@@ -293,6 +296,9 @@ public:
   int end_server_template_header (void);
   // Put a last #endif in the server template header.
 
+  int end_server_template_inline (void);
+  // Put a last #endif in the server template header.
+
   int end_server_template_skeletons (void);
   // Put a last #endif in the server skeletons.
 
@@ -440,6 +446,9 @@ private:
   TAO_OutStream *server_inline_;
   // Server side inline file.
 
+  TAO_OutStream *server_template_inline_;
+  // Server side template inline file.
+
   TAO_OutStream *anyop_header_;
   // Anyop header file.
 
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index fce714cc974..dde2fa8ece3 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -83,7 +83,6 @@ public:
   bool srv_skel_gen (void);
   bool impl_skel_gen (void);
   bool srv_inline_gen (void);
-  bool tie_skel_gen (void);
   bool cli_hdr_any_op_gen (void);
   bool cli_stub_any_op_gen (void);
   bool cli_hdr_cdr_op_gen (void);
@@ -129,7 +128,6 @@ public:
   void srv_skel_gen (bool);
   void impl_skel_gen (bool);
   void srv_inline_gen (bool);
-  void tie_skel_gen (bool);
   void cli_hdr_any_op_gen (bool);
   void cli_stub_any_op_gen (bool);
   void cli_hdr_cdr_op_gen (bool);
@@ -185,7 +183,6 @@ private:
   bool srv_skel_gen_;
   bool impl_skel_gen_;
   bool srv_inline_gen_;
-  bool tie_skel_gen_;
   bool cli_hdr_any_op_gen_;
   bool cli_stub_any_op_gen_;
   bool cli_hdr_cdr_op_gen_;
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index f29df3a6175..1c70d2cec26 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -98,6 +98,9 @@ public:
   static const char *be_get_server_inline_fname (
       bool base_name_only = 0
     );
+  static const char *be_get_server_template_inline_fname (
+      bool base_name_only = 0
+    );
   static const char *be_get_anyop_source_fname (
       bool base_name_only = 0
     );
@@ -130,6 +133,8 @@ public:
     );
   static const char *be_get_server_inline (UTL_String *idl_file_name,
                                            bool base_name_only = 0);
+  static const char *be_get_server_template_inline (UTL_String *idl_file_name,
+                                                    bool base_name_only = 0);
   static const char *be_get_anyop_header (UTL_String *idl_file_name,
                                           bool base_name_only = 0);
   static const char *be_get_anyop_source (UTL_String *idl_file_name,
@@ -320,6 +325,12 @@ public:
   const char* server_inline_ending (void) const;
   // Get the server_inline_ending.
 
+  void server_template_inline_ending (const char* s);
+  //  Set the server_template_inline_ending.
+
+  const char* server_template_inline_ending (void) const;
+  // Get the server_template_inline_ending.
+
   void anyop_header_ending (const char* s);
   // Set the anyop_header_ending.
 
@@ -650,6 +661,9 @@ private:
   // Server's inline file name ending. Default is "S.i".
   char* server_inline_ending_;
 
+  // Server's template inline file name ending. Default is "S_T.i".
+  char* server_template_inline_ending_;
+
   // Anyop header file name ending. Default is "A.h".
   char* anyop_hdr_ending_;
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index 926331cabf7..996495375c7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -39,7 +39,7 @@
 #include "be_visitor_interface/cdr_op_ch.h"
 #include "be_visitor_interface/cdr_op_cs.h"
 #include "be_visitor_interface/tie_sh.h"
-#include "be_visitor_interface/tie_ss.h"
+#include "be_visitor_interface/tie_si.h"
 #include "be_visitor_interface/ami_interface_ch.h"
 #include "be_visitor_interface/smart_proxy_ch.h"
 #include "be_visitor_interface/smart_proxy_cs.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h
index 9f6c28b733a..b097b77be1a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h
@@ -8,7 +8,7 @@
 //    TAO IDL
 //
 // = FILENAME
-//    tie_ss.h
+//    tie_si.h
 //
 // = DESCRIPTION
 //    Concrete visitor for the Interface node.
@@ -19,25 +19,25 @@
 //
 // ============================================================================
 
-#ifndef _BE_INTERFACE_TIE_SS_H_
-#define _BE_INTERFACE_TIE_SS_H_
+#ifndef _BE_INTERFACE_TIE_SI_H_
+#define _BE_INTERFACE_TIE_SI_H_
 
-class be_visitor_interface_tie_ss : public be_visitor_interface
+class be_visitor_interface_tie_si : public be_visitor_interface
 {
   //
   // = TITLE
-  //   be_visitor_interface_tie_ss
+  //   be_visitor_interface_tie_si
   //
   // = DESCRIPTION
-  //   This is a concrete visitor to generate the server skeleton for operations
+  //   This is a concrete visitor to generate the server inline for operations
   //   of the TIE class
   //
   //
 public:
-  be_visitor_interface_tie_ss (be_visitor_context *ctx);
+  be_visitor_interface_tie_si (be_visitor_context *ctx);
   // constructor
 
-  ~be_visitor_interface_tie_ss (void);
+  ~be_visitor_interface_tie_si (void);
   // destructor
 
   virtual int visit_interface (be_interface *node);
@@ -52,4 +52,4 @@ public:
   // helper method to generate method declaration in the TIE classes.
 };
 
-#endif /* _BE_INTERFACE_TIE_SS_H_ */
+#endif /* _BE_INTERFACE_TIE_SI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h
index 3ac422ee3a1..729617814ea 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation.h
@@ -33,7 +33,7 @@
 #include "be_visitor_operation/operation_ss.h"
 #include "be_visitor_operation/operation_is.h"
 #include "be_visitor_operation/tie_sh.h"
-#include "be_visitor_operation/tie_ss.h"
+#include "be_visitor_operation/tie_si.h"
 #include "be_visitor_operation/arglist.h"
 #include "be_visitor_operation/rettype.h"
 #include "be_visitor_operation/rettype_return_cs.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h
index 20e055a6a14..e38012009a7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h
@@ -8,24 +8,25 @@
 //    TAO IDL
 //
 // = FILENAME
-//    tie_ss.h
+//    tie_si.h
 //
 // = DESCRIPTION
-//    Visitor for generating code for IDL operations for the TIE class
+//    Visitor for generating code for IDL operations for the TIE class inside
+//    the server inline
 //
 // = AUTHOR
 //    Aniruddha Gokhale
 //
 // ============================================================================
 
-#ifndef _BE_VISITOR_OPERATION_TIE_SS_H_
-#define _BE_VISITOR_OPERATION_TIE_SS_H_
+#ifndef _BE_VISITOR_OPERATION_TIE_SI_H_
+#define _BE_VISITOR_OPERATION_TIE_SI_H_
 
 // ***********************************************************************
 // Operation visitor for operation declaration inside the TIE class
 // ***********************************************************************
 
-class be_visitor_operation_tie_ss : public be_visitor_scope
+class be_visitor_operation_tie_si : public be_visitor_scope
 {
   //
   // = TITLE
@@ -36,14 +37,14 @@ class be_visitor_operation_tie_ss : public be_visitor_scope
   //
   //
 public:
-  be_visitor_operation_tie_ss (be_visitor_context *ctx);
+  be_visitor_operation_tie_si (be_visitor_context *ctx);
   // constructor
 
-  ~be_visitor_operation_tie_ss (void);
+  ~be_visitor_operation_tie_si (void);
   // destructor
 
   virtual int visit_operation (be_operation *node);
   // set the right context and make a visitor
 };
 
-#endif /* _BE_VISITOR_OPERATION_TIE_SS_H_ */
+#endif /* _BE_VISITOR_OPERATION_TIE_SI_H_ */
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 9b6c8bb50b1..c63d65f02d2 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -373,7 +373,7 @@ also receives other options that are specific to it.<p>
     <td><tt>include_guard=</tt><i>define</i></td>
 
     <td>The compiler will generate code the define in the C.h file to prevent
-        users from including the generated C.h file. Useful for regenerating
+        users from including the generated C.h file. Useful for regenerating 
         the pidl files in the archive.</td>
   </tr>
 
@@ -592,6 +592,13 @@ also receives other options that are specific to it.<p>
     <td>&nbsp;</td>
   </tr>
 
+  <tr><a name="st">
+    <td><tt>-st</tt></td>
+
+    <td>Server's template inline file name ending. Default is "S_T.inl".</td>
+    <td>&nbsp;</td>
+  </tr>
+
   <tr><a name="t">
     <td><tt>-t</tt></td>
 
@@ -872,7 +879,7 @@ also receives other options that are specific to it.<p>
 
     <td>Suppress generation of the ORB.h include.</td>
     <td>This option is usefull when regenerating pidl files in the core
-  TAO libs to prevent cyclic includes;</td>
+	TAO libs to prevent cyclic includes;</td>
   </tr>
 
 </table> <P>
diff --git a/TAO/docs/ec_options.html b/TAO/docs/ec_options.html
index efceece9965..382ea349b64 100644
--- a/TAO/docs/ec_options.html
+++ b/TAO/docs/ec_options.html
@@ -97,9 +97,11 @@ struct RtecEventData
       <code>$TAO_ROOT/orbsvcs/orbsvcs/Event/EC_Null_Factory.h</code>
       and <code>$TAO_ROOT/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h</code>
       for details.
-    </ul>
+</ul>
+    The
+      table below describes all of the options (and values) supported by
+      these factories.
     </P>
-
 <h3>Special Topic: Queue Configuration</h3>
     <p>
       In certain configurations such as <em>mt</em> and <em>tpc</em>,
@@ -163,10 +165,6 @@ static EC_QueueFullSimpleActions "[wait | discard]"
 #    (see below) to specify that object's service configurator tag.
 </PRE>
 
-    <p>
-    The
-      table below describes all of the options (and values) supported by
-      these factories. 
     <P>All the event service factory options start with
       <CODE>-EC</CODE></P>
 
@@ -208,27 +206,6 @@ static EC_QueueFullSimpleActions "[wait | discard]"
             <b>Does not apply to the <em>tpc</em> factory.</b>
           </TD>
         </TR>
-        <!-- <TR NAME="ECDispatchingThreadFlags"> -->
-        <TR>
-          <td><code>-ECDispatchingThreadFlags</code>
-            <em>thread_flags</em><b>:</b><em>thread_priority</em>
-            </td>
-          <td>
-            Provide flags and priority used for creation of
-            dispatching threads.<br>
-            <em>thread_flags</em> is a set of
-            <code>THR_</code> flags separated by the vertical bar
-            ('|'), e.g.,
-            <code>THR_BOUND|THR_NEW_LWP|THR_SCOPE_SYSTEM</code>.
-            <br>
-            <em>thread_priority</em> is a numeric value indicating the
-            desired priority at which the thread should be created.
-            No range checking is performed on the value prior to
-            passing to the thread creation function.  Also note that
-            priorities are platform-specific, so a valid value for a
-            given set of flags on one platform may not work with the
-            same flags on another platform.
-          </tr>
 
         <!-- <TR  NAME="ECQueueFullServiceObject"> -->
         <tr>
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index f39f07d7995..a177128c052 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -659,7 +659,7 @@ in a directory different from that where the other generated files are
 created.</li>
 
 <li>
-Generation of explicit template instantiations has been completely
+Generation of explicit template instantiations has been completely 
 removed, it is no longer available via the command line option -GT.</li>
 
 <li>
@@ -673,10 +673,6 @@ Added new command line option -oS to specify output directory for
 all skeleton files, including TIE class files, if generated. Overrides
 -o option value, if any.</li>
 
-<li>
-Uninlined all generated TIE class code, since inlining could potentially
-cause a problem for RTTI.</li>
-
 </ul>
 
 <h4>
@@ -1444,7 +1440,7 @@ Point of contact: <a href="mailto:pradeep@cs.wustl.edu">Pradeep Gore</a>
 <br>The different command line and service configurator options used
 for configuring the CORBA event services are located <A
 href="../cec_options.html"> here</a>. This implementation is based on
-the Real Time Event service.
+the Real Time Event service. 
 <h3>
 Features in this release:</h3>
 
@@ -1533,18 +1529,18 @@ Notify_Logging_Service <tt>$TAO_ROOT/orbsvcs/Logging_Service/Notify_Logging_Serv
 RTEvent_Logging_Service <tt>$TAO_ROOT/orbsvcs/Logging_Service/RTEvent_Logging_Service</tt></li></ul>
 
 <li>
-Each service registers with the Naming Service as
-"BasicLogFactory", "EventLogFactory", "NotifyLogFactory" and
+Each service registers with the Naming Service as 
+"BasicLogFactory", "EventLogFactory", "NotifyLogFactory" and 
 "RTEventLogFactory" respectively.</li>
 
 <li>
-Each service registers with the Interoperable Naming Service as
-"BasicLogService", "EventLogService", "NotifyLogService" and
+Each service registers with the Interoperable Naming Service as 
+"BasicLogService", "EventLogService", "NotifyLogService" and 
 "RTEventLogService" respectively.</li>
 
 <li>
-The Log Service uses a dynamically loaded "plug-in" Strategy for storing and
-querying log records.  The default Strategy stores Log records in memory and
+The Log Service uses a dynamically loaded "plug-in" Strategy for storing and 
+querying log records.  The default Strategy stores Log records in memory and 
 supports the Extended Trader Constraint Language (ETCL) Query Language.</li>
 
 <li>
@@ -2364,7 +2360,7 @@ Current Status:</h4>
 <p>A concrete CSD Strategy implementation has also been added to serve as a "reference implementation".  This is being called the CSD Thread Pool Strategy (TP_Strategy).  The TP_Strategy provides a means to decouple the threads (ORB threads) that receive requests from the underlying transport from the thread that will ultimately dispatch the request to the target servant object.  The TP_Strategy implements a "request queue" as the integral part of the mechanism that allows an ORB thread to "hand-off" a request to one of the TP_Strategy object's worker threads.  The TP_Strategy reference implementation is provided as an example of how concrete CSD Strategy could be implemented.
 <p>Two approaches are supported for applying CSD strategy to an application.
 <ol>
-<li>Explicitly calling CSD interfaces.
+<li>Explicitly calling CSD interfaces. 
 <p>Here is an example application code showing how a TP_Strategy object can be created and applied to a POA:
 
 <pre>
@@ -2381,7 +2377,7 @@ Current Status:</h4>
   csd_strategy->set_servant_serialization (false);
 
   // Tell the strategy to apply itself to the poa.
-  if (csd_strategy->apply_to(poa.in()) == false)
+  if (csd_strategy->apply_to(poa.in()) == false) 
     {
       ACE_ERROR((LM_ERROR, "Failed to apply CSD strategy to the poa.\n"));
       return -1;
@@ -2389,7 +2385,7 @@ Current Status:</h4>
 </pre>
 <li>Service Configurator
 
- <p>The format of the CSD specific parameters for creating the TP_Strategy service object is:
+ <p>The format of the CSD specific parameters for creating the TP_Strategy service object is:          
  <pre>-CSDtp &lt;poa_name&gt;:&lt;csd_thread_number&gt;:[OFF]</pre>
 
  <p>The last portion of the parameter is the servant serialization flag. It's only needed when the servant serialization needs be turned off, otherwise the servant serialization is always on. When servant serialization is on (the default), the TP_Strategy will serialize requests to any particular servant.  Requests to different servant objects can occur in parallel, but requests to any particular servant will be dispatched serially (ie, one at a time).
@@ -2397,8 +2393,8 @@ Current Status:</h4>
  <p>Here is an example of the svc.conf file.
 
  <pre>
-  dynamic TAO_CSD_TP_Strategy_Factory Service_Object *
-  TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
+  dynamic TAO_CSD_TP_Strategy_Factory Service_Object * 
+	TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
  </pre>
 </ol>
 </ul>
@@ -2452,16 +2448,16 @@ online</a>.<P>
 Point of contact: <a href="mailto:mcorino@remedy.nl">Martin Corino</a>, Remedy IT.
 
 
-<p>TAO has support for IPv6 for IIOP under Windows and Linux.
+<p>TAO has support for IPv6 for IIOP under Windows and Linux. 
 To use this, add <code>ipv6</code> to your <code>default.features</code>
 file and regenerate all makefiles. When using the automated tests, add IPV6
 to the configs.
 <p>
 Finished work:
-<li>Added IPv6 support to all IIOP related classes (parsers, connectors,
+<li>Added IPv6 support to all IIOP related classes (parsers, connectors, 
   acceptors)</li>
 <li>Added IPv6 support to corbaloc and mcast URL parsers.</li>
-<li>Implemented IPv6 support in the TAO_IOR_MCast utility class from TAO Svc
+<li>Implemented IPv6 support in the TAO_IOR_MCast utility class from TAO Svc 
   Utils</li>
 <p>
 
@@ -2469,7 +2465,7 @@ The following gotchas are known:
 <li>In a localhost situation connecting a server listening at the IPv6 ANY address
   has the following problems:
 On Linux this does not work when the client tries to connect to a
-    LinkLocal address of one the local NICs,
+    LinkLocal address of one the local NICs, 
 on Windows this only works (locally) by using the 'localhost' address (either
     IPv4 or IPv6)
 </li>
@@ -2482,8 +2478,8 @@ on Windows this only works (locally) by using the 'localhost' address (either
 
 <p>
 Future work:
-<li>IPv6 support for other protocols/strategies than IIOP (i.e. SHMIOP, UIOP,
-  SCIOP, SSLIOP etc.; for this we excluded some regression tests in IPv6 builds for this
+<li>IPv6 support for other protocols/strategies than IIOP (i.e. SHMIOP, UIOP, 
+  SCIOP, SSLIOP etc.; for this we excluded some regression tests in IPv6 builds for this 
   reason)</li>
 
 <li>IPv4 runtime dependencies in various CORBA services (f.i. Event service)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index ad228dbf538..3579aaec4f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -18,7 +18,6 @@
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_Reactive_ConsumerControl.h"
 #include "orbsvcs/Event/EC_Reactive_SupplierControl.h"
-#include "orbsvcs/Event/EC_Thread_Flags.h"
 
 #include "orbsvcs/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
@@ -98,39 +97,6 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatchingThreadFlags")) == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          // Need to be in the form of <flags>:<priority>
-          if (arg_shifter.is_parameter_next ())
-            {
-              const ACE_TCHAR* s = arg_shifter.get_current ();
-              // need to parse the flags...ugh
-              ACE_TCHAR* opt = ACE_OS::strdup (s);
-
-              ACE_TCHAR* aux;
-              ACE_TCHAR* flags = ACE_OS::strtok_r (opt, ACE_TEXT_CHAR_TO_TCHAR(":"), &aux);
-
-              TAO_EC_Thread_Flags tf(ACE_TEXT_ALWAYS_CHAR (flags)); // parse and set up
-              this->dispatching_threads_flags_ = tf.flags ();
-
-              ACE_TCHAR* arg = ACE_OS::strtok_r (0, ACE_TEXT_CHAR_TO_TCHAR(":"), &aux);
-              if (arg)
-                {
-                  long prio = ACE_OS::strtol (arg, 0, 0);
-
-                  this->dispatching_threads_priority_ = prio;
-                }
-              else
-                {
-                  // Should we set the default priority?
-                  this->dispatching_threads_priority_ = tf.default_priority ();
-                }
-              ACE_OS::free (opt);
-              arg_shifter.consume_arg ();
-            }
-        }
 
       else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatchingThreads")) == 0)
         {
@@ -542,7 +508,7 @@ TAO_EC_Default_Factory::find_service_object (const char* wanted,
     return so;
 
   ACE_ERROR ((LM_ERROR,
-              "EC (%P|%t) EC_Default_Factory::find_service_object "
+              "EC (%P|%t) EC_Default_Factory::create_dispatching "
               "unable to find queue full service object '%s'; "
               "using '%s' instead\n",
               wanted,
@@ -553,7 +519,7 @@ TAO_EC_Default_Factory::find_service_object (const char* wanted,
     return so;
 
   ACE_ERROR ((LM_ERROR,
-              "EC (%P|%t) EC_Default_Factory::find_service_object "
+              "EC (%P|%t) EC_Default_Factory::create_dispatching "
                       "unable find default queue full service object '%s'; "
                       "aborting.\n",
                       fallback));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index 7828d1c65a0..291954518b3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -156,12 +156,13 @@ protected:
   int consumer_lock_;
   int supplier_lock_;
 
-  /// Flags used by thread-based dispatching strategies.
-  int dispatching_threads_;     //! number of threads; may be ignored depending on strategy; default: TAO_EC_DEFAULT_DISPATCHING_THREADS
-  int dispatching_threads_flags_; //! flags for thread creation; default: TAO_EC_DEFAULT_DISPATCHING_THREADS_FLAGS
-  int dispatching_threads_priority_; //! dispatching thread priority; default: TAO_EC_DEFAULT_DISPATCHING_THREADS_PRIORITY
-  int dispatching_threads_force_active_; //! create threads with innocuous default values if creation with requested values fails
-  ACE_CString queue_full_service_object_name_; //! name of ACE_Service_Object which should be invoked when output queue becomes full
+  /// The MT dispatching priority has several arguments that could be
+  /// controlled here...
+  int dispatching_threads_;
+  int dispatching_threads_flags_;
+  int dispatching_threads_priority_;
+  int dispatching_threads_force_active_;
+  ACE_CString queue_full_service_object_name_;
   TAO_EC_Queue_Full_Service_Object* find_service_object (const char* wanted,
                                                          const char* fallback);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 4b638b69a22..0612521f408 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -5,12 +5,7 @@
 
 ACE_RCSID(Event, EC_Factory, "$Id$")
 
-TAO_RTEvent_Serv_Export unsigned short TAO_EC_debug_level;
-
-TAO_EC_Factory::TAO_EC_Factory (void)
-{
-  TAO_EC_debug_level = 0;
-}
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_Factory::~TAO_EC_Factory (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index 7f4070e8d5d..a3cd903d4f4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -69,7 +69,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Factory : public ACE_Service_Object
 {
 public:
   /// destructor...
-  TAO_EC_Factory (void);
   virtual ~TAO_EC_Factory (void);
 
   /// Create and destroy the dispatching module.
@@ -163,8 +162,6 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*) = 0;
 };
 
-TAO_RTEvent_Serv_Export extern unsigned short TAO_EC_debug_level;
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index d7351c9802f..1b06a04dca7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-extern unsigned long TAO_EC_TPC_debug_level;
-
 #include "orbsvcs/Event/EC_TPC_Dispatching.h"
 #include "orbsvcs/Event/EC_Defaults.h"
 
@@ -15,16 +13,10 @@ ACE_RCSID(Event, EC_TPC_Dispatching, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (int nthreads,
-                                                int thread_creation_flags,
-                                                int thread_priority,
-                                                int force_activate,
-                                                TAO_EC_Queue_Full_Service_Object* so)
-  : nthreads_(nthreads)
-  , thread_creation_flags_ (thread_creation_flags)
-  , thread_priority_ (thread_priority)
-  , force_activate_ (force_activate)
-  , consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE)
+extern unsigned long EC_TPC_debug_level;
+
+TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (TAO_EC_Queue_Full_Service_Object* so)
+  : consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE)
   , queue_full_service_object_(so)
 {
   ACE_ASSERT (this->queue_full_service_object_ != 0);
@@ -48,20 +40,20 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer
   RtecEventComm::PushConsumer_var pc =
     RtecEventComm::PushConsumer::_duplicate(consumer);
 
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@)\n", pc.in()));
 
   TAO_EC_Dispatching_Task* dtask =
     new TAO_EC_TPC_Dispatching_Task (&this->thread_manager_,
                                      this->queue_full_service_object_);
 
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@): new task %@\n", pc.in(), dtask));
 
-  if ((dtask->activate (this->thread_creation_flags_,
+  if ((dtask->activate (TAO_EC_DEFAULT_DISPATCHING_THREADS_FLAGS,
                        1, // we only want one thread to dispatch to a consumer
                        1, // magic number??
-                        this->thread_priority_)) == -1)
+                        TAO_EC_DEFAULT_DISPATCHING_THREADS_PRIORITY)) == -1)
     {
       ACE_DEBUG ((LM_WARNING,
                   "EC (%P|%t): TPC_Dispatching::add_consumer unable to activate"
@@ -184,7 +176,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                     TAO_EC_QOS_Info&
                                     ACE_ENV_ARG_DECL)
 {
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer));
 
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index d507f3f5c1d..b8c7ea49cd3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -39,11 +39,7 @@ class TAO_EC_Event_Channel_Base;
 class TAO_RTEvent_Serv_Export TAO_EC_TPC_Dispatching : public TAO_EC_Dispatching
 {
 public:
-  TAO_EC_TPC_Dispatching (int nthreads,
-                          int thread_creation_flags,
-                          int thread_priority,
-                          int force_activate,
-                          TAO_EC_Queue_Full_Service_Object* so);
+  TAO_EC_TPC_Dispatching (TAO_EC_Queue_Full_Service_Object* so);
   ~TAO_EC_TPC_Dispatching ();
 
   // = The EC_Dispatching methods.
@@ -67,20 +63,6 @@ private:
   // Use our own thread manager
   ACE_Thread_Manager thread_manager_;
 
-  /// The number of active tasks
-  int nthreads_;
-
-  /// The flags (THR_BOUND, THR_NEW_LWP, etc.) used to create the
-  /// dispatching threads.
-  int thread_creation_flags_;
-
-  /// The priority of the dispatching threads.
-  int thread_priority_;
-
-  /// If activation at the requested priority fails then we fallback on
-  /// the defaults for thread activation.
-  int force_activate_;
-
   typedef ACE_Hash_Map_Manager_Ex<RtecEventComm::PushConsumer_ptr,TAO_EC_Dispatching_Task*,ACE_Pointer_Hash<RtecEventComm::PushConsumer_ptr>,ACE_Equal_To<RtecEventComm::PushConsumer_ptr>,ACE_Null_Mutex> MAPTYPE;
 
   // Tweak the default size of this map by #defining
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index 71b304fa3a4..c8e822ed5b9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -14,11 +14,13 @@
 
 ACE_RCSID(Event, EC_TPC_Factory, "$Id$")
 
-unsigned long TAO_EC_TPC_debug_level;
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+unsigned long EC_TPC_debug_level;
 
 TAO_EC_TPC_Factory::TAO_EC_TPC_Factory (void)
 {
-  TAO_EC_TPC_debug_level = 0;
+  EC_TPC_debug_level = 0;
 }
 
 TAO_EC_TPC_Factory::~TAO_EC_TPC_Factory (void)
@@ -61,7 +63,7 @@ TAO_EC_TPC_Factory::init (int argc, char* argv[])
       if (ACE_OS::strcasecmp (arg, "-ECTPCDebug") == 0)
         {
           arg_shifter.consume_arg ();
-          ++TAO_EC_TPC_debug_level;
+          ++EC_TPC_debug_level;
         }
       else
         {
@@ -78,25 +80,21 @@ TAO_EC_TPC_Factory::init (int argc, char* argv[])
 TAO_EC_Dispatching*
 TAO_EC_TPC_Factory::create_dispatching (TAO_EC_Event_Channel_Base *)
 {
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_dispatching\n"));
 
   TAO_EC_Queue_Full_Service_Object* so =
     this->find_service_object (this->queue_full_service_object_name_.fast_rep(),
                                TAO_EC_DEFAULT_QUEUE_FULL_SERVICE_OBJECT_NAME);
  
-  return new TAO_EC_TPC_Dispatching (this->dispatching_threads_,
-                                     this->dispatching_threads_flags_,
-                                     this->dispatching_threads_priority_,
-                                     this->dispatching_threads_force_active_,
-                                     so);
+  return new TAO_EC_TPC_Dispatching (so);
 }
 
 
 TAO_EC_ProxyPushSupplier*
 TAO_EC_TPC_Factory::create_proxy_push_supplier (TAO_EC_Event_Channel_Base *ec)
 {
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_supplier\n"));
   return new TAO_EC_TPC_ProxyPushSupplier (ec, this->consumer_validate_connection_);
 }
@@ -105,7 +103,7 @@ TAO_EC_TPC_Factory::create_proxy_push_supplier (TAO_EC_Event_Channel_Base *ec)
 TAO_EC_ProxyPushConsumer*
 TAO_EC_TPC_Factory::create_proxy_push_consumer (TAO_EC_Event_Channel_Base *ec)
 {
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_consumer\n"));
   return new TAO_EC_TPC_ProxyPushConsumer (ec);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
index fa4a96a085a..c65e5be61cc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
@@ -56,7 +56,9 @@ public:
       create_proxy_push_consumer (TAO_EC_Event_Channel_Base*);
 };
 
-extern unsigned long TAO_EC_TPC_debug_level;
+extern unsigned long EC_TPC_debug_level;
+
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_STATIC_SVC_DECLARE (TAO_EC_TPC_Factory)
 ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_TPC_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index a5b23525b1e..6a7cc347cb1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -9,7 +9,7 @@ ACE_RCSID(Event, EC_TPC_ProxyConsumer, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern unsigned long TAO_EC_TPC_debug_level;
+extern unsigned long EC_TPC_debug_level;
 
 TAO_EC_TPC_ProxyPushConsumer::TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec)
 : TAO_EC_Default_ProxyPushConsumer (ec)
@@ -31,7 +31,7 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void)
   // dispatch map in here?  I'm not sure...  But, if I do, then I need
   // to fact that "remove" code out of just the
   // disconnect_push_consumer.
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "RTEC (%P|%t): inside ~TAO_EC_TPC_ProxyPushConsumer (%x)\n", this));
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 756de632952..651346bb32a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -13,7 +13,7 @@ ACE_RCSID(Event, EC_TPC_ProxySupplier, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern unsigned long TAO_EC_TPC_debug_level;
+extern unsigned long EC_TPC_debug_level;
 
 TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void)
 {
@@ -24,7 +24,7 @@ void
 TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): refcount=%u,consumer=%@\n",
 				this,
 				this->refcount_,
@@ -39,7 +39,7 @@ TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL
   BASECLASS::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): leave EC_TPC_ProxySupplier::disconnect_push_supplier (%@)\n", this));
 }
 
@@ -63,7 +63,7 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer (
   BASECLASS::connect_push_consumer (push_consumer, qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (TAO_EC_TPC_debug_level > 0)
+  if (EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n",
               this, this->refcount_, this->consumer_.in()));
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
index 6e5b54fb0a3..6a31a5fc0d1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
@@ -4,13 +4,13 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-extern unsigned long TAO_EC_TPC_debug_level;
+extern unsigned long EC_TPC_debug_level;
 
 ACE_INLINE
 TAO_EC_TPC_ProxyPushSupplier::TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* ec, int validate_connection)
 : TAO_EC_Default_ProxyPushSupplier (ec, validate_connection)
 {
-  if (TAO_EC_TPC_debug_level > 0)        
+  if (EC_TPC_debug_level > 0)        
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this));
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
deleted file mode 100644
index 2f38e11ae1e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-#include "EC_Thread_Flags.h"
-
-ACE_RCSID(Event, EC_Thread_Flags , "$Id$");
-
-#if 0
-#include "ace/Obstack.h"
-#endif
-#include "ace/OS.h" // OS_NS_Thread.h in later versions
-#include "ace/OS_String.h" // OS_NS_String.h in later versions
-#include "ace/Sched_Params.h"
-
-#define TETFSF(flag)  { #flag, flag }
-TAO_EC_Thread_Flags::Supported_Flag TAO_EC_Thread_Flags::supported_flags_[] = {
-#if defined (ACE_HAS_THREADS)
-    TETFSF(THR_CANCEL_DISABLE),
-    TETFSF(THR_CANCEL_ENABLE),
-    TETFSF(THR_CANCEL_DEFERRED),
-    TETFSF(THR_CANCEL_ASYNCHRONOUS),
-    TETFSF(THR_BOUND),
-    TETFSF(THR_NEW_LWP),
-    TETFSF(THR_DETACHED),
-    TETFSF(THR_SUSPENDED),
-    TETFSF(THR_DAEMON),
-    TETFSF(THR_JOINABLE),
-    TETFSF(THR_SCHED_FIFO),
-    TETFSF(THR_SCHED_RR),
-    TETFSF(THR_SCHED_DEFAULT),
-    TETFSF(THR_EXPLICIT_SCHED),
-    TETFSF(THR_SCOPE_SYSTEM),
-    TETFSF(THR_SCOPE_PROCESS)
-#endif /* ACE_HAS_THREADS */
-  };
-#undef TETFSF
-
-TAO_EC_Thread_Flags::~TAO_EC_Thread_Flags ()
-{
-#if 0
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->sf_lock_);
-  delete[] this->supported_flags_;
-  this->supported_flags_ = 0;
-#endif
-}
-
-#if 0
-const char* const
-TAO_EC_Thread_Flags::supported_flags () const
-{
-  if (supported_flags_ == 0)
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->sf_lock_, 0);
-
-      // Check again, b/c somebody else could have stuffed somethign
-      // there before we got the lock.
-      if (supported_flags_ == 0)
-        {
-          ACE_Obstack o;
-          size_t num_flags = sizeof(Supported_Flags)/sizeof(Supported_Flags[0]);
-          for (size_t i = 0; i < num_flags; ++i)
-            {
-              const char* sym = Supported_Flags[i].n;
-              while (*sym != 0)
-                {
-                  o.grow(*sym++);
-                }
-              o.grow ('|');
-            }
-
-          char* f = o.freeze ();
-          size_t l = ACE_OS_String::strlen(f);
-          this->supported_flags_ = new char[l+1];
-          ACE_OS_String::strcpy (this->supported_flags_, f, l);
-        }
-    }
-  return this->supported_flags_;
-}
-#endif
-
-void
-TAO_EC_Thread_Flags::parse_symbols (const char* syms)
-{
-  // PRE: we assume nothing other than that syms is valid
-  // POST:
-  // 1. flags_ is bitwise-OR of all flags
-  // 2. sched_ is THR_SCHED_*, or THR_SCHED_DEFAULT if not specified
-  // 3. scope_ is THR_SCOPE_*, or THR_SCOPE_PROCESS if not specified
-
-  // NOTE: I'm not sure if #2 and #3 are consistent with what happens
-  // in ACE_Task::activate.  I really need to double-check that, and
-  // make sure that they are consistent.
-
-  flags_ = scope_ = sched_ = 0; // zero out everything
-
-  // short-circuit on the trivial case
-  if (syms == 0 || *syms == '\0')
-    return;
-
-  static size_t num_flags = sizeof(supported_flags_)/sizeof(Supported_Flag);
-  char* s = ACE_OS_String::strdup (syms); // need a mutable string
-  if (s == 0)
-    return;
-
-  const char* SEPARATORS = " |"; // this should probably be at class level
-  char* ptr = 0;
-  char* tok = ACE_OS_String::strtok_r (s, SEPARATORS, &ptr);
-  while (tok != 0)
-    {
-      // This would allow for easy accomodation of flags that
-      // aren't currently supported, but is it a good idea?
-
-      if (tok[0] >= '0' && tok[0] <= '9') // Numeric, so just accept it!
-        {
-          // parse it as a long straight to the flags
-          
-          // If somebody specifies the scheduler this way, then they
-          // lose range checking on the priority.  Bummer, but those
-          // are the breaks.
-          this->flags_ |= ACE_OS_String::strtol (tok, 0, 0);
-        }
-      else
-        {
-          int found = 0;
-          for (size_t i = 0; !found && i < num_flags; ++i)
-            {
-              if (ACE_OS_String::strcasecmp (tok, supported_flags_[i].n) == 0)
-                {
-                  this->flags_ |= supported_flags_[i].v;
-
-                  // Can't use a switch for this b/c for some
-                  // platforms the THR_* constants end up with
-                  // the same values, and compiles get upset.
-                  long &sf = supported_flags_[i].v;
-                  if (sf == THR_SCHED_FIFO ||
-                      sf == THR_SCHED_RR ||
-                      sf == THR_SCHED_DEFAULT)
-                    {
-                      this->sched_ = supported_flags_[i].v;
-                    }
-                  else if (sf == THR_SCOPE_SYSTEM ||
-                           sf == THR_SCOPE_PROCESS)
-                    {
-                      this->scope_ = supported_flags_[i].v;
-                    }
-                  found = 1;
-                }
-            }
-          if (!found)
-            {
-              // Ideally this would call some sort of on-error function...
-              // but, it doesn't.
-              ACE_ERROR ((LM_ERROR,
-                          "RTEC (%P|%t) unable to parse %s as a thread flag - skipping\n",
-                          tok));
-            }
-        }
-      tok = ACE_OS_String::strtok_r (0, SEPARATORS, &ptr);
-    }
-
-  ACE_OS::free (s); // clean up after ourselves
-}
-
-#if 0
-long
-TAO_EC_Thread_Flags::ace_sched_from_thr_sched (long thr_sched) const
-{
-  long ace_sched =
-    (thr_sched == THR_SCHED_FIFO) ? ACE_SCHED_FIFO :
-    (thr_sched == THR_SCHED_RR)   ? ACE_SCHED_RR   :
-    ACE_SCHED_OTHER;
-  return ace_sched;
-}
-
-long
-TAO_EC_Thread_Flags::ace_scope_from_thr_scope (long thr_scope) const
-{
-  long ace_scope =
-    (thr_scope == THR_SCOPE_PROCESS) ? ACE_SCOPE_PROCESS :
-    (thr_scope == THR_SCOPE_SYSTEM)  ? ACE_SCOPE_SYSTEM  :
-    ACE_SCOPE_THREAD;
-  return ace_scope;
-}
-
-long
-TAO_EC_Thread_Flags::thr_sched_from_ace_sched (long ace_sched) const
-{
-  long thr_sched =
-    (ace_sched == ACE_SCHED_FIFO) ? THR_SCHED_FIFO :
-    (ace_sched == ACE_SCHED_RR)   ? THR_SCHED_RR   :
-    THR_SCHED_DEFAULT; // there is no THR_SCHED_OTHER for some reason
-  return thr_sched;
-}
-
-long
-TAO_EC_Thread_Flags::thr_scope_from_ace_scope (long ace_scope) const
-{
-  long thr_scope =
-    (ace_scope == ACE_SCOPE_PROCESS) ? THR_SCOPE_PROCESS :
-    (ace_scope == ACE_SCOPE_THREAD)  ? THR_SCOPE_THREAD  :
-    THR_SCOPE_SYSTEM;
-  return thr_scope;
-}
-
-int
-TAO_EC_Thread_Flags::is_valid_priority (long priority) const
-{
-  // For some wacked out reason the THR_SCHED_* values are different from
-  // the ACE_SCHED_* values.  And, more than likely, the same is true for
-  // the *_SCOPE_* values, too.  So, here we convert the THR values, which
-  // are in 
-  const long ace_sched = ace_sched_from_thr_sched (this->sched());
-  const long ace_scope = ace_scope_from_thr_scope (this->scope());
-  if (this->sched() != 0 && // we have a scheduler
-      priority < ACE_Sched_Params::priority_min (ace_sched, ace_scope) ||
-      priority > ACE_Sched_Params::priority_max (ace_sched, ace_scope))
-    return 0;
-  else
-    return 1;
-}
-#endif
-
-long
-TAO_EC_Thread_Flags::default_priority () const
-{
-  long priority = ACE_DEFAULT_THREAD_PRIORITY;
-
-  // use the implementation  
-  if (this->sched() == 0)
-    return priority;
-
-  priority =
-    ACE_Sched_Params::priority_min (this->sched()) + 
-    ACE_Sched_Params::priority_max (this->sched()) / 2;
-  priority = ACE_Sched_Params::next_priority (this->sched(), priority);
-
-  return priority;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
deleted file mode 100644
index 70613ba739b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- C++ -*- */
-/**
- *  @file   EC_Thread_Flags.h
- *
- *  $Id$
- *
- *  @author Chris Cleeland <cleeland@ociweb.com>
- *
- *  Encapsulate flags that can be used for creating threads.
- */
-
-#ifndef TAO_EC_THREAD_FLAGS_H
-#define TAO_EC_THREAD_FLAGS_H
-#include /**/ "ace/pre.h"
-
-#include "event_serv_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Synch.h"  // for ACE_Lock
-
-/*!
-  \class TAO_EC_Thread_Flags
-
-  \brief Parse thread flags from string to a long.
-  
-  Encapsulate flags used for creating threads with \a
-  ACE_OS::thr_create and \a ACE_Task::activate.
-
-  \note On platforms that do not support the thread schedulers, the
-  ACE OS adaptation layer preserves the symbols for THR_SCHED_*, but
-  defines them as zero.  Thus, on such platforms, setting a scheduler
-  in the flags, then inquiring for the scheduler type will yield the
-  same result as an unknown or unset scheduler.
-
-  \bugs This should really be part of ACE or ACE_OS, and maybe someday
-  it will, but right now it's not.
-
-*/
-class TAO_RTEvent_Serv_Export TAO_EC_Thread_Flags
-{
-public:
-  TAO_EC_Thread_Flags () { }
-  /*! \brief See \a operator=() */
-  TAO_EC_Thread_Flags (const char* symbolic_flags)
-    { this->parse_symbols(symbolic_flags); }
-  ~TAO_EC_Thread_Flags ();
-
-  // Default Copy CTOR is fine.
-
-  /*!
-    \brief Assign a new set of symbolic flags, setting \a flags, \a scope, and \a sched as possible.
-
-    The flags can be symbolic, separated by the vertical bar ('|').
-    In case a platform supports a creation flag not available
-    symbolically, the user can specify a numeric value any place a
-    symbol could be used.
-
-    \sa TAO_EC_Thread_Flags::supported_flags
-
-    \note The \a sched value only gets set if the scheduler is specified using symbols.
-  */
-  const TAO_EC_Thread_Flags& operator= (const char* symbolic_flags)
-    { this->parse_symbols(symbolic_flags); return *this; }
-
-  /*!
-    \brief Returns numeric equivalent of the thread flags suitable for passing to ACE_Task::activate.
-  */
-  long flags() const { return this->flags_; }
-
-  /*!
-    \brief Returns value of THR_SCOPE_* used, or zero if unknown.
-  */
-  long scope() const { return this->scope_; }
-  
-  /*!
-    \brief Returns value of THR_SCHED_* used, or zero if unknown.
-  */
-  long sched() const { return this->sched_; }
-
-  /// Synonym for flags(), i.e., syntactic sugar.
-  operator long () const { return this->flags(); }
-
-#if 0
-  /*!
-    \brief Indicate whether a priority is valid for the scheduler returned by sched().
-
-    \return non-zero if the priority is valid.
-    
-    \note Always returns non-zero if sched == 0, i.e., the scheduler is unknown.
-  */
-  int is_valid_priority (long priority) const;
-
-  /*!
-    \brief Convert THR_SCHED_* values to ACE_SCHED_* values.
-    
-    For some wacked out reason the THR_SCHED_* values are different from
-    the ACE_SCHED_* values, so we provide a mapping function.
-  */
-  long ace_sched_from_thr_sched (long thr_sched) const;
-  long ace_scope_from_thr_scope (long thr_scope) const;
-  long thr_sched_from_ace_sched (long ace_sched) const;
-  long thr_scope_from_ace_scope (long ace_scope) const;
-#endif
-
-  /*!
-    \brief Return an acceptable default priority for the scheduler returned by sched().
-    \return the priority, or ACE_DEFAULT_THREAD_PRIORITY if the scheduler is unknown.
-  */
-  long default_priority () const;
-  
-
-
-#if 0
-  /// Return a |-separated list of all flags that we can parse.
-  const char* supported_flags () const;
-#endif
-
-  struct Supported_Flag
-  {
-    const char* n; /// Flag name, e.g., THR_NEW_LWP
-    long        v; /// Flag value, i.e., actual symbol
-  };
-
-  // TETFSF == TAO_EC_THREAD_FLAGS_SUPPORTED_FLAGS
-  static Supported_Flag supported_flags_[];
-
-protected:
-  long flags_; /// Value of all flags OR'd together
-  long scope_; /// Value of THR_SCOPE_*
-  long sched_; /// Value of THR_SCHED_*
-
-  void parse_symbols (const char* syms);
-  
-#if 0
-  ACE_Lock sf_lock_; // lock guarding access to supported_flags_
-  const char* supported_flags_;
-#endif
-};
-
-#if 0  && defined (__ACE_INLINE__)
-#include "EC_Thread_Flags.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_EC_THREAD_FLAGS_H */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 879525de273..492f0aaad44 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -401,10 +401,11 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
 int
 TAO_IFR_Server::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL)
 {
-#if defined (ACE_HAS_IP_MULTICAST)
   // Get reactor instance from TAO.
   ACE_Reactor *reactor = this->orb_->orb_core ()->reactor ();
 
+#if defined (ACE_HAS_IP_MULTICAST)
+
   // See if the -ORBMulticastDiscoveryEndpoint option was specified.
   ACE_CString mde (
       TAO_ORB_Core_instance ()->orb_params ()->mcast_discovery_endpoint ()
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
index 44f368731c9..1e9797263d9 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
@@ -81,7 +81,6 @@ project(RTEvent_Serv) : orbsvcslib, core, rtevent_skel, svc_utils, messaging {
     Event/EC_TPC_Factory.cpp
     Event/EC_TPC_ProxyConsumer.cpp
     Event/EC_TPC_ProxySupplier.cpp
-    Event/EC_Thread_Flags.cpp
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
deleted file mode 100644
index 5bebc702298..00000000000
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Test TAO_EC_Thread_Flags encapsulation.
- */
-
-#include <orbsvcs/Event/EC_Thread_Flags.h>
-#include <ace/Log_Msg.h>
-
-ACE_RCSID(EC_Tests, testflags, "$Id$");
-
-/*
-  Here are the scenarios we need to test:
-
-  1. Initialize/assign empty instance and validate defaults, priority, etc.
-  2. Initialize/assign with each flag and validate value of flags.
-  3. Initialize/assign with each scope and validate scope and flags.
-  4. Initialize/assign with each sched and validate sched and flags.
-  5. Initialize/assign with single numeric value and validate flags, sched, and scope values.
-  6. Initialize/assign with bogus symbols and validate scope/flags + error.
-  7. Initialize/assign with multiple flags and validate flags, scope, sched.
-
- */
-struct ExpectedValues
-{
-  long flags;
-  long scope;
-  long sched;
-
-  ExpectedValues(long f = 0, long sco = 0, long sch = 0)
-    : flags(f)
-    , scope(sco)
-    , sched(sch)
-    {
-    }
-};
-
-struct ThreadFlagsTest
-{
-  enum How {
-    INIT = 0x1, // use constructor initialization
-    ASSIGN = 0x2, // use assignment operator
-    BOTH = 0x3
-  };
-
-  ThreadFlagsTest (const char* sym, How assign, ExpectedValues ev, ExpectedValues which_check);
-
-  // Execute the test and pass back an ExpectedValues struct where the
-  // values are zero if the values were not as expected or non-zero if
-  // they were as expected.  Return value is zero for success, or
-  // the bitmask of the "How" version of the test that failed.
-  int runtest(ExpectedValues& results);
-
-  const char* sym_;
-  How assign_;
-  ExpectedValues expected_values_;
-  ExpectedValues which_results_to_check_;
-
-};
-
-ThreadFlagsTest::ThreadFlagsTest (const char* sym,
-                                  How assign,
-                                  ExpectedValues ev,
-                                  ExpectedValues which_check)
-  : sym_(sym)
-  , assign_(assign)
-  , expected_values_(ev)
-  , which_results_to_check_(which_check)
-{
-}
-
-int
-ThreadFlagsTest::runtest (ExpectedValues& results)
-{
-  int r = 0;
-  if (assign_ & INIT)
-    {
-      TAO_EC_Thread_Flags f(sym_);
-      if ( ((results.flags = f.flags()) == expected_values_.flags) &&
-           ((results.scope = f.scope()) == expected_values_.scope) &&
-           ((results.sched = f.sched()) == expected_values_.sched) )
-        ; // we succeeded, do nothing
-      else
-        r |= INIT;
-    }
-  if (assign_ & ASSIGN)
-    {
-      TAO_EC_Thread_Flags f;
-      f = sym_;
-      if ( ((results.flags = f.flags()) == expected_values_.flags) &&
-           ((results.scope = f.scope()) == expected_values_.scope) &&
-           ((results.sched = f.sched()) == expected_values_.sched) )
-        ; // we succeeded, do nothing
-      else
-        r |= ASSIGN;
-    }
-
-  return r;
-}
-
-// Common things to pass for 'which_check'
-static const ExpectedValues CHECK_ALL(1, 1, 1);
-static const ExpectedValues ONLY_FLAGS(1, 0, 0);
-// ExpectedValues set indicating the default values
-static const ExpectedValues DEFAULTS(0, 0, 0);
-
-void
-print_results (int how, ExpectedValues expected, ExpectedValues actuals)
-{
-  const char* op =
-    (how == ThreadFlagsTest::INIT) ? "INIT" : 
-    (how == ThreadFlagsTest::ASSIGN) ? "ASSIGN" :
-    (how == ThreadFlagsTest::BOTH) ? "BOTH" :
-    "unk?";
-
-  ACE_DEBUG ((LM_DEBUG, "  %s: expected {%x,%x,%x} got {%x,%x,%x}",
-              op,
-              expected.flags, expected.scope, expected.sched,
-              actuals.flags, actuals.scope, actuals.sched));
-}
-
-int
-main (int argc, char* argv[])
-{
-  ThreadFlagsTest static_tests[] = {
-    // Test 1
-    ThreadFlagsTest(0, ThreadFlagsTest::BOTH, DEFAULTS, CHECK_ALL), 
-    // Test 2
-    ThreadFlagsTest("THR_CANCEL_DISABLE", ThreadFlagsTest::BOTH, ExpectedValues(THR_CANCEL_DISABLE), CHECK_ALL),
-    ThreadFlagsTest("THR_CANCEL_ENABLE", ThreadFlagsTest::BOTH, ExpectedValues(THR_CANCEL_ENABLE), CHECK_ALL),
-    ThreadFlagsTest("THR_CANCEL_DEFERRED", ThreadFlagsTest::BOTH, ExpectedValues(THR_CANCEL_DEFERRED), CHECK_ALL),
-    ThreadFlagsTest("THR_CANCEL_ASYNCHRONOUS", ThreadFlagsTest::BOTH, ExpectedValues(THR_CANCEL_ASYNCHRONOUS), CHECK_ALL),
-    ThreadFlagsTest("THR_BOUND", ThreadFlagsTest::BOTH, ExpectedValues(THR_BOUND), CHECK_ALL),
-    ThreadFlagsTest("THR_NEW_LWP", ThreadFlagsTest::BOTH, ExpectedValues(THR_NEW_LWP), CHECK_ALL),
-    ThreadFlagsTest("THR_DETACHED", ThreadFlagsTest::BOTH, ExpectedValues(THR_DETACHED), CHECK_ALL),
-    ThreadFlagsTest("THR_SUSPENDED", ThreadFlagsTest::BOTH, ExpectedValues(THR_SUSPENDED), CHECK_ALL),
-    ThreadFlagsTest("THR_DAEMON", ThreadFlagsTest::BOTH, ExpectedValues(THR_DAEMON), CHECK_ALL),
-    ThreadFlagsTest("THR_JOINABLE", ThreadFlagsTest::BOTH, ExpectedValues(THR_JOINABLE), CHECK_ALL),
-    // Test 3
-    ThreadFlagsTest("THR_SCHED_FIFO", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCHED_FIFO, 0, THR_SCHED_FIFO), CHECK_ALL),
-    ThreadFlagsTest("THR_SCHED_RR", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCHED_RR, 0, THR_SCHED_RR), CHECK_ALL),
-    ThreadFlagsTest("THR_SCHED_DEFAULT", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCHED_DEFAULT, 0, THR_SCHED_DEFAULT), CHECK_ALL),
-    // Test 4
-    ThreadFlagsTest("THR_SCOPE_SYSTEM", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCOPE_SYSTEM, THR_SCOPE_SYSTEM, 0), CHECK_ALL),
-    ThreadFlagsTest("THR_SCOPE_PROCESS", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCOPE_PROCESS, THR_SCOPE_PROCESS, 0), CHECK_ALL),
-    // Test 5
-    ThreadFlagsTest("0x0001", ThreadFlagsTest::BOTH, ExpectedValues(1, 0, 0), CHECK_ALL),
-    // Test 6
-    ThreadFlagsTest("Zaphod|Beeblebrox|THR_BOGUS", ThreadFlagsTest::BOTH, DEFAULTS, CHECK_ALL),
-    // Test 7
-    ThreadFlagsTest("THR_BOUND|THR_JOINABLE", ThreadFlagsTest::BOTH, ExpectedValues(THR_BOUND|THR_JOINABLE), CHECK_ALL),
-    ThreadFlagsTest("THR_SCHED_FIFO|THR_DAEMON|THR_SCOPE_PROCESS", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCHED_FIFO|THR_DAEMON|THR_SCOPE_PROCESS, THR_SCOPE_PROCESS, THR_SCHED_FIFO), CHECK_ALL),
-    ThreadFlagsTest("THR_SCHED_DEFAULT|THR_SCOPE_SYSTEM|THR_NEW_LWP", ThreadFlagsTest::BOTH, ExpectedValues(THR_SCHED_DEFAULT|THR_SCOPE_SYSTEM|THR_NEW_LWP, THR_SCOPE_SYSTEM, THR_SCHED_DEFAULT), CHECK_ALL),
-    ThreadFlagsTest("THR_NEW_LWP|THR_SCOPE_SYSTEM|THR_JOINABLE|THR_SCHED_FIFO",
-                    ThreadFlagsTest::BOTH,
-                    ExpectedValues(THR_NEW_LWP|THR_SCHED_FIFO|THR_SCOPE_SYSTEM|THR_JOINABLE, THR_SCOPE_SYSTEM, THR_SCHED_FIFO),
-                    CHECK_ALL)
-  };
-  
-  int returnval = 0;
-  const size_t numtests = sizeof(static_tests)/sizeof(static_tests[0]);
-  if (argc > 1)
-    {
-      char* which_test;
-      while ((which_test = *++argv))
-        {
-          size_t testnum = ACE_OS_String::strtol (which_test, 0, 0);
-          if (testnum < numtests)
-            {
-              ExpectedValues results;
-              ThreadFlagsTest& t = static_tests[testnum];
-              ACE_DEBUG ((LM_DEBUG, "Test #%d for %s...", testnum, t.sym_));
-              int r = t.runtest (results);
-              if (r != 0)
-                {
-                  returnval = 1;
-                  ACE_DEBUG ((LM_DEBUG, "FAILED -- details: "));
-                  if (r & ThreadFlagsTest::INIT)
-                    print_results (ThreadFlagsTest::INIT, t.expected_values_, results);
-              
-                  if (r & ThreadFlagsTest::ASSIGN)
-                    print_results (ThreadFlagsTest::ASSIGN, t.expected_values_, results);
-          
-                  ACE_DEBUG ((LM_DEBUG, "\n"));
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG, "ok.\n"));
-                }
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "%d is not a valid test number\n", testnum));
-            }
-        }
-    }
-  else
-    {
-      for(size_t i = 0; i < numtests; ++i)
-        {
-          ExpectedValues results;
-          ThreadFlagsTest& t = static_tests[i];
-          ACE_DEBUG ((LM_DEBUG, "Test #%d for %s...", i, t.sym_));
-          int r = t.runtest (results);
-          if (r != 0)
-            {
-              returnval = 1;
-              ACE_DEBUG ((LM_DEBUG, "FAILED -- details: "));
-              if (r & ThreadFlagsTest::INIT)
-                print_results (ThreadFlagsTest::INIT, t.expected_values_, results);
-              
-              if (r & ThreadFlagsTest::ASSIGN)
-                print_results (ThreadFlagsTest::ASSIGN, t.expected_values_, results);
-          
-              ACE_DEBUG ((LM_DEBUG, "\n"));
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG, "ok.\n"));
-            }
-        }
-
-    }
-
-  return returnval;
-}
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc b/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc
deleted file mode 100644
index 7b274ab68fe..00000000000
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project(TFTest): rteventexe {
-  exename = testflags 
-  libs      += TAO_RTEvent_Serv
-}
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index f437ba7fb80..3edab19588b 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -35,7 +35,7 @@ CORBA::Context::_incr_refcnt (void)
 CORBA::ULong
 CORBA::Context::_decr_refcnt (void)
 {
-  CORBA::ULong const new_count = --this->refcount_;
+  const CORBA::ULong new_count = --this->refcount_;
 
   if (new_count == 0)
     delete this;
@@ -118,7 +118,7 @@ CORBA::ContextList::~ContextList (void)
 {
   for (CORBA::ULong i = 0; i < this->count (); ++i)
     {
-      char **ctx = 0;
+      char **ctx;
 
       if (this->ctx_list_.get (ctx, i) == -1)
         {
@@ -175,7 +175,7 @@ CORBA::ContextList::_duplicate (void)
 void
 CORBA::ContextList::_destroy (void)
 {
-  CORBA::ULong const current = --this->ref_count_;
+  CORBA::ULong current = --this->ref_count_;
 
   if (current == 0)
     {
@@ -186,13 +186,13 @@ CORBA::ContextList::_destroy (void)
 void
 CORBA::ContextList::_incr_refcnt (void)
 {
-  ++this->ref_count_;
+  this->ref_count_++;
 }
 
 void
 CORBA::ContextList::_decr_refcnt (void)
 {
-  --this->ref_count_;
+  this->ref_count_--;
 
   if (this->ref_count_ != 0)
     {
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index 3118f59a81d..d72c4f43420 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -108,7 +108,7 @@ namespace TAO
   void
   NVList_Argument::interceptor_paramlist (Dynamic::ParameterList *lst)
   {
-    CORBA::ULong const len = this->x_->count ();
+    const CORBA::ULong len = this->x_->count ();
     lst->length (len);
 
     for (CORBA::ULong i = 0; i < len; ++i)
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
index ec8e6788bef..7e570ba0e3f 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
@@ -26,7 +26,7 @@ TAO_DII_Arguments_Converter_Impl::convert (
   // in collocation case and the server expects the list of arguments
   // and not the NVList_Argument, we need expand the NVList_Argument
   // to be list of Arguments.
-
+  
   // Before expanding NVList_Argument logic was added, the
   // $TAO_ROOT/tests/DII_Collocated_Tests/run_test.pl should fail.
   // The servant will get incorrect "IN" parameter from the oneway
@@ -36,7 +36,7 @@ TAO_DII_Arguments_Converter_Impl::convert (
   CORBA::NVList_ptr lst
     = static_cast<TAO::NVList_Argument *> (server_request.operation_details ()->args()[1])->arg ();
 
-  CORBA::ULong const sz = lst->count (ACE_ENV_SINGLE_ARG_PARAMETER);
+  const CORBA::ULong sz = lst->count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (sz != nargs - 1)
@@ -52,7 +52,7 @@ TAO_DII_Arguments_Converter_Impl::convert (
     {
       CORBA::NamedValue_ptr theitem = lst->item (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-
+      
       if (!(theitem->value ()->impl ()->marshal_value (output)))
         {
           ACE_THROW (CORBA::BAD_PARAM ());
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 34519883c93..799870a0f64 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -47,7 +47,7 @@ CORBA::Request::_decr_refcnt (void)
                       this->lock_,
                       0);
 
-    --this->refcount_;
+    this->refcount_--;
 
     if (this->refcount_ != 0)
       {
@@ -128,7 +128,7 @@ CORBA::Request::~Request (void)
   ACE_ASSERT (refcount_ == 0);
 
   ::CORBA::release (this->target_);
-  ::CORBA::string_free ((char*) this->opname_);
+  CORBA::string_free ((char*) this->opname_);
   this->opname_ = 0;
   ::CORBA::release (this->args_);
   ::CORBA::release (this->result_);
@@ -144,8 +144,12 @@ CORBA::Request::~Request (void)
 void
 CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
 {
+  const CORBA::Boolean argument_flag =
+    this->args_->_lazy_has_arguments ();
+
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
+
   TAO::NVList_Argument _tao_in_list (this->args_,
                                      this->lazy_evaluation_);
 
@@ -154,10 +158,17 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
     &_tao_in_list
   };
 
+  int number_args = 0;
+
+  if (argument_flag)
+    number_args = 2;
+  else
+    number_args = 1;
+
   TAO::DII_Invocation_Adapter _tao_call (
        this->target_,
        _tao_arg_list,
-       sizeof( _tao_arg_list ) / sizeof( TAO::Argument* ),
+       number_args,
        this->opname_,
        static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)),
        this->exceptions_.in (),
@@ -178,8 +189,12 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
 void
 CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL)
 {
+  const CORBA::Boolean argument_flag =
+    this->args_->_lazy_has_arguments ();
+
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
+
   TAO::NVList_Argument _tao_in_list (this->args_,
                                      this->lazy_evaluation_);
 
@@ -188,10 +203,17 @@ CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL)
     &_tao_in_list
   };
 
+  int number_args = 0;
+
+  if (argument_flag)
+    number_args = 2;
+  else
+    number_args = 1;
+
   TAO::Invocation_Adapter _tao_call (
       this->target_,
       _tao_arg_list,
-      sizeof( _tao_arg_list ) / sizeof( TAO::Argument* ),
+      number_args,
       this->opname_,
       static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)),
       0,
@@ -213,9 +235,10 @@ CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL)
                ace_mon,
                this->lock_);
 
-    this->response_received_ = false;
+    this->response_received_ = 0;
   }
-  CORBA::Boolean const argument_flag = this->args_->count () ? true : false;
+
+  const CORBA::Boolean argument_flag = this->args_->count () ? 1 : 0;
 
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
@@ -227,7 +250,7 @@ CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL)
     &_tao_in_list
   };
 
-  size_t number_args = 0;
+  int number_args = 0;
 
   if (argument_flag)
     number_args = 2;
@@ -320,7 +343,7 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming,
                    ace_mon,
                    this->lock_);
 
-        this->response_received_ = true;
+        this->response_received_ = 1;
       }
 
       break;
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 2c6e3c9425f..320b46fc935 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1621,9 +1621,9 @@ TAO_ORB_Core::policy_factory_registry_i (void)
 TAO::ORBInitializer_Registry_Adapter *
 TAO_ORB_Core::orbinitializer_registry_i (void)
 {
-  // @todo The ORBInitializer_Registry is supposed to be a singleton.
-
-  ACE_Service_Gestalt * const config = this->configuration ();
+  // The ORBInitializer_Registry is supposed to be a singleton.  Store
+  // it in the global configuration, not the ORB-specific one.
+  ACE_Service_Gestalt * const config = ACE_Service_Config::global ();
 
   // If not, lookup it up.
   this->orbinitializer_registry_ =
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index b497f744e98..6aac19e67e9 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -589,13 +589,6 @@ CORBA::Object::_set_policy_overrides (
                       CORBA::COMPLETED_MAYBE));
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  // If the stub is collocated and we don't have a collocated server we need
-  // to reinitialize it to get it.
-  if (stub->is_collocated () && stub->collocated_servant () == 0)
-    {
-      obj->orb_core ()->reinitialize_object (stub);
-    }
-
   (void) safe_stub.release ();
 
   return obj;
diff --git a/TAO/tests/AMH_Exceptions/Test.idl b/TAO/tests/AMH_Exceptions/Test.idl
index 6a9ae77044b..c3ffd609ca4 100644
--- a/TAO/tests/AMH_Exceptions/Test.idl
+++ b/TAO/tests/AMH_Exceptions/Test.idl
@@ -23,8 +23,6 @@ module Test
   {
     Timestamp test_method (in Timestamp send_time)
       raises (InvalidTimestamp, ServerOverload);
-
-    oneway void shutdown ();
   };
 
 };
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index 60dbc3e8da3..9ff92b2933d 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -30,19 +30,14 @@ main (int argc, char *argv[])
                             1);
         }
 
-      ACE_TRY {
-          Test::Timestamp time = 10;
-          roundtrip->test_method (time ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH(Test::ServerOverload, ov)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Received expected exception\n"));
-          received_expected_exception = 1;
-
-          roundtrip->shutdown ();
-        }
-      ACE_ENDTRY;
+      Test::Timestamp time = 10;
+      roundtrip->test_method (time ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH(Test::ServerOverload, ov)
+    {
+      ACE_DEBUG ((LM_DEBUG, "Received expected exception\n"));
+      received_expected_exception = 1;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/AMH_Exceptions/run_test.pl b/TAO/tests/AMH_Exceptions/run_test.pl
index 7bd307293bf..11dc1f3e86a 100755
--- a/TAO/tests/AMH_Exceptions/run_test.pl
+++ b/TAO/tests/AMH_Exceptions/run_test.pl
@@ -42,7 +42,7 @@ if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
 $client = $CL->SpawnWaitKill (30);
 
 # Clean up.
-$amhserver= $AMH->WaitKill (15);
+$amhserver= $AMH->TerminateWaitKill (5);
 
 if ($amhserver != 0) {
     print STDERR "ERROR: AMH Server returned $amhserver\n";
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 4bc543e5537..05d82934074 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -3,7 +3,6 @@
 
 #include "ace/OS_NS_stdio.h"
 #include "TestS.h"
-#include "tao/ORB_Core.h"
 
 /***************************/
 /*** Servant Declaration ***/
@@ -19,9 +18,6 @@ public:
                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
 protected:
   CORBA::ORB_ptr orb_;
 };
@@ -60,12 +56,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
   ACE_UNUSED_ARG (send_time);
 }
 
-void
-ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/ ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
 
 /*** Server Declaration ***/
 
@@ -202,7 +192,7 @@ ST_AMH_Server::run_event_loop ()
   ACE_TRY
     {
       ACE_Time_Value period (0, 11000);
-      while (!this->orb_->orb_core ()->has_shutdown ())
+      while (1)
         {
               this->orb_->perform_work (&period);
               ACE_TRY_CHECK;
diff --git a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
index 82d305b5af4..2a3a953d97a 100644
--- a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
+++ b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (*Test) : taoserver, iortable, minimum_corba, messaging {
+project (*Test) : taoserver, iortable, minimum_corba {
   Source_Files {
     Hello.cpp
   }
diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp
index e5979299664..53eb63216e5 100644
--- a/TAO/tests/Bug_2134_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2134_Regression/Hello.cpp
@@ -2,8 +2,6 @@
 
 #include "tao/corba.h"
 #include "tao/IORTable/IORTable.h"
-#include "tao/Messaging/Messaging.h"
-#include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_string.h"
 #include "ace/SString.h"
 
@@ -21,7 +19,6 @@ public:
 
 int main(int argc, char* argv[])
 {
-  int status = 0;
   CORBA::ORB_var orb = CORBA::ORB::_nil();
 
   ACE_TRY_NEW_ENV
@@ -85,41 +82,13 @@ int main(int argc, char* argv[])
       CORBA::Object_var obj = orb->string_to_object (friendly_corbaloc.c_str ());
       ACE_TRY_CHECK;
 
-      TimeBase::TimeT timeout = 10000000;
-
-      CORBA::Any timeout_any;
-      timeout_any <<= timeout;
-
-      CORBA::PolicyList policy_list (1);
-      policy_list.length (1);
-
-      policy_list[0] = orb->create_policy (
-                              Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                              timeout_any);
-
-      CORBA::Object_var rtt_obj = obj->_set_policy_overrides (
-                                                  policy_list,
-                                                  CORBA::SET_OVERRIDE);
-
-      policy_list[0]->destroy();
+      Test::Hello_var hello2 = Test::Hello::_narrow (obj.in ());
+      ACE_TRY_CHECK;
 
-      Test::Hello_var hello2 = Test::Hello::_narrow (rtt_obj.in ());
+      hello2->say_hello ();
       ACE_TRY_CHECK;
 
-      if (CORBA::is_nil (hello2.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Unable to narrow from "
-                      "corbaloc with policy override\n"));
-          status = 1;
-        }
-      else
-        {
-          hello2->say_hello ();
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG, "Test succeeded !!!\n"));
-        }
+      ACE_DEBUG ((LM_DEBUG, "Test succeeded !!!\n"));
 
       orb->destroy();
       ACE_TRY_CHECK;
@@ -128,9 +97,9 @@ int main(int argc, char* argv[])
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                           "Error - test failed - exception caught:");
-      status = 1;
+      return 1;
     }
   ACE_ENDTRY;
 
-  return status;
+  return 0;
 }
diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp
index 91e71e2aec4..87db82425d0 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2654_Regression/Hello.cpp
@@ -3,24 +3,17 @@
 //
 #include "Hello.h"
 #include "ace/Task.h"
+#include "ace/OS_NS_time.h"
 
 class Killer : public ACE_Task_Base
 {
 public:
-  Killer (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-  {
-  }
-
   int svc (void)
   {
     ACE_DEBUG ((LM_DEBUG,"(%P|%t) server exiting\n"));
-    this->orb_->shutdown (1);
+    exit (0);
     return 0;
   }
-
-private:
-  CORBA::ORB_var orb_;
 };
 
 Hello::Hello (CORBA::ORB_ptr orb)
@@ -50,7 +43,7 @@ Hello::method (CORBA::Short count ACE_ENV_ARG_DECL_NOT_USED)
       PortableServer::POA_var poa = this->_default_POA();
       PortableServer::POAManager_var mgr = poa->the_POAManager();
       mgr->hold_requests(false);
-      Killer *k = new Killer (orb_);
+      Killer *k = new Killer;
       k->activate();
     }
 }
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index b7ce8ac336a..a340b08ede0 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -125,7 +125,7 @@ Worker::svc()
     {
       this->orb_->shutdown();
     }
-  catch (CORBA::Exception &)
+  catch (CORBA::Exception &ex)
     {
     }
 
diff --git a/TAO/tests/CollocationLockup/AB.idl b/TAO/tests/CollocationLockup/AB.idl
index fe65905edb6..92b2822b872 100644
--- a/TAO/tests/CollocationLockup/AB.idl
+++ b/TAO/tests/CollocationLockup/AB.idl
@@ -3,6 +3,6 @@
 interface A {
 };
 
-interface C {
+interface B {
   A makeA ();
 };
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
index f943951cefa..6f4e11ec90a 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp
@@ -39,7 +39,7 @@ class A_i : public virtual POA_A
 {
 };
 
-class B_i : public virtual POA_C
+class B_i : public virtual POA_B
 {
 public:
   virtual A_ptr
@@ -134,7 +134,7 @@ TestThread (void*)
       for (size_t i (0); i < N_ITERATIONS; ++i)
         {
           CORBA::Object_var obj = g_pNameService->resolve ();
-          C_var b = C::_narrow (obj.in ());
+          B_var b = B::_narrow (obj.in ());
           b->makeA ();
           if (i % 50 == 0)
             ACE_DEBUG ((LM_INFO, "(%t) collocated call returned\n"));
diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index 8d1d133fb22..4919809f944 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -107,30 +107,12 @@ main (int argc, char *argv[])
         {
           for (int i = 0; i != niterations; ++i)
             {
-              CORBA::Long const tv = i + 100;
-              server->test_val(tv);
-              CORBA::Long const rtv = server->test_val ();
+              the_in_structure.i = i;
+              CORBA::String_var name = CORBA::string_dup ("the name");
 
-              if (TAO_debug_level > 0)
-                {
-                   ACE_DEBUG ((LM_DEBUG,
-                               "DSI_Simpler_Server ==== Expected result = %d for %d\n",
-                               rtv, tv));
-                }
-
-              if (rtv != tv)
-                {
-                   ACE_ERROR ((LM_ERROR,
-                             "(%P|%t) ERROR: unexpected result = %d for %d\n",
-                             rtv, tv));
-               }
-
-             the_in_structure.i = i;
-             CORBA::String_var name = CORBA::string_dup ("the name");
+              Structure_var the_out_structure;
 
-             Structure_var the_out_structure;
-
-             CORBA::Long const r =
+              CORBA::Long r =
                 server->test_method (i,
                                      the_in_structure,
                                      the_out_structure.out (),
@@ -154,8 +136,8 @@ main (int argc, char *argv[])
 
               if (r != i)
                 {
-                  ACE_ERROR ((LM_ERROR,
-                              "(%P|%t) ERROR: unexpected result = %d for %d",
+                  ACE_DEBUG ((LM_DEBUG,
+                              "(%P|%t) unexpected result = %d for %d",
                               r, i));
                 }
             }
diff --git a/TAO/tests/DSI_Gateway/test.idl b/TAO/tests/DSI_Gateway/test.idl
index 29cdc6f4d15..d35c073b70d 100644
--- a/TAO/tests/DSI_Gateway/test.idl
+++ b/TAO/tests/DSI_Gateway/test.idl
@@ -19,8 +19,6 @@ exception test_exception
 
 interface Simple_Server
 {
-  attribute long test_val;
-
   long test_method (in long x,
                     in Structure the_in_structure,
                     out Structure the_out_structure,
diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp
index 759578e6f6a..68759674acf 100644
--- a/TAO/tests/DSI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_Gateway/test_i.cpp
@@ -61,24 +61,3 @@ Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
-
-CORBA::Long
-Simple_Server_i::test_val (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return vlong_;
-}
-
-void
-Simple_Server_i::test_val (CORBA::Long tv ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Simpler_Server_i ====test_val: %d\n", tv
-                 ));
-    }
-    vlong_ = tv;
-}
-
diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h
index 776a385b9e1..499ee8f0dc4 100644
--- a/TAO/tests/DSI_Gateway/test_i.h
+++ b/TAO/tests/DSI_Gateway/test_i.h
@@ -38,12 +38,6 @@ public:
                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-   CORBA::Long test_val (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-     ACE_THROW_SPEC (( CORBA::SystemException));
-
-   void test_val (CORBA::Long test_val ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-     ACE_THROW_SPEC ((CORBA::SystemException));
-
   void raise_user_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      test_exception));
@@ -55,9 +49,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  // The ORB
   CORBA::ORB_var orb_;
-  CORBA::Long  vlong_;
+  // The ORB
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/tests/DSI_Gateway/test_i.inl b/TAO/tests/DSI_Gateway/test_i.inl
index bd51e3a42bd..97524552ff4 100644
--- a/TAO/tests/DSI_Gateway/test_i.inl
+++ b/TAO/tests/DSI_Gateway/test_i.inl
@@ -2,7 +2,6 @@
 
 ACE_INLINE
 Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb)),
-     vlong_ (0)
+  :  orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
index a045d5540d8..df5e183c1da 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
@@ -5,7 +5,7 @@ interface A
   string method1 ();
 };
 
-interface intB : A
+interface B : A
 {
   string method2 ();
 };
@@ -15,7 +15,7 @@ interface C : A
   string method3 ();
 };
 
-interface D : intB, C
+interface D : B, C
 {
   string method4 ();
 };
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index ce7f8434a2f..8406386f614 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -114,7 +114,7 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Narrow the object reference
-      intB_var b = intB::_narrow (a.in () ACE_ENV_ARG_PARAMETER);
+      B_var b = B::_narrow (a.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index d1cd37643c1..6ffff418f91 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -5,10 +5,9 @@
 
 ACE_RCSID(Muxing, Receiver, "$Id$")
 
-Receiver::Receiver (CORBA::ORB_ptr orb)
+Receiver::Receiver (void)
   :  message_count_ (0)
   ,  byte_count_ (0)
-  , orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
@@ -40,10 +39,3 @@ Receiver::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return this->message_count_;
 }
-
-void
-Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index c297521ed30..d8db9cc926b 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -22,7 +22,7 @@ class Receiver
 {
 public:
   /// Constructor
-  Receiver (CORBA::ORB_ptr orb);
+  Receiver (void);
 
   /// Print out the results
   void dump_results (void);
@@ -34,16 +34,10 @@ public:
   virtual CORBA::Long get_event_count (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
 private:
   ACE_SYNCH_MUTEX mutex_;
   CORBA::ULong message_count_;
   CORBA::ULong byte_count_;
-  /// Use an ORB reference to shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Muxing/Test.idl b/TAO/tests/Muxing/Test.idl
index af7010bd6c0..6a3b8921c78 100644
--- a/TAO/tests/Muxing/Test.idl
+++ b/TAO/tests/Muxing/Test.idl
@@ -12,8 +12,5 @@ module Test
 
     /// Return the number of messages received so far
     long get_event_count ();
-
-    /// A method to shutdown the ORB
-    oneway void shutdown ();
   };
 };
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index e149b323d49..460d623719e 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -6,12 +6,11 @@
 ACE_RCSID(Muxing, client, "$Id$")
 
 const char *ior = "file://test.ior";
-bool shutdown_srv = false;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:x");
+  ACE_Get_Opt get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -20,15 +19,11 @@ parse_args (int argc, char *argv[])
       case 'k':
         ior = get_opts.opt_arg ();
         break;
-      case 'x':
-        shutdown_srv = true;
-        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-                           "-k <ior> "
-                           "[-x]"
+                           "-k <ior>"
                            "\n",
                            argv [0]),
                           -1);
@@ -65,34 +60,28 @@ main (int argc, char *argv[])
                             1);
         }
 
-      if (shutdown_srv)
-        {
-          receiver->shutdown ();
-        }
-      else
-        {
-        
-          Client_Task client_task (receiver.in (),
+
+      Client_Task client_task (receiver.in (),
 #if defined (ACE_OPENVMS)
-                                  750, /* test takes much longer on OpenVMS */
+                               750, /* test takes much longer on OpenVMS */
 #else
-                                  1000,
+                               1000,
 #endif
-                                  32768,
-                                  ACE_Thread_Manager::instance ());
-        
-          if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
-              {
-              ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
-              }
-          ACE_Thread_Manager::instance ()->wait ();
-        
-          CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        
-          ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
-                      count));
+                               32768,
+                               ACE_Thread_Manager::instance ());
+
+      if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
+        {
+          ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
         }
+      ACE_Thread_Manager::instance ()->wait ();
+
+      CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
+                  count));
+
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Muxing/run_test.pl b/TAO/tests/Muxing/run_test.pl
index 4dd9dbdc537..fc7be2d21e1 100755
--- a/TAO/tests/Muxing/run_test.pl
+++ b/TAO/tests/Muxing/run_test.pl
@@ -23,7 +23,7 @@ $CL2 = new PerlACE::Process ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
@@ -51,12 +51,7 @@ if ($client2 != 0) {
     $status = 1;
 }
 
-# shutdown
-$CLx = new PerlACE::Process ("client", " -k file://$iorfile -x");
-$CLx->Spawn (60);
-$CLx->WaitKill (15);
-
-$server = $SV->WaitKill (15);
+$server = $SV->TerminateWaitKill (5);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index ad2a9a98241..06a120b2183 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
 
       Receiver *receiver_impl;
       ACE_NEW_RETURN (receiver_impl,
-                      Receiver (orb.in ()),
+                      Receiver,
                       1);
       PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl);
 
diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp
index 36be9d30ffe..8a3a74950d1 100644
--- a/TAO/tests/Oneway_Timeouts/client.cpp
+++ b/TAO/tests/Oneway_Timeouts/client.cpp
@@ -3,7 +3,7 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/TAOA.h"
 #include "tao/AnyTypeCode/Any.h"
-//#include "tao/IIOP_Connector.h"
+#include "tao/IIOP_Connector.h"
 
 #include "ace/streams.h"
 #include "ace/High_Res_Timer.h"
@@ -17,7 +17,7 @@ using namespace PortableServer;
 namespace
 {
   const char *non_existent_ior = "corbaloc:iiop:1.2@63.246.9.65:12345/test";
-  const int TIME_THRESHOLD = 100; //ms
+  const int TIME_THRESHOLD = 50; //ms
 
   int request_timeout = 0;
   Messaging::SyncScope sync_scope;
@@ -42,27 +42,16 @@ namespace
   bool retry_transients = false;
   bool retry_timeouts = false;
 
-  void print_usage (const char *argv0)
+  void print_usage ()
   {
-    ACE_ERROR ((LM_ERROR,
-                "%s [-request_timeout ms=0] "
-                "[-connect_timeout ms=0] "
-                "[-request_interval ms=100] "
-                "[-run_orb_delay ms=0] "
-                "[-run_orb_time ms=0] "
-                "[-max_request_time ms=0] "
-                "[-num_requests n=10] "
-                "[-use_twoway] "
-                "[-retry_transients] "
-                "[-retry_timeouts] "
-                "[-use_sleep] "
-                "[-force_timeout] "
-                "[-force_connect] "
-                "[-buffer_count n=0]"
-                "[-buffer_bytes n=0] "
-                "[-buffer_timeout ms=0] "
-                "[-sync delayed|eager|none]\n",
-                argv0));
+    cout << "client [-request_timeout ms=0] [-connect_timeout ms=0] "
+      "[-request_interval ms=100]\n\t[-run_orb_delay ms=0] "
+      "[-run_orb_time ms=0] [-max_request_time ms=0]\n"
+      "\t[-num_requests n=10] [-use_twoway] [-retry_transients] "
+      "[-retry_timeouts]\n"
+      "\t[-use_sleep] [-force_timeout] [-force_connect] [-buffer_count n=0]\n"
+      "\t[-buffer_bytes n=0] [-buffer_timeout ms=0] [-sync delayed|eager|none]"
+         << endl;
   }
 
   bool parse_command_line (int ac, char *av[])
@@ -185,7 +174,7 @@ namespace
               }
             else
               {
-                print_usage (av[0]);
+                print_usage ();
                 return false;
               }
 
@@ -193,9 +182,9 @@ namespace
           }
         else
           {
-            ACE_ERROR ((LM_ERROR, "Error: Unknown argument \"%s\"\n",
-                        args.get_current ()));
-            print_usage (av[0]);
+            cerr << "Error: Unknown argument \""
+                 << args.get_current () << "\"" << endl;
+            print_usage ();
             return false;
           }
 
@@ -339,7 +328,7 @@ int main (int ac, char *av[])
         {
           tmp_tester = Tester::_narrow (obj.in ());
           tmp_tester->test2 (-2);
-          ACE_DEBUG ((LM_DEBUG, "Connected...\n"));
+          cout << "Connected..." << endl;
         }
       else
         tmp_tester = Tester::_unchecked_narrow (obj.in ());
@@ -352,7 +341,6 @@ int main (int ac, char *av[])
 
       for (; i < num_requests; ++i)
         {
-          ACE_DEBUG ((LM_DEBUG, "Updating 'before' time\n"));
           before = ACE_High_Res_Timer::gettimeofday_hr ();
           try
             {
@@ -368,23 +356,21 @@ int main (int ac, char *av[])
             }
           catch (CORBA::TRANSIENT&)
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Transient exception during test () invocation %d\n",
-                          i));
-              if (retry_transients)
-                ACE_DEBUG ((LM_DEBUG,"retrying\n"));
-              else
-                throw;
+              cerr << "Transient exception during test () invocation " << i << endl;
+              if (! retry_transients)
+                {
+                  throw;
+                }
+
             }
           catch (CORBA::TIMEOUT&)
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Timeout exception during test () invocation %d\n",
-                          i));
-              if (retry_timeouts)
-                ACE_DEBUG ((LM_DEBUG,"retrying\n"));
-              else
-                throw;
+              cerr << "Timeout exception during test () invocation " << i << endl;
+              if (! retry_timeouts)
+                {
+                  throw;
+                }
+
             }
 
           ++num_requests_sent;
@@ -393,14 +379,13 @@ int main (int ac, char *av[])
           if (max_request_time > 0 &&
               (after - before).msec () > max_request_time)
             {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Error: test() took %d ms, max is %d ms\n",
-                                 (after - before).msec (), max_request_time),
-                                1);
+              cerr << "Error : test () took " << (after - before).msec ()
+                   << endl;
+              return 1;
             }
 
-          ACE_DEBUG ((LM_DEBUG, "c%d\n", i));
 
+          cout << 'c' << i << endl;
           if (request_interval > 0)
             {
               ACE_Time_Value tv (0, request_interval * 1000);
@@ -422,8 +407,6 @@ int main (int ac, char *av[])
             }
         }
 
-      ACE_DEBUG ((LM_DEBUG,"request loop complete\n"));
-
 
       if (run_orb_delay > 0)
         {
@@ -438,14 +421,8 @@ int main (int ac, char *av[])
           orb->run (tv);
         }
 
-      ACE_DEBUG ((LM_DEBUG,"Sending synch request to shutdown server\n"));
-      if (force_timeout)
-        // we have one more invocation that may time out.
-        before = ACE_High_Res_Timer::gettimeofday_hr ();
-      use_twoway = true;
-      use_sync_scope = false;
-      // Let the server know we're finished. This will timeout if
-      // force_timeout is true.
+
+      // Let the server know we're finished.
       tester->test2 (-1);
 
       orb->shutdown (1);
@@ -454,18 +431,19 @@ int main (int ac, char *av[])
 
       if (force_timeout)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Error: Connection did not time out.\n"),
-                            1);
+          cerr << "Error: Connection did not timeout." << endl;
+          return 1;
         }
 
+
       return 0;
+
     }
   catch (CORBA::TRANSIENT &ex)
     {
-      ACE_DEBUG ((LM_DEBUG, "caught transient exception\n"));
       if (force_timeout)
         {
+          ACE_DEBUG ((LM_DEBUG, "caught exception\n"));
           ACE_Time_Value after = ACE_High_Res_Timer::gettimeofday_hr ();
           long ms = (after - before).msec ();
           if ( (use_twoway || !use_sync_scope)
@@ -478,9 +456,8 @@ int main (int ac, char *av[])
             {
               if (ms > TIME_THRESHOLD)
                 {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "Error: Buffered request took %dms\n",
-                                     ms),1);
+                  cerr << "Error: Buffered request took " << ms << endl;
+                  return 1;
                 }
 
               ms = num_requests_sent * request_interval;
@@ -489,22 +466,20 @@ int main (int ac, char *av[])
           if (std::abs (static_cast<int>(ms - connect_timeout))
               > TIME_THRESHOLD)
             {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Error: Timeout expected in %d ms, "
-                                 "but took %d ms\n", connect_timeout, ms),
-                                1);
+              cerr << "Error: Timeout expected in " << connect_timeout
+                   << "ms, but took " << ms << "ms" << endl;
+              return 1;
             }
 
           return 0;
         }
       else
         {
-          ACE_ERROR_RETURN ((LM_ERROR, "Error: Unexpected\n"), 1);
+          cerr << "Error: Unexpected transient\n" << ex << endl;
         }
     }
   catch (CORBA::TIMEOUT &ex)
     {
-      ACE_DEBUG ((LM_DEBUG, "caught timeout exception\n"));
       if (force_timeout)
         {
           ACE_Time_Value after = ACE_High_Res_Timer::gettimeofday_hr ();
@@ -519,9 +494,8 @@ int main (int ac, char *av[])
             {
               if (ms > TIME_THRESHOLD)
                 {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                    "Error: Buffered request took %d ms\n",
-                                    ms),1);
+                  cerr << "Error: Buffered request took " << ms << endl;
+                  return 1;
                 }
 
               ms = num_requests_sent * request_interval;
@@ -530,25 +504,26 @@ int main (int ac, char *av[])
           if (std::abs (static_cast<int>(ms - connect_timeout))
               > TIME_THRESHOLD)
             {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Error: Timeout expected in %d ms, "
-                                 "but took %d ms\n", connect_timeout, ms),
-                                1);
+              cerr << "Error: Timeout expected in " << connect_timeout
+                   << "ms, but took " << ms << "ms" << endl;
+              return 1;
             }
 
           return 0;
         }
       else
         {
-          ACE_ERROR_RETURN ((LM_ERROR, "Error: Unexpected\n"), 1);
+          cerr << "Error: Unexpected timeout\n" << ex << endl;
         }
 
     }
   catch (Exception &ex)
     {
-      ACE_ERROR ((LM_ERROR, "client: %s\n\nLast operation took %d ms.\n",
-                  ex._name(),
-                  (ACE_High_Res_Timer::gettimeofday_hr () - before).msec ()));
+      cerr << "client: " << ex << endl;
+      cerr << "\nLast operation took "
+           << (ACE_High_Res_Timer::gettimeofday_hr () - before).msec ()
+           << "ms"
+           << endl;
     }
 
   return 1;
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index 0e6d5a8e9f2..639cb344ab8 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(Test, server, "$Id$")
 int msglen = 100; //default length of reply message is 100 bytes
 int nthreads = 2;
 const char *ior_output_file = "test.ior";
-int orb_timeout = 30; //default timeout for ORB is 30 sec
+int timeout = 30; //default timeout for ORB is 30 sec
 
 
 int
@@ -35,7 +35,7 @@ parse_args (int argc, char *argv[])
         break;
 
       case 't':
-        orb_timeout = ACE_OS::atoi (get_opts.opt_arg ());
+        timeout = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case '?':
@@ -90,7 +90,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG(( LM_DEBUG, "ior file = %s\t#threads = %d\t"
                   "msglen = %d\tORB timeout = %d sec\n",
-                  ior_output_file, nthreads, msglen, orb_timeout ));
+                  ior_output_file, nthreads, msglen, timeout ));
 
       // Create the factory servant
       Object_Factory_i *factory_impl;
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Instantiate the specified # of worker threads
-      Worker worker (orb.in (), orb_timeout);
+      Worker worker (orb.in (), timeout);
 
       if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
                            nthreads) != 0)
diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp
index ae0889a419a..b1581d8baa9 100644
--- a/TAO/tests/Two_Objects/worker.cpp
+++ b/TAO/tests/Two_Objects/worker.cpp
@@ -6,7 +6,7 @@
 
 Worker::Worker (CORBA::ORB_ptr orb, int time)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
-     orb_timeout_(time)
+     timeout_(time)
 {
 }
 
@@ -17,9 +17,9 @@ Worker::svc (void)
 
   ACE_TRY
     {
-      ACE_Time_Value tv (orb_timeout_);
+      ACE_Time_Value tv (timeout_);
 
-      // orb times out after <timeout> seconds
+      ///orb times out after <timeout> seconds
       this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Two_Objects/worker.h b/TAO/tests/Two_Objects/worker.h
index 1e2a5a3b54e..42ed1fe0cb9 100644
--- a/TAO/tests/Two_Objects/worker.h
+++ b/TAO/tests/Two_Objects/worker.h
@@ -25,7 +25,7 @@ private:
   // The orb
   CORBA::ORB_var orb_;
 
-  int orb_timeout_;
+  int timeout_;
 };
 
 #endif  /* TAO_TWO_OBJECTS_WORKER_H */
author	nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2006-11-09 06:39:56 +0000
committer	nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2006-11-09 06:39:56 +0000
commit	63c18831b86e2e2f25d19af7337c0c00104498ab (patch)
tree	a9cf17108e998f7493fe8e82bc1ac37590f5100a
parent	db48568784542918671bac04874ab4daa971ee46 (diff)
download	ATCD-63c18831b86e2e2f25d19af7337c0c00104498ab.tar.gz