Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating NOTICE.txt with new year + license urls

This commit is contained in:
Joakim Erdfelt 2012-02-01 15:15:04 -07:00
parent f9e3421a5b
commit f376cf46a1
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NOTICE.txt
View File

@ -1,12 +1,24 @@
============================================================== ==============================================================
Jetty Web Container Jetty Web Container
Copyright 1995-2009 Mort Bay Consulting Pty Ltd Copyright 1995-2009 Mort Bay Consulting Pty Ltd
2009-2012 Webtide LLC
2011-2012 Intalio Inc
============================================================== ==============================================================
The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
unless otherwise noted. It is dual licensed under the apache 2.0 unless otherwise noted.
license and eclipse 1.0 license. Jetty may be distributed under
either license. Jetty is dual licensed under both
* The Apache 2.0 License
http://www.apache.org/licenses/LICENSE-2.0.html
and
* The Eclipse Public 1.0 License
http://www.eclipse.org/legal/epl-v10.html
Jetty may be distributed under either license.
The javax.servlet package used was sourced from the Apache The javax.servlet package used was sourced from the Apache
Software Foundation and is distributed under the apache 2.0 Software Foundation and is distributed under the apache 2.0
@ -15,7 +27,7 @@ license.
The UnixCrypt.java code implements the one way cryptography used by The UnixCrypt.java code implements the one way cryptography used by
Unix systems for simple password protection. Copyright 1996 Aki Yoshida, Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
modified April 2001 by Iris Van den Broeke, Daniel Deville. modified April 2001 by Iris Van den Broeke, Daniel Deville.
Permission to use, copy, modify and distribute UnixCrypt Permission to use, copy, modify and distribute UnixCrypt
for non-commercial or commercial purposes and without fee is for non-commercial or commercial purposes and without fee is
granted provided that the copyright notice appears in all copies. granted provided that the copyright notice appears in all copies.