Merge branch 'master' into jwi-macosx

8 files changed, 87 insertions, 78 deletions

diff --git a/ACE/NEWS b/ACE/NEWS
index 4f2bf9e45ba..1c465151aa7 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,3 +1,6 @@
+USER VISIBLE CHANGES BETWEEN ACE-7.0.0 and ACE-7.0.1
+====================================================
+
 USER VISIBLE CHANGES BETWEEN ACE-6.5.12 and ACE-7.0.0
 =====================================================
 
diff --git a/ACE/bin/copy-local-script.sh b/ACE/bin/copy-local-script.sh
index fdc94befd35..c4cf562bdfb 100755
--- a/ACE/bin/copy-local-script.sh
+++ b/ACE/bin/copy-local-script.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 for i in *.gz *.bz2 *.zip *.md5; do
-  d=`echo $i | sed 's/\.[tz][ai][rp]/-6.5.12&/'`
+  d=`echo $i | sed 's/\.[tz][ai][rp]/-7.0.0&/'`
   echo "Copying $i to $d"
   cp -ip $i $d
 done
diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
index 08e4422778f..e389d2b8050 100755
--- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
+++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
@@ -2,7 +2,7 @@
 
 if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi
 if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi
-if test -z $3; then olddate=2020_10_27; else olddate=$3; fi
+if test -z $3; then olddate=2021_01_25; else olddate=$3; fi
 if test -z $ACE_ROOT; then ACE_ROOT=..; fi
 if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi
 if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index 59ea20b7d04..1752aaa5bc3 100644
--- a/ACE/docs/Download.html
+++ b/ACE/docs/Download.html
@@ -92,160 +92,160 @@ Windows line feeds. For all other platforms download a .gz/.bz2 package.
 </P>
 
 <UL>
-<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 6.5.12 and TAO 2.5.12
-(ACE+TAO x.5.12), please use the links below to download it.<P>
+<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 7.0.0 and TAO 3.0.0
+(ACE+TAO x.0.0), please use the links below to download it.<P>
 
 <TABLE BORDER="4">
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
   <TR><TD>ACE+TAO.tar.gz</TD>
       <TD>ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-6.5.12.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.12.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-7.0.0.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.0.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-src-6.5.12.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.12.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-src-7.0.0.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.0.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.bz2</TD>
       <TD>ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-6.5.12.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.12.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-7.0.0.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.0.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-src-6.5.12.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.12.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-src-7.0.0.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.0.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-6.5.12.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.12.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-7.0.0.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.0.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE+TAO-src-6.5.12.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.12.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-src-7.0.0.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.0.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-html-6.5.12.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.12.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-html-7.0.0.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.0.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.bz2</TD>
       <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-html-6.5.12.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.12.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-html-7.0.0.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.0.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.zip</TD>
       <TD>Doxygen documentation for ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-html-6.5.12.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.12.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-html-7.0.0.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.0.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.gz</TD>
       <TD>ACE only (tar+gzip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-6.5.12.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.12.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-7.0.0.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.0.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-src-6.5.12.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.12.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-src-7.0.0.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.0.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.bz2</TD>
       <TD>ACE only (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-6.5.12.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.12.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-7.0.0.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.0.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-src-6.5.12.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.12.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-src-7.0.0.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.0.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.zip</TD>
       <TD>ACE only (zip format)</TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-6.5.12.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.12.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-7.0.0.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.0.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-src-6.5.12.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.12.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-src-7.0.0.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.0.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
 
-<LI> <B>Latest ACE+TAO Minor Release.</B> The latest minor release is ACE 6.5.0 and TAO 2.5.0
-(ACE+TAO x.5.0), please use the links below to download it.<P>
+<LI> <B>Latest ACE+TAO Minor Release.</B> The latest minor release is ACE 7.0.0 and TAO 3.0.0
+(ACE+TAO x.0.0), please use the links below to download it.<P>
 
 <TABLE BORDER="4">
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
-  <TR><TD>ACE+TAO-6.5.0.tar.gz</TD>
+  <TR><TD>ACE+TAO-7.0.0.tar.gz</TD>
       <TD>ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-7.0.0.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.0.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-src-7.0.0.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.0.tar.gz">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE+TAO-6.5.0.tar.bz2</TD>
+  <TR><TD>ACE+TAO-7.0.0.tar.bz2</TD>
       <TD>ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-7.0.0.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.0.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-src-7.0.0.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.0.tar.bz2">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE+TAO-6.5.0.zip</TD>
+  <TR><TD>ACE+TAO-7.0.0.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-7.0.0.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-7.0.0.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE+TAO-src-7.0.0.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-7.0.0.zip">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-html-6.5.0.tar.gz</TD>
+  <TR><TD>ACE-html-7.0.0.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-html-7.0.0.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.0.tar.gz">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-html-6.5.0.tar.bz2</TD>
+  <TR><TD>ACE-html-7.0.0.tar.bz2</TD>
       <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-html-7.0.0.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.0.tar.bz2">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-html-6.5.0.zip</TD>
+  <TR><TD>ACE-html-7.0.0.zip</TD>
       <TD>Doxygen documentation for ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-html-7.0.0.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-7.0.0.zip">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-6.5.0.tar.gz</TD>
+  <TR><TD>ACE-7.0.0.tar.gz</TD>
       <TD>ACE only (tar+gzip format)</TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-7.0.0.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.0.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.gz">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-src-7.0.0.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.0.tar.gz">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-6.5.0.tar.bz2</TD>
+  <TR><TD>ACE-7.0.0.tar.bz2</TD>
       <TD>ACE only (tar+bzip2 format)</TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-7.0.0.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.0.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.bz2">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-src-7.0.0.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.0.tar.bz2">FTP</A>]
       </TD>
   </TR>
-  <TR><TD>ACE-6.5.0.zip</TD>
+  <TR><TD>ACE-7.0.0.zip</TD>
       <TD>ACE only (zip format)</TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-7.0.0.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.0.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.zip">FTP</A>]
+      <TD>[<A HREF="https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-7_0_0/ACE-src-7.0.0.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-7.0.0.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
@@ -324,7 +324,7 @@ of the DAnCE micro release is available for
   <li>ACE+TAO source code may be obtained from the
     <a href="http://htmlpreview.github.com/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html#power">Git repository</a>.</li>
   <LI>Commercially supported versions of ACE+TAO are available from
-    <A HREF="http://www.dre.vanderbilt.edu/~schmidt/commercial-support.html">several companies</A>.
+    <A HREF="https://www.dre.vanderbilt.edu/~schmidt/commercial-support.html">several companies</A>.
   <LI>RPMs for CentOS, Fedora, Mandriva, RHEL, SLE, and OpenSuSE are available from the
     <A HREF="http://software.opensuse.org/search">Open Build Service</A>.
       <UL>
@@ -338,6 +338,8 @@ of the DAnCE micro release is available for
     <A HREF="https://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor:/versioned/">https://download.opensuse.org/repositories/devel:/libraries:/ACE:/minor:/versioned/</A>
   <LI>Latest major release
     <A HREF="https://download.opensuse.org/repositories/devel:/libraries:/ACE:/major/">https://download.opensuse.org/repositories/devel:/libraries:/ACE:/major/</A>
+  <LI>Latest major release with versioned namespaces
+    <A HREF="https://download.opensuse.org/repositories/devel:/libraries:/ACE:/major:/versioned/">https://download.opensuse.org/repositories/devel:/libraries:/ACE:/major:/versioned/</A>
       </UL>
 </UL><P>
 </BODY>
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index 8ec83e50364..c8d00114b74 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -278,7 +278,7 @@
         rm -rf doxygen<br>
         mkdir doxygen<br>
         cd doxygen<br>
-        git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-6_5_12 ACE_TAO<br>
+        git clone https://github.com/DOCGroup/ACE_TAO.git --depth 1 --branch ACE+TAO-7_0_0 ACE_TAO<br>
         cd ACE_TAO<br>
         export ACE_ROOT=$PWD/ACE<br>
         export TAO_ROOT=$PWD/TAO<br>
diff --git a/ACE/etc/index.html b/ACE/etc/index.html
index 70feaa4caeb..388f33adbe4 100644
--- a/ACE/etc/index.html
+++ b/ACE/etc/index.html
@@ -30,6 +30,7 @@
     <hr>
     We do have the documentation for previous releases
     <ul>
+      <LI><P><A HREF="7.0.0/html">7.0.0</A></P></LI>
       <LI><P><A HREF="6.5.12/html">6.5.12</A></P></LI>
       <LI><P><A HREF="6.5.11/html">6.5.11</A></P></LI>
       <LI><P><A HREF="6.5.10/html">6.5.10</A></P></LI>
diff --git a/ACE/include/makeinclude/platform_macosx_yosemite.GNU b/ACE/include/makeinclude/platform_macosx_yosemite.GNU
index 8c63a923a44..d23fbda1c59 100644
--- a/ACE/include/makeinclude/platform_macosx_yosemite.GNU
+++ b/ACE/include/makeinclude/platform_macosx_yosemite.GNU
@@ -3,7 +3,7 @@ include $(ACE_ROOT)/include/makeinclude/platform_macosx_mavericks.GNU
 ## The following is to circumvent the restriction of System Integrity Protection (SIP)
 ## by embedding the path information of dynamic libraries into the executables.
 
-SOFLAGS	+= -install_name @rpath/$@
+SOFLAGS	+= -install_name @rpath/$(notdir $@)
 space := $(subst ,, )
 
 LDFLAGS += $(foreach libpath,$(LIBPATHS),-rpath $(if $(filter "/%,$(subst $(space),;,$(libpath))),$(libpath),@executable_path/$(libpath)))
diff --git a/TAO/NEWS b/TAO/NEWS
index 5ce0657fccc..aa91001d873 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,3 +1,6 @@
+USER VISIBLE CHANGES BETWEEN TAO-3.0.0 and TAO-3.0.1
+====================================================
+
 USER VISIBLE CHANGES BETWEEN TAO-2.5.12 and TAO-3.0.0
 =====================================================