notice/license updates

git-svn-id: https://svn.apache.org/repos/asf/incubator/solr/trunk@481276 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2006-12-01 16:25:54 +00:00
parent 840875e7d9
commit b49e659968
2 changed files with 18 additions and 1 deletions

View File

@ -200,7 +200,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
-------------------------------------------------------------------------- ==========================================================================
The following license applies only to the xpp3 jar included with Solr The following license applies only to the xpp3 jar included with Solr
-------------------------------------------------------------------------- --------------------------------------------------------------------------
Indiana University Extreme! Lab Software License Indiana University Extreme! Lab Software License
@ -250,3 +250,11 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
==========================================================================
Portions of Jetty 5.1 are bundled in the Solr example server.
The following licenses are part of the Jetty 5.1 distribution, which
as a whole is licensed under The Apache License version 2.0.
- example/etc/LICENSE.javax.servlet.txt
- example/etc/LICENSE.javax.xml.html
- example/etc/LICENSE.jsse.txt

View File

@ -4,6 +4,15 @@ Copyright 2006 The Apache Software Foundation
This product includes software developed by This product includes software developed by
The Apache Software Foundation (http://www.apache.org/). The Apache Software Foundation (http://www.apache.org/).
Includes software from other Apache Software Foundation projects,
including, but not limited to:
- Apache Lucene Java
- Apache Tomcat (lib/servlet-api-2.4.jar)
This product includes software developed by the Indiana University This product includes software developed by the Indiana University
Extreme! Lab (http://www.extreme.indiana.edu/). Extreme! Lab (http://www.extreme.indiana.edu/).
(specifically, the XPP3 XML pull parser) (specifically, the XPP3 XML pull parser)
This product includes software developed by Mort Bay Consulting
(specifically, Jetty 5.1, the bundled servlet container in example)