You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2012/07/30 18:06:18 UTC
svn commit: r1367139 - in /uima/uima-as/trunk: LICENSE NOTICE
Author: cwiklik
Date: Mon Jul 30 16:06:18 2012
New Revision: 1367139
URL: http://svn.apache.org/viewvc?rev=1367139&view=rev
Log:
UIMA-2436 Updated to include xmlbeans and Xstream
Modified:
uima/uima-as/trunk/LICENSE
uima/uima-as/trunk/NOTICE
Modified: uima/uima-as/trunk/LICENSE
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/LICENSE?rev=1367139&r1=1367138&r2=1367139&view=diff
==============================================================================
--- uima/uima-as/trunk/LICENSE (original)
+++ uima/uima-as/trunk/LICENSE Mon Jul 30 16:06:18 2012
@@ -433,4 +433,38 @@ LIABILITY, WHETHER IN CONTRACT, STRICT L
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
\ No newline at end of file
+=========================================================================
+== XStream library ==
+ License from ActiveMQ 5.4.1 binary distribution
+=========================================================================
+This product contains XStream from Codehaus. It is licensed under the BSD
+license:
+
+(BSD Style License)
+
+Copyright (c) 2003-2004, Joe Walnes
+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. Redistributions in binary form must reproduce
+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 XStream nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
\ No newline at end of file
Modified: uima/uima-as/trunk/NOTICE
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/NOTICE?rev=1367139&r1=1367138&r2=1367139&view=diff
==============================================================================
--- uima/uima-as/trunk/NOTICE (original)
+++ uima/uima-as/trunk/NOTICE Mon Jul 30 16:06:18 2012
@@ -31,4 +31,20 @@ of the Saxon documentation.
This product contains icons developed by the SVG Icons project
(http://sourceforge.net/projects/svgicons), licensed under the
-BSD license (see LICENSE file).
\ No newline at end of file
+BSD license (see LICENSE file).
+
+This product includes Apache XMLBeans software, developed at the Apache Software
+Foundation (http://www.apache.org/). From binary distribution of XMLBeans NOTICE
+file:
+Portions of this software were originally based on the following:
+ - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
+
+ Aside from contributions to the Apache XMLBeans project, this
+ software also includes:
+
+ - one or more source files from the Apache Xerces-J and Apache Axis
+ products, Copyright (c) 1999-2003 Apache Software Foundation
+
+ - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
+ Consortium (Massachusetts Institute of Technology, European Research
+ Consortium for Informatics and Mathematics, Keio University)