*** empty log message ***

7 files changed, 80 insertions, 55 deletions

diff --git a/COPYING b/COPYING
index fd50d3face7..c8d66964e79 100644
--- a/COPYING
+++ b/COPYING
@@ -3,17 +3,16 @@ COPYRIGHT INFORMATION FOR ACE
 ACE is copyrighted by Douglas C. Schmidt and his research group at
 Washington University, Copyright (c) 1993-1997, all rights reserved.
 You are free to do anything you like with the ACE source code (and
-object code produced from the source), e.g., including it in
-commercial software, as long as you include this copyright statement
-along with code built using ACE.
+object code produced from the source).  For instance, you can include
+it in commercial software, as long as you include this copyright
+statement along with code built using ACE.
 
 You are under no obligation to freely redistribute any of your source
-code that is built using ACE (be aware that rpc++ is distributed under
-the GNU GPL, which has a different copyright policy). Please note,
-however, that you may not do anything to the ACE code that will
-prevent it from being distributed freely (such as copyrighting it or
-claiming authorship).  Naturally, neither I nor my research group is
-responsible for any problems caused by using ACE.
+code that is built using ACE.  Please note, however, that you may not
+do anything to the ACE code that will prevent it from being
+distributed freely (such as copyrighting it or claiming authorship).
+Naturally, neither I nor my research group is responsible for any
+problems caused by the use of ACE.
 
         Douglas C. Schmidt 
         schmidt@cs.wustl.edu 
diff --git a/ChangeLog-97a b/ChangeLog-97a
index bd260875915..1beac510c43 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,3 +1,9 @@
+Mon Jun 30 17:28:53 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+
+	* Makefile (RELEASE_FILES): Removed the rpc++ directory from the
+ 	  main release since this doesn't seem to be widely used and the
+ 	  GPL copyleft confuses people.
+
 Mon Jun 30 15:08:04 1997  David L. Levine  <levine@cs.wustl.edu>
 
 	* include/makeinclude/platform_vxworks5.x_g++.GNU: added -lgcc
diff --git a/Makefile b/Makefile
index 9245eb6a7ac..c878469b621 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,6 @@ RELEASE_FILES = ACE_wrappers/ACE-categories \
 		ACE_wrappers/include \
 		ACE_wrappers/man \
 		ACE_wrappers/netsvcs \
-		ACE_wrappers/rpc++ \
 		ACE_wrappers/performance-tests \
 		ACE_wrappers/tests
 
diff --git a/TAO/COPYING b/TAO/COPYING
index f46cdce0959..b19f5db43e0 100644
--- a/TAO/COPYING
+++ b/TAO/COPYING
@@ -1,11 +1,25 @@
 COPYRIGHT INFORMATION FOR TAO
 
 TAO is copyrighted by Douglas C. Schmidt and his research group at
-Washington University, Copyright (c) 1997, all rights reserved, and
-portions by SunSoft (need to get the full SunSoft copyright chunk into
-here).
-
-It's primary purpose is a research vehicle for those wishing to
-experiment with the real-time aspects of CORBA.  It IS NOT a product,
-nor should it be treated as such; the user assumes complete
-responsibility for any and all results of the use of this ORB.
+Washington University, Copyright (c) 1997, all rights reserved.  In
+addition, some portions of TAO (particularly the IIOP protocol engine)
+are copyrighted by SunSoft (see the ./IIOP/lib/COPYING.sun file for
+more details).  Likewise, TAO relies heavily on ACE, which is also
+copyrighted by Douglas C. Schmidt and his research group at Washington
+University (see the ../COPYING file for more details).
+
+You are free to do anything you like with the Wash. U. portions of
+TAO's source code (and object code produced from the source).  For
+instance, you can include it in commercial software, as long as you
+include this copyright statement along with code built using TAO.
+
+You are under no obligation to freely redistribute any of your source
+code that is built using TAO.  Please note, however, that you may not
+do anything to the ACE code that will prevent it from being
+distributed freely (such as copyrighting it or claiming authorship).
+Naturally, neither I nor my research group is responsible for any
+problems caused by the use of TAO.
+
+        Douglas C. Schmidt 
+        schmidt@cs.wustl.edu 
+
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index ac213d3067a..78f10cdb5e6 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,8 @@
+Mon Jun 30 17:39:02 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
+
+	* Added a new README file and a COPYING file that explains the
+ 	contents of TAO and clarifies its copyright status.
+
 Sun Jun 29 10:06:50 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
 
 	* marshal.*: Added CORBA_Environment as a parameter to
diff --git a/TAO/IIOP/README b/TAO/IIOP/README.sun
index ff653aaf480..1abf999135a 100644
--- a/TAO/IIOP/README
+++ b/TAO/IIOP/README.sun
@@ -1,23 +1,16 @@
-@(#)README	1.2 97/02/03
-
-Inter-ORB Engine
-================
-17-Feb, 1997
+========================================
 
-    NOTE!!!!!!!!!!!!!!!
+This file contains the original README that came with the SunSoft IIOP
+release.  The information contained here is largely obsolete by the
+features added to TAO.  Please see the ../README file that comes with
+TAO for up-to-date information.
 
-    All makefiles in this distribution currently require that the
-    Sun make (from /usr/ccs/bin/make).  Hopefully this will be
-    eliminated.
+========================================
 
-    A new directory has been added under 'docs' called 'us'.  This is
-    used for documentation produced locally at WU.
-
-    We are also going to track some metrics on the code as we migrate
-    it from the reference implementation to TAO.  A tool ("cccc") has
-    been located to perform this task and produce reports.  At milestones,
-    this should be run against all source code.
+@(#)README	1.2 97/02/03
 
+Inter-ORB Engine
+================
 
 02-Feb, 1997
 Version 1.4
diff --git a/TAO/README b/TAO/README
index ac200f96eea..41ead5e8da2 100644
--- a/TAO/README
+++ b/TAO/README
@@ -1,26 +1,35 @@
-Welcome to TAO--The ACE ORB.  This is an implementation of a
-CORBA2-compliant ORB with support for real-time extensions.
+Welcome to the alpha release of The ACE ORB (TAO).  TAO is an
+implementation of a CORBA2-compliant ORB that will support real-time
+extensions.  Please see http://www.cs.wustl.edu/~schmidt/TAO.html for
+more information on TAO.
 
-As mentioned, TAO will eventually be a CORBA2-compliant ORB.  But
-right now it's not there.  Specifically, TAO contains the following:
-* an [optimized] ORB Core based on ACE components
-* an implementation of the Basic Object Adapter (BOA)
-* various sample applications illustrating how to use the ORB in its
-  current state
+The current alpha release of TAO contains the following:
 
-The current release of TAO DOES NOT contain the following:
-* an IDL compiler
-* an real-time version of the new Portable Object Adapter (POA)
-* a real-time scheduling service
+* An optimized ORB Core based on ACE components;
 
-Our current shedule will provide these remaining features throughout
-the summer of 1997.
+* An implementation of a Basic Object Adapter (BOA);
+
+* Various sample applications illustrating how to use the ORB in its
+  current state.
+
+This release of TAO does not yet contain the following:
+
+* An IDL compiler
+
+* An real-time version of the new Portable Object Adapter (POA)
+
+* The real-time scheduling service
+
+We plan to release these features throughout the summer of 1997.
 
 Please feel free to experiment with, dissect, repair, use, etc., TAO.
-We accept bug reports, appreciate bug fixes/enhancements, and quickly
-integrate correct bug fixes!  Just remember that we do not expect TAO
-to provide all the features of a real ORB at the moment, and that very
-important parts of TAO will be changing substantially in the
-not-so-distant future.  Thus, any development performed in the interim
-will require a little more effort, and will likely have to be
-completely re-written to work with newer releases.
+We gratefully accept bug reports, appreciate bug fixes/enhancements,
+and will strive to integrate correct bug fixes quickly!  Just remember
+that TAO does not provide all the features of a commercial ORB at the
+moment.  Moreover, key components in TAO (e.g., the Object Adapter)
+will change substantially over the summer.  Thus, any development
+performed in the interim will require additional effort (e.g., writing
+stubs and skeletons by hand), and applications may need to be
+re-written to work with new features in the forthcoming releases.
+
+Douglas C. Schmidt