This commit was manufactured by cvs2svn to create tagfix_bug132_iter03_ini

'fix_bug132_iter03_ini'.

16 files changed, 112 insertions, 657 deletions

diff --git a/ChangeLog b/ChangeLog
index 807e20fb964..e7406bee555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,48 +1,3 @@
-Wed Mar 28 11:55:39 2001  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_aix_ibm.GNU: New file, replaces
-          platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces
-          use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6.
-          So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6
-          and Visual Age C++ 5) use this file. If you want to try to keep
-          using CSet++ 3.4 or earlier, you can keep using
-          platform_aix4_cset++.GNU, but it's not tested any longer and
-          will disappear at the next ACE version. If you want to use
-          Visual Age C++ 4, you should reconsider, and upgrade to version 5.
-
-        * include/makeinclude/platform_aix_vacpp.GNU: Deleted.
-
-        * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h"
-          to be after #include "ace/SOCK_Connector.h" to fix compile error
-          on AIX, Visual Age C++ 5.
-
-        * ace/config-aix-4.x.h: Clarified comments that this file is for
-          Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what
-          is now generated from platform_aix_ibm.GNU.
-
-        * bin/auto_compile:
-        * bin/make_pretty.pl: Add detection of compile/link warnings and
-          errors for AIX using the IBM compilers' code. Ignores the multiply
-          defined symbol warnings from ld if it's an ACE symbol.
-
-        * docs/ACE-development-process.html: Changed to link to Bugzilla so
-          it works from anywhere.
-
-Wed Mar 28 10:13:16 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/Makefile.bor: Don't try to build the SSL directory if
-          SSL_ROOT is not set.
-
-Wed Mar 28 08:39:26 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * etc/tao_av.doxygen:
-          New configuration file for the AV streaming service.  Many
-          thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that
-          directory.
-
-        * bin/generate_doxygen.pl:
-          Add the new configuration file.
-
 Tue Mar 27 19:54:11 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * bin/auto_run_tests.lst:
@@ -74,9 +29,9 @@ Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-        * ace/ACE.cpp (handle_ready): Don't try to dereference through
-          a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
-          <pmarciniak@lucent.com> for reporting this.
+	* ace/ACE.cpp (handle_ready): Don't try to dereference through
+	  a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+ 	  <pmarciniak@lucent.com> for reporting this.
 
 Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 807e20fb964..e7406bee555 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,48 +1,3 @@
-Wed Mar 28 11:55:39 2001  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_aix_ibm.GNU: New file, replaces
-          platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces
-          use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6.
-          So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6
-          and Visual Age C++ 5) use this file. If you want to try to keep
-          using CSet++ 3.4 or earlier, you can keep using
-          platform_aix4_cset++.GNU, but it's not tested any longer and
-          will disappear at the next ACE version. If you want to use
-          Visual Age C++ 4, you should reconsider, and upgrade to version 5.
-
-        * include/makeinclude/platform_aix_vacpp.GNU: Deleted.
-
-        * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h"
-          to be after #include "ace/SOCK_Connector.h" to fix compile error
-          on AIX, Visual Age C++ 5.
-
-        * ace/config-aix-4.x.h: Clarified comments that this file is for
-          Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what
-          is now generated from platform_aix_ibm.GNU.
-
-        * bin/auto_compile:
-        * bin/make_pretty.pl: Add detection of compile/link warnings and
-          errors for AIX using the IBM compilers' code. Ignores the multiply
-          defined symbol warnings from ld if it's an ACE symbol.
-
-        * docs/ACE-development-process.html: Changed to link to Bugzilla so
-          it works from anywhere.
-
-Wed Mar 28 10:13:16 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/Makefile.bor: Don't try to build the SSL directory if
-          SSL_ROOT is not set.
-
-Wed Mar 28 08:39:26 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * etc/tao_av.doxygen:
-          New configuration file for the AV streaming service.  Many
-          thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that
-          directory.
-
-        * bin/generate_doxygen.pl:
-          Add the new configuration file.
-
 Tue Mar 27 19:54:11 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * bin/auto_run_tests.lst:
@@ -74,9 +29,9 @@ Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-        * ace/ACE.cpp (handle_ready): Don't try to dereference through
-          a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
-          <pmarciniak@lucent.com> for reporting this.
+	* ace/ACE.cpp (handle_ready): Don't try to dereference through
+	  a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+ 	  <pmarciniak@lucent.com> for reporting this.
 
 Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 807e20fb964..e7406bee555 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,48 +1,3 @@
-Wed Mar 28 11:55:39 2001  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_aix_ibm.GNU: New file, replaces
-          platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces
-          use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6.
-          So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6
-          and Visual Age C++ 5) use this file. If you want to try to keep
-          using CSet++ 3.4 or earlier, you can keep using
-          platform_aix4_cset++.GNU, but it's not tested any longer and
-          will disappear at the next ACE version. If you want to use
-          Visual Age C++ 4, you should reconsider, and upgrade to version 5.
-
-        * include/makeinclude/platform_aix_vacpp.GNU: Deleted.
-
-        * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h"
-          to be after #include "ace/SOCK_Connector.h" to fix compile error
-          on AIX, Visual Age C++ 5.
-
-        * ace/config-aix-4.x.h: Clarified comments that this file is for
-          Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what
-          is now generated from platform_aix_ibm.GNU.
-
-        * bin/auto_compile:
-        * bin/make_pretty.pl: Add detection of compile/link warnings and
-          errors for AIX using the IBM compilers' code. Ignores the multiply
-          defined symbol warnings from ld if it's an ACE symbol.
-
-        * docs/ACE-development-process.html: Changed to link to Bugzilla so
-          it works from anywhere.
-
-Wed Mar 28 10:13:16 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/Makefile.bor: Don't try to build the SSL directory if
-          SSL_ROOT is not set.
-
-Wed Mar 28 08:39:26 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * etc/tao_av.doxygen:
-          New configuration file for the AV streaming service.  Many
-          thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that
-          directory.
-
-        * bin/generate_doxygen.pl:
-          Add the new configuration file.
-
 Tue Mar 27 19:54:11 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * bin/auto_run_tests.lst:
@@ -74,9 +29,9 @@ Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-        * ace/ACE.cpp (handle_ready): Don't try to dereference through
-          a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
-          <pmarciniak@lucent.com> for reporting this.
+	* ace/ACE.cpp (handle_ready): Don't try to dereference through
+	  a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+ 	  <pmarciniak@lucent.com> for reporting this.
 
 Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp b/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp
deleted file mode 100644
index d0ab49a1939..00000000000
--- a/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-#include "authorization_test_i.h"
-
-#if !defined(__ACE_INLINE__)
-#include "authorization_test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Authorize, authorization_test_i, "$Id$")
-
-CORBA::Boolean
-Authorization_Server_i::check_access (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return 0;
-}
-
-void
-Authorization_Server_i::shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0);
-}
diff --git a/ace/Makefile.bor b/ace/Makefile.bor
index 8be64966125..23de7130f4e 100644
--- a/ace/Makefile.bor
+++ b/ace/Makefile.bor
@@ -5,14 +5,9 @@
 
 NAME = ace
 
-!ifdef SSL_ROOT
 DIRS =  QoS \
         SSL \
 	RMCast
-!else
-DIRS =  QoS \
-	RMCast
-!endif
 
 OBJFILES = \
 	$(OBJDIR)\ACE.obj \
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 484295ec718..34dd276f57b 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -2,8 +2,8 @@
 // $Id$
 
 // The following configuration file is designed to work for OS
-// platforms running AIX 4.x using the IBM C++ compiler (xlC),
-// Visual Age C++ or g++/egcs.
+// platforms running AIX 4.x using the IBM C++ compiler (xlC) or
+// g++/egcs.
 
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
@@ -26,7 +26,7 @@
 #  define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #  define ACE_LACKS_PRAGMA_ONCE
 
-   // C Set++ 3.1, IBM C/C++ 3.6, and Visual Age C++ 5 batch (__xlC__)
+   // C Set++ 3.1 and IBM C/C++ 3.6
 #  if defined (__xlC__)
 #    if (__xlC__ < 0x0500)
 #      define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
@@ -74,13 +74,6 @@
 #  define AIX
 #endif /* AIX */
 
-// AIX shared libs look strangely like archive libs until you look inside
-// them.
-#if defined (ACE_DLL_SUFFIX)
-#  undef ACE_DLL_SUFFIX
-#endif
-#define ACE_DLL_SUFFIX ".a"
-
 // Use BSD 4.4 socket definitions for pre-AIX 4.2.  The _BSD setting also
 // controls the data type used for waitpid(), wait(), and wait3().
 #if (ACE_AIX_MINOR_VERS < 2)
diff --git a/bin/auto_compile b/bin/auto_compile
index eea6cec93cb..e17b67e253d 100755
--- a/bin/auto_compile
+++ b/bin/auto_compile
@@ -423,11 +423,8 @@ foreach $i (@BUILD_LIST) {
 
     local $current_dir = $i;
     local $last_error = "";
-    local $this_error = 0;
-    local $this_warning = 0;
     while (<MAKE>) {
         chop;
-        $this_error = $this_warning = 0;
         if ($^O eq 'hpux'
             && m/^Warning:[ \t]+[0-9]+ future errors were detected/) {
             next;
@@ -441,13 +438,6 @@ foreach $i (@BUILD_LIST) {
         }
         if (m/error:/i || m/error /i
             || m/^make(\[[0-9]+\])?: \*\*\*/) {
-            $this_error = 1;
-        }
-        if ($^O eq 'aix'
-            && m/\d+-\d+ \([SI]\)/) {
-            $this_error = 1;
-        }
-        if ($this_error) {
             if ($last_error ne $current_dir
                 || STATUS eq "COMPILATION WARNING") {
               $STATUS = "COMPILATION ERROR";
@@ -458,17 +448,6 @@ foreach $i (@BUILD_LIST) {
         if (m/warning:/i
 	    || m/warning /i
 	    || m/Info: /i) {
-            $this_warning = 1;
-            if ($^O eq 'aix'
-                && m/^ld: \d+-\d+ WARNING: Duplicate symbol: .*ACE.*/) {
-                $this_warning = 0;
-            }
-        }
-        if ($^O eq 'aix'
-            && m/\d+-\d+ \(W\)/) {
-            $this_warning = 1;
-        }
-        if ($this_warning) {
           if ($last_error ne $current_dir) {
             if ($STATUS eq "OK") {
               $STATUS = "COMPILATION WARNING";
diff --git a/bin/generate_doxygen.pl b/bin/generate_doxygen.pl
index 465f5e17b54..4d85cf42b95 100755
--- a/bin/generate_doxygen.pl
+++ b/bin/generate_doxygen.pl
@@ -31,8 +31,7 @@ $dot_path = '/usr/local/bin';
              'tao_rtevent',
              'tao_implrepo',
              'tao_strategies',
-	     'tao_smartproxies',
-	     'tao_av');
+	     'tao_smartproxies');
 
 # Modify defaults using the command line arguments
 &parse_args ();
diff --git a/bin/make_pretty.pl b/bin/make_pretty.pl
index 8335fb505de..fdc6b87763f 100755
--- a/bin/make_pretty.pl
+++ b/bin/make_pretty.pl
@@ -113,19 +113,11 @@ sub is_warning ()
     # Look for any warnings we should ignore
     return 3 if (/^LINK : warning LNK4089:/);
 
-    # For some reason, there's a false license warning
-    return 3 if (/\(W\).*Compilation will proceed shortly./);
-
-    # AIX reports a bazillion multiple defines when doing templates.
-    return 3 if ($^O eq 'aix'
-                 && m/^ld: \d+-\d+ WARNING: Duplicate symbol:/);
-
     # Look for lines that also should be color coded, but not counted
     # as warnings.
     return 2 if (/see declaration of/);
 
     # Look for warnings
-
     return 1 if ((/warning/i && !/ warning\(s\)/)
                  || /info: /i
                  || /^make.*\*\*\*/);
@@ -135,12 +127,9 @@ sub is_warning ()
         || /^.*\.inl: /
         || /^.*\.cpp: /
         || /^.*\.java: /) {
-      return 1 if ($^O ne 'aix');
+      return 1;
     }
 
-    # IBM's compilers don't say the word "warning" - check for their code
-    return 1 if ($^O eq 'aix' && m/\d+-\d+ \(W\)/);
-
     # didn't find anything
     return 0;
 }
@@ -154,11 +143,6 @@ sub is_error ()
 {
     # Look for any errors we should ignore
 
-    # AIX reports a bazillion multiple defines when doing templates; some
-    # have the word 'error' in the symbol name - ignore those.
-    return 0 if ($^O eq 'aix'
-                 && m/^ld: \d+-\d+ WARNING: Duplicate symbol:/);
-
     # Look for lines that also should be color coded, but not counted
     # as errors.
     return 2 if (/Types pointed to are unrelated/
@@ -180,9 +164,6 @@ sub is_error ()
                  || /^Fatal\:/
                  || /: fatal:/);
 
-    # Again, IBM's compilers speak in code langauge
-    return 1 if ($^O eq 'aix' && m/\d+-\d+ \([SI]\)/);
-
     # didn't find anything
     return 0;
 }
diff --git a/docs/ACE-development-process.html b/docs/ACE-development-process.html
index f9bdb64b6e0..197873e581b 100644
--- a/docs/ACE-development-process.html
+++ b/docs/ACE-development-process.html
@@ -41,7 +41,8 @@ The ACE+TAO development process looks like:<p>
 <ol>
   <li>Every change to ACE+TAO must have a bug report.  <em>Change</em>
     includes fixes, enhancements, updates, and so on.
-  <li><a href="http://ace.cs.wustl.edu/bugs/index.cgi">Create a bug report</a>.
+  <!-- The link to bugzilla is intentionally local. -->
+  <li><a href="http://ace/bugzilla">Create a bug report</a>.
   <li>Accept the bug report if you are going to implement the change.
   <li>Implement the change in your workspace(s).
   <li>Test the change sufficiently to demonstrate that it both does
diff --git a/etc/tao_av.doxygen b/etc/tao_av.doxygen
deleted file mode 100644
index 39ac4929019..00000000000
--- a/etc/tao_av.doxygen
+++ /dev/null
@@ -1,197 +0,0 @@
-# Doxyfile 1.1.5
-#
-# $Id$
-#
-
-PROJECT_NAME          = TAO_AV
-PROJECT_NUMBER        = Snapshot
-OUTPUT_DIRECTORY      = .
-OUTPUT_LANGUAGE       = English
-DISABLE_INDEX         = NO
-EXTRACT_ALL           = YES
-EXTRACT_PRIVATE       = YES
-EXTRACT_STATIC        = YES
-HIDE_UNDOC_MEMBERS    = NO
-HIDE_UNDOC_CLASSES    = NO
-BRIEF_MEMBER_DESC     = YES
-REPEAT_BRIEF          = YES
-ALWAYS_DETAILED_SEC   = NO
-FULL_PATH_NAMES       = NO
-STRIP_FROM_PATH       = 
-INTERNAL_DOCS         = NO
-CLASS_DIAGRAMS        = YES
-SOURCE_BROWSER        = YES
-INLINE_SOURCES        = YES
-STRIP_CODE_COMMENTS   = NO
-CASE_SENSE_NAMES      = YES
-HIDE_SCOPE_NAMES      = NO
-VERBATIM_HEADERS      = YES
-SHOW_INCLUDE_FILES    = YES
-JAVADOC_AUTOBRIEF     = NO
-INHERIT_DOCS          = YES
-INLINE_INFO           = YES
-SORT_MEMBER_DOCS      = YES
-TAB_SIZE              = 8
-ENABLED_SECTIONS      = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-QUIET                 = YES
-WARNINGS              = NO
-WARN_IF_UNDOCUMENTED  = NO
-WARN_FORMAT           = "$file:$line: $text"
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-INPUT                 = TAO/orbsvcs/orbsvcs/AVStreams.idl \
-			TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl \
-			TAO/orbsvcs/orbsvcs/sfp.idl \
-			TAO/orbsvcs/orbsvcs/AV
-FILE_PATTERNS         = *.cpp *.h *.i *.inl *.pidl *.idl
-RECURSIVE             =
-EXCLUDE               = 
-EXCLUDE_PATTERNS      =
-EXAMPLE_PATH          = 
-EXAMPLE_PATTERNS      = 
-IMAGE_PATH            = 
-INPUT_FILTER          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-ALPHABETICAL_INDEX    = YES
-COLS_IN_ALPHA_INDEX   = 1
-IGNORE_PREFIX         = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/av
-HTML_HEADER           = 
-HTML_FOOTER           =
-HTML_STYLESHEET       = 
-HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-GENERATE_LATEX        = NO
-LATEX_OUTPUT          = latex
-COMPACT_LATEX         = NO
-PAPER_TYPE            = a4wide
-EXTRA_PACKAGES        = 
-LATEX_HEADER          = 
-PDF_HYPERLINKS        = NO
-LATEX_BATCHMODE       = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-GENERATE_RTF          = NO
-RTF_OUTPUT            = rtf
-COMPACT_RTF           = NO
-RTF_HYPERLINKS        = NO
-RTF_STYLESHEET_FILE   = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-GENERATE_MAN          = NO
-MAN_OUTPUT            = man
-MAN_EXTENSION         = .3
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-ENABLE_PREPROCESSING  = YES
-MACRO_EXPANSION       = YES
-EXPAND_ONLY_PREDEF    = YES
-SEARCH_INCLUDES       = YES
-INCLUDE_PATH          = TAO .
-PREDEFINED            = 
-EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
-			ACE_THROW_SPEC
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
-#---------------------------------------------------------------------------
-
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/av/TAO_AV.tag
-ALLEXTERNALS          = NO
-PERL_PATH             = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz
-
-HAVE_DOT              = YES
-CLASS_GRAPH           = YES
-COLLABORATION_GRAPH   = YES
-INCLUDE_GRAPH         = YES
-INCLUDED_BY_GRAPH     = YES
-GRAPHICAL_HIERARCHY   = YES
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path. 
-DOT_PATH              = /usr/local/bin
-MAX_DOT_GRAPH_WIDTH   = 1024
-MAX_DOT_GRAPH_HEIGHT  = 1024
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-
-SEARCHENGINE          = NO
-
-# The CGI_NAME tag should be the name of the CGI script that 
-# starts the search engine (doxysearch) with the correct parameters. 
-# A script with this name will be generated by doxygen. 
-
-CGI_NAME              = search.cgi
-
-# The CGI_URL tag should be the absolute URL to the directory where the 
-# cgi binaries are located. See the documentation of your http daemon for 
-# details. 
-
-CGI_URL               = http://doc.ece.uci.edu/cgi-bin/Doxygen/Current
-
-# The DOC_URL tag should be the absolute URL to the directory where the 
-# documentation is located. If left blank the absolute path to the 
-# documentation, with file:// prepended to it, will be used. 
-
-DOC_URL               = http://doc.ece.uci.edu/Doxygen/Current/
-
-# The DOC_ABSPATH tag should be the absolute path to the directory where the 
-# documentation is located. If left blank the directory on the local machine 
-# will be used. 
-
-DOC_ABSPATH           = /project/doctmp/Doxygen/Current
-
-# The BIN_ABSPATH tag must point to the directory where the doxysearch binary 
-# is installed. 
-
-BIN_ABSPATH           = /usr/bin
-
-# The EXT_DOC_PATHS tag can be used to specify one or more paths to 
-# documentation generated for other projects. This allows doxysearch to search 
-# the documentation for these projects as well. 
-
-EXT_DOC_PATHS         = html/ace
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU
deleted file mode 100644
index d4d3e0cfd4c..00000000000
--- a/include/makeinclude/platform_aix_ibm.GNU
+++ /dev/null
@@ -1,132 +0,0 @@
-# $Id$
-
-# This file is for use with AIX 4.3 and up, using either of the IBM
-# compilers (IBM C/C++ 3.6.6 or Visual Age C++ 5 batch compiler).
-# If you wish to use the CSet++ compiler, please use platform_aix4_cset++.GNU.
-# Note that as of ACE 6.0, the only supported compiler from IBM will
-# be Visual Age C++ 5 and up (either batch or incremental).
-
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(distrib))
-  distrib = 0
-endif
-ifeq (,$(exceptions))
-  exceptions = 1
-endif
-ifeq (,$(optimize))
-  optimize = 0
-endif
-ifeq (,$(rtti))
-  rtti = 0
-endif
-ifeq (,$(threads))
-  threads = 1
-endif
-
-# First, find out which compiler we're building with. The settings we
-# use for compiling, as well as how to build shared libraries, depend on
-# the compiler version. There's no easy way to ask lslpp which is installed.
-# Instead, compile a file and see which compiler is set up for use. This
-# trick was submitted by Craig Rodrigues <rodrigc@mediaone.net>, originally
-# from the vacpp compiler newsgroup.
-# It relies on the preprocessor defining __xlC__ to the proper version
-# number of the compiler.
-XLCVERSION := $(shell echo "__xlC__" > ./testAIXCompilerVersion.cpp)
-XLCVERSION := $(shell xlC -E ./testAIXCompilerVersion.cpp | tail -1')
-ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp)
-
-# In case anything here or in the config depends on OS version number,
-# grab it here and pass it all to the compiler as well.
-AIX_MAJOR_VERS := $(shell uname -v)
-AIX_MINOR_VERS := $(shell uname -r)
-
-# Use of exceptions should be a compiler-specific setting, but for now it's
-# not. IBM C/C++ doesn't have a way to turn exceptions off, and Visual
-# Age C++ V5 building ACE without exception handling causes segv on startup
-# of every test. Until this is straightened out, force exceptions=1 for
-# both compilers.
-exceptions=1
-
-# Yes, believe it or not...
-# The way to make a shared lib on AIX is to make a shared object file and
-# then put that in an archive.
-# Non-shared archives are named lib<x>ns.a - ns = non-shared.
-SOEXT       = a
-# aix_build turns on the funky shared library building code in
-# rules.lib.GNU
-aix_build = 1
-
-ifeq ($(threads),1)
-# Note - the _r form of the compiler command turns on -qthreads and the
-# thread-required preprocessor defines, as well as -lpthreads for linking.
-# If this is Visual Age C++ 5, DLD will get reset below.
-CC	    = xlc_r
-CXX	    = xlC_r
-DLD	    = makeC++SharedLib_r
-else
-CC          = xlc
-CXX         = xlC
-DLD	    = makeC++SharedLib
-endif
-
-ARFLAGS	    = ruv
-AR	    = ar
-LD          = $(CXX)
-RANLIB	    = ranlib
-TEMPINCDIR  = tempinc
-
-CPPFLAGS    += -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
-# -qinitauto seems like an interesting option, but some tests (specifically
-# Process_Strategy_Test) hang with it turned on. This should be investigated
-# at some point.
-DCFLAGS     += -g -qcheck=nobounds:div:null
-
-# Now sort out the compiler differences here...
-ifeq ($(XLCVERSION),0x0306)
- CCFLAGS    += -qlanglvl=ansi -qflag=e:e
- SOFLAGS     = -p 0
-# ibmcxx_build turns on the extra step for instantiating and compiling
-# template instances in rules.lib.GNU.
- ibmcxx_build = 1
- rtti = 0
-else
- ifeq ($(XLCVERSION),0x0500)
-  CCFLAGS    += -qflag=w:w
-  DLD         = $(CXX) -qmkshrobj
-  SOFLAGS     = $(CCFLAGS) $(CPPFLAGS) $(INCLDIRS)
- else
-  CXX = echo "Unrecognized compiler version $(XLCVERSION)\n"
- endif
-endif
-
-# -qextchk is handy, but produces false type mismatches when linking
-# netsvcs, so it's disabled.  IBM reports this fixed in 3.6.4, but it's
-# still producing the warnings... should be looked at.
-CCFLAGS     += $(CFLAGS) -qonce -qtempinc
-ifeq ($(exceptions),0)
-CCFLAGS     += -qnoeh
-endif
-
-ifeq (1,$(rtti))
-  CCFLAGS += -qrtti=dynamiccast
-else  # ! rtti
-  CCFLAGS += -DACE_LACKS_RTTI
-endif # ! rtti
-
-ifeq ($(shared_libs),1)
-ACELIB      = -lACE
-else
-ACELIB      = -lACEns
-endif
-
-LIBS	    += -ltli_r -ldl
-
-# Default OCCFLAGS builds common code for all RS/6000 architectures but
-# this can be set to optimize for your particular computer. The commented
-# out example optimizes for RS/6000 43P.
-# OCCFLAGS is not used by default.  To used it, set optimize=1
-# either in this file or on the command line.
-#OCCFLAGS    += -qarch=ppc -qtune=604
-OCCFLAGS    += -qlibansi -O2 -qarch=com 
diff --git a/include/makeinclude/platform_aix_vacpp.GNU b/include/makeinclude/platform_aix_vacpp.GNU
new file mode 100644
index 00000000000..626940dcc49
--- /dev/null
+++ b/include/makeinclude/platform_aix_vacpp.GNU
@@ -0,0 +1,94 @@
+# $Id$
+
+# AIX 4.3 and higher using the Visual Age C++ 5 batch compiler (xlC_r)
+# *not* using Orbix
+
+ifeq (,$(debug))
+  debug = 1
+endif
+ifeq (,$(distrib))
+  distrib = 0
+endif
+ifeq (,$(exceptions))
+  exceptions = 1
+endif
+ifeq (,$(optimize))
+  optimize = 0
+endif
+ifeq (,$(threads))
+  threads = 1
+endif
+
+# Note - Visual Age C++ pre-V5 didn't have a way to turn exception handling
+# off, and V5 building ACE without exception handling causes segv on startup
+# of every test. Until this is straightened out, force exceptions=1
+exceptions=1
+
+# In case anything here or in the config depends on OS version number,
+# grab it here and pass it all to the compiler as well.
+AIX_MAJOR_VERS := $(shell uname -v)
+AIX_MINOR_VERS := $(shell uname -r)
+
+ifeq ($(threads),1)
+# Note - the _r form of the compiler command turns on -qthreads and the
+# thread-required preprocessor defines, as well as -lpthreads for linking.
+CC	    = xlc_r
+CXX	    = xlC_r
+else
+CC          = xlc
+CXX         = xlC
+endif
+DLD	    = $(CXX) -qmkshrobj
+
+# -qextchk is handy, but produces false type mismatches when linking
+# netsvcs with 3.1.4, so it's disabled.  IBM reports this fixed in 3.6.4.
+CCFLAGS     += $(CFLAGS) -qonce -qtempinc
+ifeq ($(exceptions),0)
+CCFLAGS     += -qnoeh
+endif
+
+CPPFLAGS    += -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
+ifeq (1,$(rtti))
+  CCFLAGS += -qrtti=dynamiccast
+else  # ! rtti
+  CCFLAGS += -DACE_LACKS_RTTI
+endif # ! rtti
+
+# Define options used for debug=1 builds.
+# -qextchk still produces type mismatch errors... should look into this.
+# -qcheck messes up ACE_Allocator::instance?   - no, seems ok
+# How about -qinitauto?
+DCFLAGS     += -g
+
+LD          = $(CXX)
+
+# Yes, believe it or not...
+# The way to make a shared lib on AIX is to make a shared object file and
+# then put that in an archive.
+# Non-shared archives are named lib<x>ns.a - ns = non-shared.
+SOEXT       = a
+
+SOFLAGS = $(CCFLAGS) $(CPPFLAGS) $(INCLDIRS)
+
+aix_build = 1
+ifeq ($(shared_libs),1)
+ACELIB      = -lACE
+else
+ACELIB      = -lACEns
+endif
+
+LIBS	    += -ltli_r -ldl
+
+ARFLAGS	    = ruv
+AR	    = ar
+LDFLAGS	    += -bloadmap:vacpp.map
+# Default OCCFLAGS builds common code for all RS/6000 architectures but
+# this can be set to optimize for your particular computer. The commented
+# out example optimizes for RS/6000 43P.
+# OCCFLAGS is not used by default.  To used it, set optimize=1
+# either in this file or on the command line.
+#OCCFLAGS    += -qarch=ppc -qtune=604
+OCCFLAGS    += -qlibansi -O2 -qarch=com 
+RANLIB	    = ranlib
+#TEMPINCDIR  = tempinc
+SOBUILD = 
diff --git a/netsvcs/lib/TS_Clerk_Handler.h b/netsvcs/lib/TS_Clerk_Handler.h
index 8f1230e1e2e..4d2ba888736 100644
--- a/netsvcs/lib/TS_Clerk_Handler.h
+++ b/netsvcs/lib/TS_Clerk_Handler.h
@@ -17,12 +17,13 @@
 #ifndef ACE_TS_CLERK_HANDLER_H
 #define ACE_TS_CLERK_HANDLER_H
 
+#include "ace/Connector.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SOCK_Connector.h"
-#include "ace/Connector.h"
 #include "ace/Malloc.h"
 #include "ace/Time_Request_Reply.h"
 
diff --git a/protocols/ace/RMCast/README b/protocols/ace/RMCast/README
deleted file mode 100644
index 2dd0c5d9cfc..00000000000
--- a/protocols/ace/RMCast/README
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id$
-
-	This directory will contain a simple, small-scale reliable
-multicast framework for ACE.  The framework is based on the ASX
-components of the ACE library: the protocol is implemented as a stack
-of interchangeable "modules", each one in charge of a very small task.
-For example, one module implements fragmentation and reassembly, other
-modules implement retransmission, send ACK and NAK messages, and
-maintain receiver membership.
-
-	The modules are replaced to achieve different levels of
-reliability.  For example, the retransmission module can be either the
-"Best_Effort", "Semi_Reliable" or "Reliable" implementation.  In the
-first case no retransmissions are performed, but lost messages are
-detected and reported to the receiver.  The "Semi_Reliable" case
-messages are held for a pre-specified amount of time, and
-re-transmited if requested, but it is possible to loose some messages
-if multiple re-transmissions fail.  As in the "Best_Effort" case the
-lost messages are detected and flagged to the application.  Finally
-in the "Reliable" mode the senders are flowed controlled until enough
-messages are successfully transmitted.
-
-	In general the stack looks like this:
-
-
-SENDER:
-
-----------------------------------------------------------------
-Buffering	:	Save lost messages
-Retransmission	:	Retransmit 
-----------------------------------------------------------------
-Fragmentation   :	Fragment messages in smaller chunks
-Reassembly	:	and ensure that the IOVMAX limit is not
-		:	reached
-----------------------------------------------------------------
-Tranport	:	Encapsulate the specific transport media
-		:	such as TCP/IP, ATM, or shared memory
-		:	Demuxes incoming data to the right chain
-		:	Change control messages and data messages
-		:	to the right dynamic types.
-----------------------------------------------------------------
-
-RECEIVER:
-
-----------------------------------------------------------------
-Lost detection	:	Detect lost messages and send control
-		:	messages back
-----------------------------------------------------------------
-Reassembly	:	Reassemble messages, fragment control
-Fragmentation	:	data
-----------------------------------------------------------------
-Transport	:	Group membership, ACT reception,
-		:	handle keep-alive messages...
-----------------------------------------------------------------
-
-
-@@ TODO: Piggybacking...
diff --git a/protocols/ace/RMCast/RMCast_Export.h b/protocols/ace/RMCast/RMCast_Export.h
deleted file mode 100644
index 51257c4d682..00000000000
--- a/protocols/ace/RMCast/RMCast_Export.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
-// ------------------------------
-#if !defined (ACE_RMCAST_EXPORT_H)
-#define ACE_RMCAST_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL)
-#  define ACE_RMCAST_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */
-
-#if !defined (ACE_RMCAST_HAS_DLL)
-#define ACE_RMCAST_HAS_DLL 1
-#endif /* ! ACE_RMCAST_HAS_DLL */
-
-#if defined (ACE_RMCAST_HAS_DLL)
-#  if (ACE_RMCAST_HAS_DLL == 1)
-#    if defined (ACE_RMCAST_BUILD_DLL)
-#      define ACE_RMCast_Export ACE_Proper_Export_Flag
-#      define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    else
-#      define ACE_RMCast_Export ACE_Proper_Import_Flag
-#      define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    endif /* ACE_RMCAST_BUILD_DLL */
-#  else
-#    define ACE_RMCast_Export
-#    define ACE_RMCAST_SINGLETON_DECLARATION(T)
-#    define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif   /* ! ACE_RMCAST_HAS_DLL == 1 */
-#else
-#  define ACE_RMCast_Export
-#  define ACE_RMCAST_SINGLETON_DECLARATION(T)
-#  define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif     /* ACE_RMCAST_HAS_DLL */
-
-#endif     /* ACE_RMCAST_EXPORT_H */
-
-// End of auto generated file.