*** empty log message ***

16 files changed, 22 insertions, 36 deletions

diff --git a/ChangeLog b/ChangeLog
index 95d567a6bc5..ef6f670b638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
-Sat Jul 31 10:39:06 2004  Ossama  <ossama@dre.vanderbilt.edu>
-
-        * ACE version 5.4.2 released.
-
-Sat Jul 31 10:30:36 2004  Ossama  <ossama@dre.vanderbilt.edu>
-
-        * ACE version 5.4.2 released.
-
 Sat Jul 31 10:22:05 2004  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* bin/make_release:
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index 61a9c6153c9..317d0f99939 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -41,7 +41,7 @@
 To: ace-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 5.4.2
+    ACE VERSION: 5.4.1
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index c0533f98e9a..531145dd9e5 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,7 +1,3 @@
-Sat Jul 31 10:41:20 2004  Ossama  <ossama@dre.vanderbilt.edu>
-
-        * CIAO version 0.4.2 released.
-
 Fri Jul 30 18:29:54 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* ciao/Servant_Impl_T.cpp (get_all_facets, get_all_consumers):
diff --git a/TAO/CIAO/PROBLEM-REPORT-FORM b/TAO/CIAO/PROBLEM-REPORT-FORM
index 4933c6e92ce..30cfed1c246 100644
--- a/TAO/CIAO/PROBLEM-REPORT-FORM
+++ b/TAO/CIAO/PROBLEM-REPORT-FORM
@@ -32,9 +32,9 @@
 To: ciao-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    CIAO VERSION: 0.4.2
-    TAO VERSION : 1.4.2
-    ACE VERSION : 5.4.2
+    CIAO VERSION: 0.4.1
+    TAO VERSION : 1.4.1
+    ACE VERSION : 5.4.1
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/CIAO/VERSION b/TAO/CIAO/VERSION
index 726ede6d821..b08ff905ace 100644
--- a/TAO/CIAO/VERSION
+++ b/TAO/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 0.4.2, released Sat Jul 31 10:41:20 2004.
+This is CIAO version 0.4.1, released Sat Jul 31 10:41:20 2004.
 
 If you have any problems with or questions about TAO, please send
 e-mail to the CIAO mailing list (ciao-users@cs.wustl.edu), using the
diff --git a/TAO/CIAO/ciao/Version.h b/TAO/CIAO/ciao/Version.h
index 6f75b78837a..e36f84e74ec 100644
--- a/TAO/CIAO/ciao/Version.h
+++ b/TAO/CIAO/ciao/Version.h
@@ -3,5 +3,5 @@
 
 #define CIAO_MAJOR_VERSION 0
 #define CIAO_MINOR_VERSION 4
-#define CIAO_BETA_VERSION 2
-#define CIAO_VERSION "0.4.2"
+#define CIAO_BETA_VERSION 1
+#define CIAO_VERSION "0.4.1"
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7340042d0df..f65141d7d1c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,3 @@
-Sat Jul 31 10:39:42 2004  Ossama  <ossama@dre.vanderbilt.edu>
-
-        * TAO version 1.4.2 released.
-
 Sat Jul 31 07:00:20 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 5e87818f757..241933e0406 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -35,8 +35,8 @@
 To: tao-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 1.4.2
-    ACE VERSION: 5.4.2
+    TAO VERSION: 1.4.1
+    ACE VERSION: 5.4.1
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION b/TAO/VERSION
index 68d21a8083c..2286c677ff3 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 1.4.2, released Sat Jul 31 10:39:42 2004.
+This is TAO version 1.4.1, released Sat Jul 31 10:39:42 2004.
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-users@cs.wustl.edu), using the
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 53a774ca8b1..fe9e0ade0ee 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -3,5 +3,5 @@
 
 #define TAO_MAJOR_VERSION 1
 #define TAO_MINOR_VERSION 4
-#define TAO_BETA_VERSION 2
-#define TAO_VERSION "1.4.2"
+#define TAO_BETA_VERSION 1
+#define TAO_VERSION "1.4.1"
diff --git a/VERSION b/VERSION
index 13682f03dbc..217a7cf18d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.4.2, released Sat Jul 31 10:39:06 2004.
+This is ACE version 5.4.1, released Sat Jul 31 10:39:06 2004.
 
 If you have any problems with or questions about ACE, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/ace/Version.h b/ace/Version.h
index a846375930c..b201d4b244e 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -3,5 +3,5 @@
 
 #define ACE_MAJOR_VERSION 5
 #define ACE_MINOR_VERSION 4
-#define ACE_BETA_VERSION 2
-#define ACE_VERSION "5.4.2"
+#define ACE_BETA_VERSION 1
+#define ACE_VERSION "5.4.1"
diff --git a/bin/MakeProjectCreator/config/aceversion.mpb b/bin/MakeProjectCreator/config/aceversion.mpb
index 1d0015e628c..16e86533c2f 100644
--- a/bin/MakeProjectCreator/config/aceversion.mpb
+++ b/bin/MakeProjectCreator/config/aceversion.mpb
@@ -2,5 +2,5 @@
 // $Id$
 
 project {
-  version = 5.4.2
+  version = 5.4.1
 }
diff --git a/bin/MakeProjectCreator/config/ciaoversion.mpb b/bin/MakeProjectCreator/config/ciaoversion.mpb
index 69bf6ddf873..56f42a4b4b5 100644
--- a/bin/MakeProjectCreator/config/ciaoversion.mpb
+++ b/bin/MakeProjectCreator/config/ciaoversion.mpb
@@ -2,5 +2,5 @@
 // $Id$
 
 project {
-  version = 0.4.2
+  version = 0.4.1
 }
diff --git a/bin/MakeProjectCreator/config/taoversion.mpb b/bin/MakeProjectCreator/config/taoversion.mpb
index f497f54e089..777553fa7c6 100644
--- a/bin/MakeProjectCreator/config/taoversion.mpb
+++ b/bin/MakeProjectCreator/config/taoversion.mpb
@@ -2,5 +2,5 @@
 // $Id$
 
 project {
-  version = 1.4.2
+  version = 1.4.1
 }
diff --git a/bin/make_release b/bin/make_release
index d20fd120bb4..6d3229a4f1f 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -284,7 +284,8 @@ if ($update_versions  &&  "$kit" ne 'ace+tao+ciao') {
   }
 
   if ("$tao_tag") {
-    &ex ("$cvs -q export -r$tao_tag -kv ACE_wrappers/TAO > /dev/null")  &&
+    chdir "ACE_wrappers"  ||  die "$0: unable to chdir ACE_wrappers\n";
+    &ex ("$cvs -q export -r$tao_tag -kv TAO > /dev/null")  &&
       die "$0: failed cvs export of $tao_tag in $stage_dir\n";
     &ex ("cd ACE_wrappers/TAO  &&  $make INSTALL")  &&
       die "$0: failed make INSTALL in " .
@@ -292,7 +293,8 @@ if ($update_versions  &&  "$kit" ne 'ace+tao+ciao') {
   }
 
   if ("$ciao_tag") {
-    &ex ("$cvs -q export -r$ciao_tag -kv ACE_wrappers/TAO/CIAO > /dev/null")  &&
+    chdir "TAO"  ||  die "$0: unable to chdir ACE_wrappers/TAO\n";
+    &ex ("$cvs -q export -r$ciao_tag -kv CIAO > /dev/null")  &&
       die "$0: failed cvs export of $ciao_tag in $stage_dir\n";
   }