Revert files to restart release

12 files changed, 15 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index 73f1d4c47c6..78ba6de8210 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Tue Dec 20 04:43:44 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * ACE version 5.4.8 released.
-
 Mon Dec 20 09:58:00 UTC 2005  Simon Massey  <simon.massey@prismtech.com>
 
         * bin/make_release:
@@ -16,10 +12,6 @@ Mon Dec 19 16:50:00 UTC 2005  Simon Massey  <simon.massey@prismtech.com>
           comment from all of the Version.h generators. (Around the same
           line as before.)
 
-Mon Dec 19 08:48:13 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * ACE version 5.4.8 released. ABORTED
-
 Mon Dec 19 14:40:00 UTC 2005  Simon Massey  <simon.massey@prismtech.com>
 
         * bin/make_release:
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index c47ea88d3fe..4b7b56a4c9d 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -43,7 +43,7 @@
 To: ace-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 5.4.8
+    ACE VERSION: 5.4.7
 
     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 3793e5f2310..2c91bed0636 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,11 +1,3 @@
-Tue Dec 20 04:54:55 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * CIAO version 0.4.8 released.
-
-Mon Dec 19 08:52:02 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * CIAO version 0.4.8 released. ABORTED
-
 Fri Dec 16 15:58:27 2005  Gan Deng  <gan.deng@vanderbilt.edu>
 
         * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
diff --git a/TAO/CIAO/PROBLEM-REPORT-FORM b/TAO/CIAO/PROBLEM-REPORT-FORM
index e7aff47c511..1287da07d15 100644
--- a/TAO/CIAO/PROBLEM-REPORT-FORM
+++ b/TAO/CIAO/PROBLEM-REPORT-FORM
@@ -43,9 +43,9 @@
 To: ciao-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    CIAO VERSION: 0.4.8
-    TAO VERSION : 1.4.8
-    ACE VERSION : 5.4.8
+    CIAO VERSION: 0.4.7
+    TAO VERSION : 1.4.7
+    ACE VERSION : 5.4.7
 
     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 6bef18d2d96..fd8fce57f98 100644
--- a/TAO/CIAO/VERSION
+++ b/TAO/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 0.4.8, released Tue Dec 20 04:54:55 2005.
+This is CIAO version 0.4.7, released Tue Dec 20 04:54:55 2005.
 
 If you have any problems with or questions about CIAO, 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 7676fcad949..ea5a59dc0ef 100644
--- a/TAO/CIAO/ciao/Version.h
+++ b/TAO/CIAO/ciao/Version.h
@@ -5,5 +5,5 @@
 
 #define CIAO_MAJOR_VERSION 0
 #define CIAO_MINOR_VERSION 4
-#define CIAO_BETA_VERSION 8
-#define CIAO_VERSION "0.4.8"
+#define CIAO_BETA_VERSION 7
+#define CIAO_VERSION "0.4.7"
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ea68c803e30..fd982e48e01 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,11 +1,3 @@
-Tue Dec 20 04:51:06 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * TAO version 1.4.8 released.
-
-Mon Dec 19 08:50:17 2005  Simon Massey  <simon.massey@prismtech.com>
-
-        * TAO version 1.4.8 released. ABORTED
-
 Fri Dec 16 18:06:27 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
         * TAO_IDL/be/be_global.cpp:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 8eba840bcd7..fb58b1803ff 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -43,8 +43,8 @@
 To: tao-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 1.4.8
-    ACE VERSION: 5.4.8
+    TAO VERSION: 1.4.7
+    ACE VERSION: 5.4.7
 
     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 44b177432c4..c87279655e0 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 1.4.8, released Tue Dec 20 04:51:06 2005.
+This is TAO version 1.4.7, released Tue Dec 20 04:51:06 2005.
 
 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 1db96e3827e..8e50877a7e7 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -5,5 +5,5 @@
 
 #define TAO_MAJOR_VERSION 1
 #define TAO_MINOR_VERSION 4
-#define TAO_BETA_VERSION 8
-#define TAO_VERSION "1.4.8"
+#define TAO_BETA_VERSION 7
+#define TAO_VERSION "1.4.7"
diff --git a/VERSION b/VERSION
index de2be3b961a..7d466b22ab7 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.4.8, released Tue Dec 20 04:43:44 2005.
+This is ACE version 5.4.7, released Tue Dec 20 04:43:44 2005.
 
 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 f6f41656d56..bddf9711215 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -5,6 +5,6 @@
 
 #define ACE_MAJOR_VERSION 5
 #define ACE_MINOR_VERSION 4
-#define ACE_BETA_VERSION 8
-#define ACE_VERSION "5.4.8"
+#define ACE_BETA_VERSION 7
+#define ACE_VERSION "5.4.7"