svn commit: r734315 - /xml/commons/branches/tck-jaxp-1_3_0/java/external/LICENSE.dom-software.txt

[mr...@apache.org]

Author: mrglavas
Date: Tue Jan 13 19:33:42 2009
New Revision: 734315

URL: http://svn.apache.org/viewvc?rev=734315&view=rev
Log:
Updating the W3C Software Notice and License to the one which the DOM Level 3 bindings
(http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/java-binding.zip) are distributed
with.

Modified:
    xml/commons/branches/tck-jaxp-1_3_0/java/external/LICENSE.dom-software.txt

Modified: xml/commons/branches/tck-jaxp-1_3_0/java/external/LICENSE.dom-software.txt
URL: http://svn.apache.org/viewvc/xml/commons/branches/tck-jaxp-1_3_0/java/external/LICENSE.dom-software.txt?rev=734315&r1=734314&r2=734315&view=diff
==============================================================================
--- xml/commons/branches/tck-jaxp-1_3_0/java/external/LICENSE.dom-software.txt (original)
+++ xml/commons/branches/tck-jaxp-1_3_0/java/external/LICENSE.dom-software.txt Tue Jan 13 19:33:42 2009
@@ -1,61 +1,54 @@
 xml-commons/java/external/LICENSE.dom-software.txt $Id$
 
+This license came from: http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/java-binding.zip (COPYRIGHT.html)
 
-This license came from: http://www.w3.org/Consortium/Legal/copyright-software-20021231
+W3C® SOFTWARE NOTICE AND LICENSE 
+Copyright © 2004 World Wide Web Consortium, (Massachusetts Institute of Technology,
+European Research Consortium for Informatics and Mathematics, Keio University).
+All Rights Reserved.
+
+The DOM bindings are published under the W3C Software Copyright Notice and 
+License. The software license requires "Notice of any changes or modifications 
+to the W3C files, including the date changes were made." Consequently, modified 
+versions of the DOM bindings must document that they do not conform to the W3C 
+standard; in the case of the IDL definitions, the pragma prefix can no longer 
+be 'w3c.org'; in the case of the Java language binding, the package names can no 
+longer be in the 'org.w3c' package. 
+
+Note: The original version of the W3C Software Copyright Notice and License could 
+be found at 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: 
 
-
-W3C® SOFTWARE NOTICE AND LICENSE
-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
+  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
+  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
+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 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$
+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.
\ No newline at end of file