ChangeLogTag:Tue Nov 04 19:36:46 2003 Nanbor Wang <nanbor@cs.wustl.edu>

2 files changed, 85 insertions, 74 deletions

diff --git a/TAO/COPYING b/TAO/COPYING
index 7c1f7ba8804..18ba46daa50 100644
--- a/TAO/COPYING
+++ b/TAO/COPYING
@@ -1,99 +1,105 @@
-
      _________________________________________________________________
    
-  Copyright and Licensing Information for ACE(TM) and TAO(TM)
+  Copyright and Licensing Information for ACE(TM), TAO(TM), and CIAO(TM)
   
-   [1]ACE(TM) and [2]TAO(TM) are copyrighted by [3]Douglas C. Schmidt and
-   his [4]research group at [5]Washington University, [6]University of
-   California, Irvine, and [7]Vanderbilt University Copyright (c)
-   1993-2003, all rights reserved. Since ACE+TAO are open-source, free
-   software, you are free to use, modify, copy, and
-   distribute--perpetually and irrevocably--the ACE+TAO source code and
-   object code produced from the source, as well as copy and distribute
-   modified versions of this software. You must, however, include this
-   copyright statement along with code built using ACE+TAO.
+   [1]ACE(TM), [2]TAO(TM) and [3]CIAO(TM) are copyrighted by [4]Douglas
+   C. Schmidt and his [5]research group at [6]Washington University,
+   [7]University of California, Irvine, and [8]Vanderbilt University
+   Copyright (c) 1993-2003, all rights reserved. Since ACE+TAO+CIAO are
+   open-source, free software, you are free to use, modify, copy, and
+   distribute--perpetually and irrevocably--the ACE+TAO+CIAO source code
+   and object code produced from the source, as well as copy and
+   distribute modified versions of this software. You must, however,
+   include this copyright statement along with code built using
+   ACE+TAO+CIAO.
    
-   You can use ACE+TAO in proprietary software and are under no
+   You can use ACE+TAO+CIAO in proprietary software and are under no
    obligation to redistribute any of your source code that is built using
-   ACE+TAO. Note, however, that you may not do anything to the ACE+TAO
-   code, such as copyrighting it yourself or claiming authorship of the
-   ACE+TAO code, that will prevent ACE+TAO from being distributed freely
-   using an open-source development model. You needn't inform anyone that
-   you're using ACE+TAO in your software, though we encourage you to let
-   [8]us know so we can promote your project in the [9]ACE+TAO success
-   stories..
+   ACE+TAO+CIAO. Note, however, that you may not do anything to the
+   ACE+TAO+CIAO code, such as copyrighting it yourself or claiming
+   authorship of the ACE+TAO+CIAO code, that will prevent ACE+TAO+CIAO
+   from being distributed freely using an open-source development model.
+   You needn't inform anyone that you're using ACE+TAO+CIAO in your
+   software, though we encourage you to let [9]us know so we can promote
+   your project in the [10]ACE+TAO+CIAO success stories..
    
-   ACE+TAO are provided as is with no warranties of any kind, including
-   the warranties of design, merchantability, and fitness for a
+   ACE+TAO+CIAO are provided as is with no warranties of any kind,
+   including the warranties of design, merchantability, and fitness for a
    particular purpose, noninfringement, or arising from a course of
-   dealing, usage or trade practice. Moreover, ACE+TAO are provided with
-   no support and without any obligation on the part of Washington
+   dealing, usage or trade practice. Moreover, ACE+TAO+CIAO are provided
+   with no support and without any obligation on the part of Washington
    University, UC Irvine, Vanderbilt University, their employees, or
    students to assist in its use, correction, modification, or
-   enhancement. A [10]number of companies provide commercial support for
-   ACE and TAO, however. Both ACE and TAO are Y2K-compliant, as long as
+   enhancement. A [11]number of companies provide commercial support for
+   ACE and TAO, however. ACE, TAO and CIAO are Y2K-compliant, as long as
    the underlying OS platform is Y2K-compliant.
    
    Washington University, UC Irvine, Vanderbilt University, their
    employees, and students shall have no liability with respect to the
-   infringement of copyrights, trade secrets or any patents by ACE+TAO or
-   any part thereof. Moreover, in no event will Washington University, UC
-   Irvine, or Vanderbilt University, their employees, or students be
-   liable for any lost revenue or profits or other special, indirect and
-   consequential damages.
+   infringement of copyrights, trade secrets or any patents by
+   ACE+TAO+CIAO or any part thereof. Moreover, in no event will
+   Washington University, UC Irvine, or Vanderbilt University, their
+   employees, or students be liable for any lost revenue or profits or
+   other special, indirect and consequential damages.
    
-   The [11]ACE and [12]TAO web sites are maintained by the [13]Center for
-   Distributed Object Computing of Washington University for the
-   development of open-source software as part of the [14]open-source
-   software community. By submitting comments, suggestions, code, code
-   snippets, techniques (including that of usage), and algorithms,
-   submitters acknowledge that they have the right to do so, that any
-   such submissions are given freely and unreservedly, and that they
-   waive any claims to copyright or ownership. In addition, submitters
-   acknowledge that any such submission might become part of the
-   copyright maintained on the overall body of code, which comprises the
-   [15]ACE and [16]TAO software. By making a submission, submitter agree
-   to these terms. Furthermore, submitters acknowledge that the
-   incorporation or modification of such submissions is entirely at the
-   discretion of the moderators of the open-source ACE+TAO projects or
-   their designees.
+   The [12]ACE, [13]TAO and [14]CIAO web sites are maintained by the
+   [15]Center for Distributed Object Computing of Washington University
+   for the development of open-source software as part of the
+   [16]open-source software community. By submitting comments,
+   suggestions, code, code snippets, techniques (including that of
+   usage), and algorithms, submitters acknowledge that they have the
+   right to do so, that any such submissions are given freely and
+   unreservedly, and that they waive any claims to copyright or
+   ownership. In addition, submitters acknowledge that any such
+   submission might become part of the copyright maintained on the
+   overall body of code, which comprises the [17]ACE, [18]TAO and
+   [19]CIAO software. By making a submission, submitter agree to these
+   terms. Furthermore, submitters acknowledge that the incorporation or
+   modification of such submissions is entirely at the discretion of the
+   moderators of the open-source ACE+TAO+CIAO projects or their
+   designees.
    
-   The names ACE(TM), TAO(TM), Washington University, UC Irvine, and
-   Vanderbilt University, may not be used to endorse or promote products
-   or services derived from this source without express written
-   permission from Washington University, UC Irvine, or Vanderbilt
-   University. Further, products or services derived from this source may
-   not be called ACE(TM) or TAO(TM), nor may the name Washington
-   University, UC Irvine, or Vanderbilt University appear in their names,
-   without express written permission from Washington University, UC
-   Irvine, and Vanderbilt University.
+   The names ACE(TM), TAO(TM), CIAO(TM), Washington University, UC
+   Irvine, and Vanderbilt University, may not be used to endorse or
+   promote products or services derived from this source without express
+   written permission from Washington University, UC Irvine, or
+   Vanderbilt University. Further, products or services derived from this
+   source may not be called ACE(TM), TAO(TM), or CIAO(TM) nor may the
+   name Washington University, UC Irvine, or Vanderbilt University appear
+   in their names, without express written permission from Washington
+   University, UC Irvine, and Vanderbilt University.
    
    If you have any suggestions, additions, comments, or questions, please
-   let [17]me know.
+   let [20]me know.
    
-   [18]Douglas C. Schmidt
+   [21]Douglas C. Schmidt
      _________________________________________________________________
    
-   Back to the [19]ACE home page.
+   Back to the [22]ACE home page.
+   
+   Last modified 21:26:22 CST 03 November 2003 
 
 References
 
    1. http://www.cs.wustl.edu/~schmidt/ACE.html
    2. http://www.cs.wustl.edu/~schmidt/TAO.html
-   3. http://www.cs.wustl.edu/~schmidt/
-   4. http://www.cs.wustl.edu/~schmidt/ACE-members.html
-   5. http://www.wustl.edu/
-   6. http://www.uci.edu/
-   7. http://www.vanderbilt.edu/
-   8. mailto:doc_group@cs.wustl.edu
-   9. http://www.cs.wustl.edu/~schmidt/ACE-users.html
-  10. http://www.cs.wustl.edu/~schmidt/commercial-support.html
-  11. http://www.cs.wustl.edu/~schmidt/ACE.html
-  12. http://www.cs.wustl.edu/~schmidt/TAO.html
-  13. http://www.cs.wustl.edu/~schmidt/doc-center.html
-  14. http://www.opensource.org/
-  15. http://www.cs.wustl.edu/~schmidt/ACE-obtain.html
-  16. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html
-  17. mailto:schmidt@cs.wustl.edu
-  18. http://www.cs.wustl.edu/~schmidt/
-  19. file://localhost/project/adaptive/.www-docs/ACE.html
+   3. http://www.dre.vanderbilt.edu/CIAO/
+   4. http://www.cs.wustl.edu/~schmidt/
+   5. http://www.cs.wustl.edu/~schmidt/ACE-members.html
+   6. http://www.wustl.edu/
+   7. http://www.uci.edu/
+   8. http://www.vanderbilt.edu/
+   9. mailto:doc_group@cs.wustl.edu
+  10. http://www.cs.wustl.edu/~schmidt/ACE-users.html
+  11. http://www.cs.wustl.edu/~schmidt/commercial-support.html
+  12. http://www.cs.wustl.edu/~schmidt/ACE.html
+  13. http://www.cs.wustl.edu/~schmidt/TAO.html
+  14. http://www.dre.vanderbilt.edu/CIAO/
+  15. http://www.cs.wustl.edu/~schmidt/doc-center.html
+  16. http://www.opensource.org/
+  17. http://www.cs.wustl.edu/~schmidt/ACE-obtain.html
+  18. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html
+  19. http://www.dre.vanderbilt.edu/CIAO/
+  20. mailto:schmidt@cs.wustl.edu
+  21. http://www.cs.wustl.edu/~schmidt/
+  22. file://localhost/project/adaptive/.www-docs/ACE.html
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ceaa7cce1fc..dde677cbb61 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 04 19:36:46 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* COPYING: Modified to include CIAO in the Copyright disclaimer.
+	  Thanks to Roland Schimmack <SC@ProCom.de> for motivating the change.
+
 Wed Nov  5 01:00:31 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * tao/Leader_Follower.cpp: