incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devin...@apache.org
Subject svn commit: r1222073 - in /incubator/odf/trunk: LICENSE.txt NOTICE.txt
Date Thu, 22 Dec 2011 06:56:09 GMT
Author: devinhan
Date: Thu Dec 22 06:56:08 2011
New Revision: 1222073

URL: http://svn.apache.org/viewvc?rev=1222073&view=rev
Log:
clean up JUnit, Oracle Multi-Schema XML Validator (MSV) and ISO RELAX JARV API to JAXP 1.3
validation API bridge statement from L&N.

Modified:
    incubator/odf/trunk/LICENSE.txt
    incubator/odf/trunk/NOTICE.txt

Modified: incubator/odf/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/LICENSE.txt?rev=1222073&r1=1222072&r2=1222073&view=diff
==============================================================================
--- incubator/odf/trunk/LICENSE.txt (original)
+++ incubator/odf/trunk/LICENSE.txt Thu Dec 22 06:56:08 2011
@@ -208,12 +208,11 @@
 
 APACHE ODF TOOLKIT DEPENDENCIES: 
 
-The Apache ODF Toolkit depends on several third party jars and schemas with
-separate copyright notices and license terms. Your use of the source
-code or bin of Apache ODF Toolkit is subject to the terms and conditions of 
-the following licenses. 
+The Apache ODF Toolkit ODF Validator component includes several third party jars or schemas
with 
+separate copyright notices and license terms. Your use of the source code or bin of ODF Validator

+is subject to the terms and conditions of the following licenses. 
 
-I. Open Document Format(ODF) schemas (OpenDocument-v1.2-cd05-rev02-schema.rng)
+I. Open Document Format(ODF) schemas
 
         Open Document Format for Office Applications (OpenDocument) Version 1.2
         Committee Specification Public Review Draft (CSPRD) 03, 19 January 2011
@@ -248,7 +247,7 @@ I. Open Document Format(ODF) schemas (Op
     
     
     
-II. MathML Schemas (odf validator component)
+II. MathML Schemas
 
     W3C Software Notice and License
 
@@ -299,6 +298,69 @@ II. MathML Schemas (odf validator compon
     the Free Software Foundation's assessment of GPL compatibility and OSI's certification
under 
     the Open Source Definition.
     
+    
+
+III. Oracle Multi-Schema XML Validator (MSV)   
+     (msv-core-2011.1.jar, xsdlib-2010.1.jar, relaxngDatatype-20020414.jar, xml-apis-1.3.04.jar)
+
+    BSD license
+    
+    Copyright (c) 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
+
+    Redistribution and  use in  source and binary  forms, with  or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+    - Redistributions  of  source code  must  retain  the above  copyright
+      notice, this list of conditions and the following disclaimer.
+
+    - Redistribution  in binary  form must  reproduct the  above copyright
+      notice, this list of conditions  and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    Neither  the  name   of  Sun  Microsystems,  Inc.  or   the  names  of
+    contributors may be  used to endorse or promote  products derived from
+    this software without specific prior written permission.
+
+    This software is provided "AS IS," without a warranty of any kind. ALL
+    EXPRESS  OR   IMPLIED  CONDITIONS,  REPRESENTATIONS   AND  WARRANTIES,
+    INCLUDING  ANY  IMPLIED WARRANTY  OF  MERCHANTABILITY,  FITNESS FOR  A
+    PARTICULAR PURPOSE  OR NON-INFRINGEMENT, ARE HEREBY  EXCLUDED. SUN AND
+    ITS  LICENSORS SHALL  NOT BE  LIABLE  FOR ANY  DAMAGES OR  LIABILITIES
+    SUFFERED BY LICENSEE  AS A RESULT OF OR  RELATING TO USE, MODIFICATION
+    OR DISTRIBUTION OF  THE SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+    SUN OR ITS  LICENSORS BE LIABLE FOR ANY LOST  REVENUE, PROFIT OR DATA,
+    OR  FOR  DIRECT,   INDIRECT,  SPECIAL,  CONSEQUENTIAL,  INCIDENTAL  OR
+    PUNITIVE  DAMAGES, HOWEVER  CAUSED  AND REGARDLESS  OF  THE THEORY  OF
+    LIABILITY, ARISING  OUT OF  THE USE OF  OR INABILITY TO  USE SOFTWARE,
+    EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+      
+      
+      
+IV. ISO RELAX JARV API to JAXP 1.3 validation API bridge  
+    (isorelax-jaxp-bridge-1.0.jar, isorelax-20030108.jar))
+
+    The MIT License (MIT)
+
+    Copyright (c) 2006 Kohsuke Kawaguchi
+
+    Permission is hereby granted, free of charge, to any person obtaining a 
+    copy of this software and associated documentation files (the "Software"), 
+    to deal in the Software without restriction, including without limitation 
+    the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+    and/or sell copies of the Software, and to permit persons to whom the 
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included 
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+    DEALINGS IN THE SOFTWARE. 
 ====================================================================================================
 
 

Modified: incubator/odf/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/NOTICE.txt?rev=1222073&r1=1222072&r2=1222073&view=diff
==============================================================================
--- incubator/odf/trunk/NOTICE.txt (original)
+++ incubator/odf/trunk/NOTICE.txt Thu Dec 22 06:56:08 2011
@@ -15,6 +15,13 @@ This product contains MathML XML Schema 
 World Wide Web Consortium (Massachusetts Institute of Technology, European
 Research Consortium for Informatics and Mathematics, Keio University)
 
+This product contains Oracle Multi-Schema XML Validator (MSV).
+under BSD license. Copyright (c) 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
+
+This product contains ISO RELAX JARV API to JAXP 1.3 validation API bridge
+(http://java.net/projects/isorelax-jaxp-bridge). under MIT License (MIT)
+Copyright (c) 2006 Kohsuke Kawaguchi
+
 
 
 



Mime
View raw message