You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-cvs@xml.apache.org by mc...@apache.org on 2004/05/02 00:27:07 UTC
cvs commit: xml-commons/java/external LICENSE.dom-software.txt LICENSE.dom-documentation.txt
mcnamara 2004/05/01 15:27:07
Modified: java/external Tag: tck-jaxp-1_2_0 LICENSE.dom-software.txt
LICENSE.dom-documentation.txt
Log:
Upgrade W3C license to the December 31, 2002 version.
Revision Changes Path
No revision
No revision
1.1.4.1 +54 -67 xml-commons/java/external/LICENSE.dom-software.txt
Index: LICENSE.dom-software.txt
===================================================================
RCS file: /home/cvs/xml-commons/java/external/LICENSE.dom-software.txt,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- LICENSE.dom-software.txt 31 Jan 2002 23:13:42 -0000 1.1
+++ LICENSE.dom-software.txt 1 May 2004 22:27:06 -0000 1.1.4.1
@@ -1,74 +1,61 @@
xml-commons/java/external/LICENSE.dom-software.txt $Id$
-This license came from: http://www.w3.org/Consortium/Legal/copyright-software-19980720
+This license came from: http://www.w3.org/Consortium/Legal/copyright-software-20021231
W3C� SOFTWARE NOTICE AND LICENSE
-Copyright � 1994-2001 World
-Wide Web Consortium, <a href="http://www.w3.org/">World
-Wide Web Consortium</a>, (<a href=
-"http://www.lcs.mit.edu/">Massachusetts Institute of
-Technology</a>, <a href="http://www.inria.fr/">Institut National de
-Recherche en Informatique et en Automatique</a>, <a href=
-"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-This W3C work (including software, documents, or other related
-items) is being provided by the copyright holders under the
-following license. By obtaining, using and/or copying this work,
-you (the licensee) agree that you have read, understood, and will
-comply with the following terms and conditions:
-Permission to use, copy, modify, and distribute this software
-and its documentation, with or without modification,� for any
-purpose and without fee or royalty is hereby granted, provided that
-you include the following on ALL copies of the software and
-documentation or portions thereof, including modifications, that
-you make:
-
-The full text of this NOTICE in a location viewable to users of
-the redistributed or derivative work.
-
-Any pre-existing intellectual property disclaimers, notices, or
-terms and conditions. If none exist, a short notice of the
-following form (hypertext is preferred, text is permitted) should
-be used within the body of any redistributed or derivative code:
-"Copyright � [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/"
-
-Notice of any changes or modifications to the W3C files,
-including the date changes were made. (We recommend you provide
-URIs to the location from which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
-COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
-PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
-SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without
-specific, written prior permission. Title to copyright in this
-software and any associated documentation will at all times remain
-with copyright holders.
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license. By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following terms and
+conditions.
+
+Permission to copy, modify, and distribute this software and its documentation,
+with or without modification, for any purpose and without fee or royalty is
+hereby granted, provided that you include the following on ALL copies of the
+software and documentation or portions thereof, including modifications:
+
+ 1. The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ 2. Any pre-existing intellectual property disclaimers, notices, or terms
+ and conditions. If none exist, the W3C Software Short Notice should be
+ included (hypertext is preferred, text is permitted) within the body
+ of any redistributed or derivative code.
+ 3. Notice of any changes or modifications to the files, including the date
+ changes were made. (We recommend you provide URIs to the location from
+ which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at
+all times remain with copyright holders.
+
____________________________________
-This formulation of W3C's notice and license became active on
-August 14 1998 so as to improve compatibility with GPL. This
-version ensures that W3C software licensing terms are no more
-restrictive than GPL and consequently W3C software may be
-distributed in GPL packages. See the older formulation for the
-policy prior to this date. Please see our Copyright FAQ for common
-questions about using materials from
-our site, including specific terms and conditions for packages like
-libwww, Amaya, and Jigsaw.
-Other questions about this notice can be
-directed to site-policy@w3.org.
-webmaster
-(last updated $Date$)
\ No newline at end of file
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, reflects that ERCIM
+is now a host of the W3C, includes references to this specific dated version of
+the license, and removes the ambiguous grant of "use". Otherwise, this version
+is the same as the previous version and is written so as to preserve the Free
+Software Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition. Please see our Copyright FAQ for common
+questions about using materials from our site, including specific terms and
+conditions for packages like libwww, Amaya, and Jigsaw. Other questions about
+this notice can be directed to site-policy@w3.org.
+
+Joseph Reagle <si...@w3.org>
+
+Last revised by Reagle $Date$
1.1.4.1 +64 -77 xml-commons/java/external/LICENSE.dom-documentation.txt
Index: LICENSE.dom-documentation.txt
===================================================================
RCS file: /home/cvs/xml-commons/java/external/LICENSE.dom-documentation.txt,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- LICENSE.dom-documentation.txt 31 Jan 2002 23:13:42 -0000 1.1
+++ LICENSE.dom-documentation.txt 1 May 2004 22:27:06 -0000 1.1.4.1
@@ -1,86 +1,73 @@
xml-commons/java/external/LICENSE.dom-documentation.txt $Id$
-This license came from: http://www.w3.org/Consortium/Legal/copyright-documents-19990405
+This license came from: http://www.w3.org/Consortium/Legal/copyright-documents-20021231
-W3C� DOCUMENT NOTICE AND LICENSE
-Copyright � 1994-2001 World
-Wide Web Consortium, <a href="http://www.w3.org/">World
-Wide Web Consortium</a>, (<a href=
-"http://www.lcs.mit.edu/">Massachusetts Institute of
-Technology</a>, <a href="http://www.inria.fr/">Institut National de
-Recherche en Informatique et en Automatique</a>, <a href=
-"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-Public documents on the W3C site are provided by the copyright
-holders under the following license. The software or Document Type
-Definitions (DTDs) associated with W3C specifications are governed
-by the Software Notice. By using and/or copying this document, or the
-W3C document from which this statement is linked, you (the
-licensee) agree that you have read, understood, and will comply
-with the following terms and conditions:
-
-Permission to use, copy, and distribute the contents of this
-document, or the W3C document from which this statement is linked,
-in any medium for any purpose and without fee or royalty is hereby
-granted, provided that you include the following on ALL
-copies of the document, or portions thereof, that you use:
-
-A link or URL to the original W3C document.
-
-The pre-existing copyright notice of the original author, or if
-it doesn't exist, a notice of the form: "Copyright � [$date-of-document] World Wide Web
-Consortium, (Massachusetts
-Institute of Technology, Institut National de Recherche en Informatique et en
-Automatique, Keio
-University). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a
-textual representation is permitted.)
-
-If it exists, the STATUS of the W3C document.
-
-When space permits, inclusion of the full text of this NOTICE
-should be provided. We request that authorship
-attribution be provided in any software, documents, or other items
-or products that you create pursuant to the implementation of the
-contents of this document, or any portion thereof.
-
-No right to create modifications or derivatives of W3C documents
-is granted pursuant to this license. However, if additional
-requirements (documented in the Copyright
-FAQ) are satisfied, the right to create modifications or
-derivatives is�sometimes granted by the W3C to individuals
-complying with those requirements.
+W3C� DOCUMENT LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
+
+Public documents on the W3C site are provided by the copyright holders under
+the following license. By using and/or copying this document, or the W3C
+document from which this statement is linked, you (the licensee) agree that
+you have read, understood, and will comply with the following terms and
+conditions:
+
+Permission to copy, and distribute the contents of this document, or the W3C
+document from which this statement is linked, in any medium for any purpose
+and without fee or royalty is hereby granted, provided that you include the
+following on ALL copies of the document, or portions thereof, that you use:
+
+ 1. A link or URL to the original W3C document.
+ 2. The pre-existing copyright notice of the original author, or if it
+ doesn't exist, a notice (hypertext is preferred, but a textual
+ representation is permitted) of the form: "Copyright � [$date-of-document]
+ World Wide Web Consortium, (Massachusetts Institute of Technology,
+ European Research Consortium for Informatics and Mathematics, Keio
+ University). All Rights Reserved.
+ http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231"
+ 3. If it exists, the STATUS of the W3C document.
+
+When space permits, inclusion of the full text of this NOTICE should be
+provided. We request that authorship attribution be provided in any software,
+documents, or other items or products that you create pursuant to the
+implementation of the contents of this document, or any portion thereof.
+
+No right to create modifications or derivatives of W3C documents is granted
+pursuant to this license. However, if additional requirements (documented in
+the Copyright FAQ) are satisfied, the right to create modifications or
+derivatives is sometimes granted by the W3C to individuals complying with
+those requirements.
THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT
-NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS
-OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
-IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
-PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
-DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS
-THEREOF.
-
-The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to this document or its
-contents without specific, written prior permission. Title to
-copyright in this document will at all times remain with copyright
-holders.
+REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE
+FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT
+INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
+PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.
+
+The name and trademarks of copyright holders may NOT be used in advertising
+or publicity pertaining to this document or its contents without specific,
+written prior permission. Title to copyright in this document will at all
+times remain with copyright holders.
----------------------------------------------------------------------------
-This formulation of W3C's notice and license became active on
-April 05 1999 so as to account for the treatment of DTDs, schema's and
-bindings. See the older formulation for the policy prior to this date.
-Please see
-our Copyright FAQ for common questions
-about using materials from our site, including specific terms and
-conditions for packages like libwww, Amaya, and Jigsaw.
-Other questions about this notice can be directed to site-policy@w3.org.
-webmaster
-(last updated by reagle on 1999/04/99.)
\ No newline at end of file
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, moves information on
+style sheets, DTDs, and schemas to the Copyright FAQ, reflects that ERCIM is
+now a host of the W3C, includes references to this specific dated version of
+the license, and removes the ambiguous grant of "use". See the older
+formulation for the policy prior to this date. Please see our Copyright FAQ for
+common questions about using materials from our site, such as the translating
+or annotating specifications. Other questions about this notice can be directed
+to site-policy@w3.org.
+
+Joseph Reagle <si...@w3.org>
+
+Last revised by Reagle $Date$