From fe391ede637c8530bdfccf36dbd166d3581e10cd Mon Sep 17 00:00:00 2001 From: Yonik Seeley Date: Tue, 9 Sep 2008 20:53:17 +0000 Subject: [PATCH] stax-utils license/notice git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@693603 13f79535-47bb-0310-9956-ffa450edef68 --- LICENSE.txt | 37 +++++++++++++++++++++++++++++++++++++ NOTICE.txt | 12 +++++++++--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 41514e99764..b0cd5032841 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -581,3 +581,40 @@ 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. +========================================================================== +The following license applies to stax-utils.jar +-------------------------------------------------------------------------- +Copyright (c) 2004, Christian Niles, unit12.net +Copyright (c) 2004, Sun Microsystems, Inc. +Copyright (c) 2006, John Kristian +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 the listed copyright holders 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. + diff --git a/NOTICE.txt b/NOTICE.txt index 102b8419948..8749a787a77 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,6 +1,6 @@ ============================================================== Apache Solr - Copyright 2007 The Apache Software Foundation + Copyright 2006-2008 The Apache Software Foundation ============================================================== This product includes software developed by @@ -22,6 +22,12 @@ Tammo Freese (http://www.easymock.org/) This product includes the JQuery JavaScript library created by John Resig. Copyright (c) 2008 John Resig, http://jquery.com/ +This product includes stax-utils: https://stax-utils.dev.java.net/ +Copyright (c) 2004, Christian Niles, unit12.net +Copyright (c) 2004, Sun Microsystems, Inc. +Copyright (c) 2006, John Kristian +License: The BSD License (http://www.opensource.org/licenses/bsd-license.php) + This product includes/uses software, Woodstox (http://woodstox.codehaus.org), developed by Codehaus (http://www.codehaus.org/) License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -36,7 +42,7 @@ classes. For additional credits (generally to people who reported problems) see CREDITS file. - +--- This product includes software developed by Mort Bay Consulting (specifically, Jetty 6.1.3, the bundled servlet container in example) @@ -71,4 +77,4 @@ Some portions of the code are Copyright: 1999 Jason Gilbert. The jboss integration module contains some LGPL code. ------------------------------------------------------------------- +---