You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/09/26 02:26:37 UTC
svn commit: r1390237 - in /lucene/dev/branches/lucene_solr_4_0: ./ lucene/
lucene/licenses/ solr/ solr/licenses/
Author: uschindler
Date: Wed Sep 26 00:26:37 2012
New Revision: 1390237
URL: http://svn.apache.org/viewvc?rev=1390237&view=rev
Log:
Merged revision(s) 1390236 from lucene/dev/branches/branch_4x:
LUCENE-4431: Fix license of servlet-api.jar in Solr and Lucene
Added:
lucene/dev/branches/lucene_solr_4_0/lucene/licenses/servlet-api-LICENSE-CDDL.txt
- copied unchanged from r1390236, lucene/dev/branches/branch_4x/lucene/licenses/servlet-api-LICENSE-CDDL.txt
lucene/dev/branches/lucene_solr_4_0/solr/licenses/javax.servlet-api-LICENSE-CDDL.txt
- copied unchanged from r1390236, lucene/dev/branches/branch_4x/solr/licenses/javax.servlet-api-LICENSE-CDDL.txt
Removed:
lucene/dev/branches/lucene_solr_4_0/lucene/licenses/servlet-api-LICENSE-ASL.txt
lucene/dev/branches/lucene_solr_4_0/solr/licenses/javax.servlet-api-LICENSE-ASL.txt
Modified:
lucene/dev/branches/lucene_solr_4_0/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/NOTICE.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/licenses/servlet-api-NOTICE.txt
lucene/dev/branches/lucene_solr_4_0/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/NOTICE.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/javax.servlet-api-NOTICE.txt
lucene/dev/branches/lucene_solr_4_0/solr/licenses/servlet-api-NOTICE.txt
Modified: lucene/dev/branches/lucene_solr_4_0/lucene/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/NOTICE.txt?rev=1390237&r1=1390236&r2=1390237&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/NOTICE.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/NOTICE.txt Wed Sep 26 00:26:37 2012
@@ -109,6 +109,9 @@ LGPL and Creative Commons ShareAlike.
Morfologic includes data from BSD-licensed dictionary of Polish (SGJP)
(http://sgjp.pl/morfeusz/)
+Servlet-api.jar is under the CDDL license, the original source
+code for this can be found at http://www.eclipse.org/jetty/downloads.php
+
===========================================================================
Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration
===========================================================================
Modified: lucene/dev/branches/lucene_solr_4_0/lucene/licenses/servlet-api-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/lucene/licenses/servlet-api-NOTICE.txt?rev=1390237&r1=1390236&r2=1390237&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/lucene/licenses/servlet-api-NOTICE.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/lucene/licenses/servlet-api-NOTICE.txt Wed Sep 26 00:26:37 2012
@@ -1,5 +1,2 @@
-Apache Tomcat
-Copyright 1999-2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+Servlet-api.jar is under the CDDL license, the original source
+code for this can be found at http://www.eclipse.org/jetty/downloads.php
Modified: lucene/dev/branches/lucene_solr_4_0/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/NOTICE.txt?rev=1390237&r1=1390236&r2=1390237&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/NOTICE.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/NOTICE.txt Wed Sep 26 00:26:37 2012
@@ -9,7 +9,6 @@ The Apache Software Foundation (http://w
Includes software from other Apache Software Foundation projects,
including, but not limited to:
- Apache Lucene Java
- - Apache Tomcat (servlet-api-2.4)
- Apache Commons
- Apache Geronimo (stax API)
@@ -152,6 +151,9 @@ LGPL and Creative Commons ShareAlike.
Morfologic includes data from BSD-licensed dictionary of Polish (SGJP)
(http://sgjp.pl/morfeusz/)
+Servlet-api.jar is under the CDDL license, the original source
+code for this can be found at http://www.eclipse.org/jetty/downloads.php
+
===========================================================================
Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration
===========================================================================
@@ -256,7 +258,7 @@ This product includes software developed
(specifically, Jetty, the bundled servlet container in example),
available under the Apache 2 License.
-The bundled servlet-api jar is under the CDDL license, the original source
+Servlet-api.jar is under the CDDL license, the original source
code for this can be found at http://www.eclipse.org/jetty/downloads.php
=========================================================================
Modified: lucene/dev/branches/lucene_solr_4_0/solr/licenses/javax.servlet-api-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/licenses/javax.servlet-api-NOTICE.txt?rev=1390237&r1=1390236&r2=1390237&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/licenses/javax.servlet-api-NOTICE.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/licenses/javax.servlet-api-NOTICE.txt Wed Sep 26 00:26:37 2012
@@ -1,36 +1,2 @@
-==============================================================
- Jetty Web Container
- Copyright 1995-2009 Mort Bay Consulting Pty Ltd
-==============================================================
-
-The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted. It is licensed under the apache 2.0
-license.
-
-The javax.servlet package used by Jetty is copyright
-Sun Microsystems, Inc and Apache Software Foundation. It is
-distributed under the Common Development and Distribution License.
-You can obtain a copy of the license at
-https://glassfish.dev.java.net/public/CDDLv1.0.html.
-
-The UnixCrypt.java code ~Implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net. Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
- 2006 Tim Vernum
- 1999 Jason Gilbert.
-
-The jboss integration module contains some LGPL code.
-
-The win32 Java Service Wrapper (v3.2.3) is Copyright (c) 1999, 2006
-Tanuki Software, Inc. and 2001 Silver Egg Technology. It is
-covered by an open license which is viewable at
-http://svn.codehaus.org/jetty/jetty/branches/jetty-6.1/extras/win32service/LICENSE.txt
+Servlet-api.jar is under the CDDL license, the original source
+code for this can be found at http://www.eclipse.org/jetty/downloads.php
Modified: lucene/dev/branches/lucene_solr_4_0/solr/licenses/servlet-api-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/licenses/servlet-api-NOTICE.txt?rev=1390237&r1=1390236&r2=1390237&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/licenses/servlet-api-NOTICE.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/licenses/servlet-api-NOTICE.txt Wed Sep 26 00:26:37 2012
@@ -1,111 +1,2 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head><body lang="EN-US" link="blue" vlink="purple">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the
-Eclipse Foundation is provided to you under the terms and conditions of
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is
-provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS
-repository ("Repository") in CVS modules ("Modules") and made available
-as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to
-facilitate delivering, extending, and upgrading the Content. Typical
-modules may include plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A
-Feature is a bundle of one or more Plug-ins and/or Fragments and
-associated material. Each Feature may be packaged as a sub-directory in
-a directory named "features". Within a Feature, files named
-"feature.xml" may contain a list of the names and version numbers of
-the Plug-ins and/or Fragments associated with that Feature.</li>
- <li>Features
-may also include other Features ("Included Features"). Within a
-Feature, files named "feature.xml" may contain a list of the names and
-version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be
-contained in files named "about.html" ("Abouts"). The terms and
-conditions governing Features and
-Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is
-installed using the Eclipse Update Manager, you must agree to a license
-("Feature Update License") during the
-installation process. If the Feature contains Included Features, the
-Feature Update License should either provide you with the terms and
-conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be
-found in the "license" property of files named "feature.properties"
-found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the
-terms and conditions (or references to such terms and conditions) that
-govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
-CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
-or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions
-govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you
-are currently may have restrictions on the import, possession, and use,
-and/or re-export to another country, of encryption software. BEFORE
-using any encryption software, please check the country's laws,
-regulations and policies concerning the import, possession, or use, and
-re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body></html>
\ No newline at end of file
+Servlet-api.jar is under the CDDL license, the original source
+code for this can be found at http://www.eclipse.org/jetty/downloads.php